diff --git a/.eslintrc.json b/.eslintrc.json
index ec016b6a0..521df9727 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -47,7 +47,7 @@
         "plugin:prettier/recommended"
       ],
       "parserOptions": {
-        "project": "./tsconfig.base.json"
+        "project": "./tsconfig.json"
       },
       "rules": {
         "@angular-eslint/no-conflicting-lifecycle": "error",
@@ -93,19 +93,19 @@
             "selector": "memberLike",
             "modifiers": ["private"],
             "format": ["camelCase"],
-            "leadingUnderscore": "allow"
+            "leadingUnderscore": "require"
           },
           {
             "selector": "memberLike",
             "modifiers": ["protected"],
             "format": ["camelCase"],
-            "leadingUnderscore": "allow"
+            "leadingUnderscore": "require"
           },
           {
             "selector": "memberLike",
             "modifiers": ["private", "readonly"],
             "format": ["UPPER_CASE", "camelCase"],
-            "leadingUnderscore": "allow"
+            "leadingUnderscore": "require"
           }
         ],
         "@typescript-eslint/no-empty-function": "off",
diff --git a/apps/red-ui/tsconfig.json b/apps/red-ui/tsconfig.json
index 0fd82ba59..6cdcf5da6 100644
--- a/apps/red-ui/tsconfig.json
+++ b/apps/red-ui/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "allowSyntheticDefaultImports": true
diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile
index d97e19fe5..084a08fb8 100644
--- a/docker/red-ui/Dockerfile
+++ b/docker/red-ui/Dockerfile
@@ -28,7 +28,7 @@ COPY yarn.lock yarn.lock
 COPY angular.json angular.json
 COPY nx.json nx.json
 COPY .eslintrc.json .eslintrc.json
-COPY tsconfig.base.json tsconfig.base.json
+COPY tsconfig.json tsconfig.json
 COPY versions.sh version.sh
 COPY paligo-styles paligo-styles
 COPY sonar.js sonar.js
diff --git a/libs/iqser-cache/tsconfig.json b/libs/iqser-cache/tsconfig.json
index 39d927be7..4975d8328 100644
--- a/libs/iqser-cache/tsconfig.json
+++ b/libs/iqser-cache/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "declaration": true,
@@ -11,5 +11,5 @@
     "strictMetadataEmit": true,
     "enableResourceInlining": true
   },
-  "include": ["**/*.ts"]
+  "include": ["src/**/*.ts"]
 }
diff --git a/libs/red-domain/tsconfig.json b/libs/red-domain/tsconfig.json
index 53e82eb42..3670e2f03 100644
--- a/libs/red-domain/tsconfig.json
+++ b/libs/red-domain/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "declaration": true,
@@ -10,5 +10,5 @@
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["**/*.ts"]
+  "include": ["src/**/*.ts"]
 }
diff --git a/nx.json b/nx.json
index 8fa0f282d..629f2cde4 100644
--- a/nx.json
+++ b/nx.json
@@ -5,7 +5,7 @@
       "dependencies": "*",
       "devDependencies": "*"
     },
-    "tsconfig.base.json": "*",
+    "tsconfig.json": "*",
     "tslint.json": "*",
     "nx.json": "*"
   },
diff --git a/tools/tsconfig.tools.json b/tools/tsconfig.tools.json
index 4412e0b53..82bd1f098 100644
--- a/tools/tsconfig.tools.json
+++ b/tools/tsconfig.tools.json
@@ -1,11 +1,11 @@
 {
-    "extends": "../tsconfig.base.json",
-    "compilerOptions": {
-        "outDir": "../dist/out-tsc/tools",
-        "rootDir": ".",
-        "module": "commonjs",
-        "target": "es5",
-        "types": ["node"]
-    },
-    "include": ["**/*.ts"]
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist/out-tsc/tools",
+    "rootDir": ".",
+    "module": "commonjs",
+    "target": "es5",
+    "types": ["node"]
+  },
+  "include": ["**/*.ts"]
 }
diff --git a/tsconfig.base.json b/tsconfig.json
similarity index 100%
rename from tsconfig.base.json
rename to tsconfig.json