diff --git a/src/main/ts/.eslintrc.json b/src/main/ts/.eslintrc.json
index 2a0cf42..61858ad 100644
--- a/src/main/ts/.eslintrc.json
+++ b/src/main/ts/.eslintrc.json
@@ -11,7 +11,6 @@
     ],
     "extends": [
         "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking"
     ],
@@ -34,7 +33,25 @@
         "no-unneeded-ternary": "error",
         "block-spacing": "error",
         "camelcase": "off",
-        "@typescript-eslint/camelcase": "error",
+        "@typescript-eslint/naming-convention": [
+            "error",
+            {
+                "selector": "default",
+                "format": ["camelCase"]
+            },
+            {
+                "selector": "variable",
+                "format": ["camelCase", "UPPER_CASE"]
+            },
+            {
+                "selector": "parameter",
+                "format": ["camelCase"]
+            },
+            {
+                "selector": "typeLike",
+                "format": ["PascalCase"]
+            }
+        ],
         "comma-dangle": ["error", "never"],
         "func-call-spacing": "off",
         "@typescript-eslint/func-call-spacing": ["error", "never"],