diff --git a/.env.development b/.env.development
index 11640e5..5bd4645 100644
--- a/.env.development
+++ b/.env.development
@@ -6,5 +6,5 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
 NEXT_PUBLIC_EXPORT_STATIC=false
 NEXT_PUBLIC_USE_CGI=false
 # App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.6.436
+NEXT_PUBLIC_APP_VERSION=1.6.437
 NEXT_PUBLIC_CPL_MODE=jsmock   # json (Entwicklungsumgebung) oder jsmock (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 5913e83..924de60 100644
--- a/.env.production
+++ b/.env.production
@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
 NEXT_PUBLIC_EXPORT_STATIC=true
 NEXT_PUBLIC_USE_CGI=true
 # App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.6.436
+NEXT_PUBLIC_APP_VERSION=1.6.437
 NEXT_PUBLIC_CPL_MODE=production
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04e511d..bbe42c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.6.437] – 2025-06-21
+
+- chore: rename service/thunk files to follow get/fetch naming convention
+
+---
 ## [1.6.436] – 2025-06-20
 
 - Mocks erstellt für API für Entwicklungsumgebung
diff --git a/package-lock.json b/package-lock.json
index 8e8d750..d9de894 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cpl-v4",
-  "version": "1.6.436",
+  "version": "1.6.437",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cpl-v4",
-      "version": "1.6.436",
+      "version": "1.6.437",
       "dependencies": {
         "@fontsource/roboto": "^5.1.0",
         "@iconify-icons/ri": "^1.2.10",
diff --git a/package.json b/package.json
index 3e1bf11..c999ae0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpl-v4",
-  "version": "1.6.436",
+  "version": "1.6.437",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index c3c2a3e..975879f 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -21,7 +21,7 @@ import { fetchOpcUaSettingsThunk } from "../redux/thunks/fetchOpcUaSettingsThunk
 import { fetchSystemSettingsThunk } from "../redux/thunks/fetchSystemSettingsThunk";
 import { fetchSystemVoltTempThunk } from "../redux/thunks/fetchSystemVoltTempThunk";
 import { fetchReferenceCurveBySlotThunk } from "../redux/thunks/fetchReferenceCurveBySlotThunk";
-import { fetchAllTDRReferenceChartThunk } from "../redux/thunks/fetchAllTDRReferenceChartThunk";
+import { getAllTDRReferenceChartThunk } from "@/redux/thunks/getAllTDRReferenceChartThunk";
 import { fetchTDRChartDataByIdThunk } from "../redux/thunks/fetchTDRChartDataByIdThunk";
 import { fetchLoopChartDataThunk } from "../redux/thunks/fetchLoopChartDataThunk";
 
@@ -63,7 +63,7 @@ function AppContent({ Component, pageProps }: AppProps) {
       } else if (pathname.includes("system")) {
         dispatch(fetchSystemSettingsThunk());
       } else if (pathname.includes("tdrRef")) {
-        dispatch(fetchAllTDRReferenceChartThunk());
+        dispatch(getAllTDRReferenceChartThunk());
       } else if (pathname.includes("tdrSlot")) {
         dispatch(fetchReferenceCurveBySlotThunk());
       } else if (pathname.includes("tdrId")) {
diff --git a/redux/slices/tdrChartSlice.ts b/redux/slices/tdrChartSlice.ts
index 3a48594..0f10fcc 100644
--- a/redux/slices/tdrChartSlice.ts
+++ b/redux/slices/tdrChartSlice.ts
@@ -1,6 +1,6 @@
 // /redux/slices/tdrChartSlice.ts
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { fetchAllTDRChartData } from "../thunks/fetchAllTDRChartThunk";
+import { fetchAllTDRChartData } from "@/redux/thunks/getAllTDRChartThunk";
 
 interface TDRChartState {
   data: any[];
diff --git a/redux/slices/tdrReferenceChartSlice.ts b/redux/slices/tdrReferenceChartSlice.ts
index 8a6ee22..5981aff 100644
--- a/redux/slices/tdrReferenceChartSlice.ts
+++ b/redux/slices/tdrReferenceChartSlice.ts
@@ -1,7 +1,7 @@
 // /redux/slices/tdrReferenceChartSlice.ts
 
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { fetchAllTDRReferenceChartThunk } from "../thunks/fetchAllTDRReferenceChartThunk";
+import { getAllTDRReferenceChartThunk } from "@/redux/thunks/getAllTDRReferenceChartThunk";
 
 interface TDRReferenceChartState {
   referenceData: any[]; // Array mit Slot-Daten (Index = Slot)
@@ -21,18 +21,18 @@ const tdrReferenceChartSlice = createSlice({
   reducers: {},
   extraReducers: (builder) => {
     builder
-      .addCase(fetchAllTDRReferenceChartThunk.pending, (state) => {
+      .addCase(getAllTDRReferenceChartThunk.pending, (state) => {
         state.loading = true;
         state.error = null;
       })
       .addCase(
-        fetchAllTDRReferenceChartThunk.fulfilled,
+        getAllTDRReferenceChartThunk.fulfilled,
         (state, action: PayloadAction<any[]>) => {
           state.loading = false;
           state.referenceData = action.payload;
         }
       )
-      .addCase(fetchAllTDRReferenceChartThunk.rejected, (state, action) => {
+      .addCase(getAllTDRReferenceChartThunk.rejected, (state, action) => {
         state.loading = false;
         state.error = action.payload as string | null;
       });
diff --git a/redux/thunks/fetchAllTDRChartThunk.ts b/redux/thunks/getAllTDRChartThunk.ts
similarity index 87%
rename from redux/thunks/fetchAllTDRChartThunk.ts
rename to redux/thunks/getAllTDRChartThunk.ts
index f40289e..d78835e 100644
--- a/redux/thunks/fetchAllTDRChartThunk.ts
+++ b/redux/thunks/getAllTDRChartThunk.ts
@@ -1,9 +1,9 @@
-// /redux/thunks/fetchAllTDRChartThunk.ts
+// /redux/thunks/getAllTDRChartThunk.ts
 
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { RootState } from "../store";
 import isEqual from "lodash/isEqual";
-import { fetchAllTDRChartDataFromServer } from "../../services/fetchAllTDRChartDataService"; // ✅ importieren
+import { fetchAllTDRChartDataFromServer } from "@/services/fetchAllTDRChartDataService"; // ✅ importieren
 
 export const fetchAllTDRChartData = createAsyncThunk(
   "tdrChart/fetchAllTDRChartData",
diff --git a/redux/thunks/fetchAllTDRReferenceChartThunk.ts b/redux/thunks/getAllTDRReferenceChartThunk.ts
similarity index 59%
rename from redux/thunks/fetchAllTDRReferenceChartThunk.ts
rename to redux/thunks/getAllTDRReferenceChartThunk.ts
index 9fcf7ae..09c028f 100644
--- a/redux/thunks/fetchAllTDRReferenceChartThunk.ts
+++ b/redux/thunks/getAllTDRReferenceChartThunk.ts
@@ -1,9 +1,9 @@
-// /redux/thunks/fetchAllTDRReferenceChartThunk.ts
+// /redux/thunks/getAllTDRReferenceChartThunk.ts
 
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { fetchAllTDRReferenceChartData } from "../../services/fetchAllTDRReferenceChartDataService";
+import { fetchAllTDRReferenceChartData } from "@/services/fetchAllTDRReferenceChartDataService";
 
-export const fetchAllTDRReferenceChartThunk = createAsyncThunk(
+export const getAllTDRReferenceChartThunk = createAsyncThunk(
   "tdrReferenceChart/fetchAll",
   async (_, { rejectWithValue }) => {
     try {
diff --git a/tsconfig.json b/tsconfig.json
index b1d887b..c73bf1b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "module": "commonjs",
+    "module": "esnext", // Wichtig: modernes Modul-System
+    "moduleResolution": "node", // Damit Aliase zuverlässig aufgelöst werden
     "jsx": "preserve",
     "strict": true,
     "esModuleInterop": true,
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "allowSyntheticDefaultImports": true,
@@ -15,14 +15,25 @@
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "incremental": true,
+
+    // 👉 Wichtig: Basis & Pfade setzen
     "baseUrl": ".",
     "paths": {
-      "@/*": ["*"],
-      "@/redux/*": ["redux/*"],
-      "@/utils/*": ["utils/*"],
-      "@/components/*": ["components/*"]
+      "@/*": ["./*"],
+      "@/redux/*": ["./redux/*"],
+      "@/utils/*": ["./utils/*"],
+      "@/components/*": ["./components/*"],
+      "@/services/*": ["./services/*"],
+      "@/types/*": ["./types/*"]
     }
   },
-  "include": [".", "**/*.test.ts", "**/*.test.tsx", "types/global.d.ts"],
-  "exclude": ["node_modules"]
+
+  "include": [
+    ".", // Projekt-Root
+    "**/*.ts",
+    "**/*.tsx",
+    "types/global.d.ts" // falls du globale Typen nutzt
+  ],
+
+  "exclude": ["node_modules", ".next", "out"]
 }