diff --git a/dist/package-shared/functions/dsql/db-schema-to-type.js b/dist/package-shared/functions/dsql/db-schema-to-type.js
index 9120296..b3ba53e 100644
--- a/dist/package-shared/functions/dsql/db-schema-to-type.js
+++ b/dist/package-shared/functions/dsql/db-schema-to-type.js
@@ -8,6 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const generate_type_definitions_1 = __importDefault(require("./generate-type-definitions"));
 const app_names_1 = require("../../dict/app-names");
 const defaultFields_json_1 = __importDefault(require("../../data/defaultFields.json"));
+const slugify_1 = __importDefault(require("../../utils/slugify"));
 function dbSchemaToType(params) {
     var _a, _b;
     let datasquirelSchema = params === null || params === void 0 ? void 0 : params.dbSchema;
@@ -29,6 +30,7 @@ function dbSchemaToType(params) {
     });
     const defDbName = (_b = (datasquirelSchema.dbName ||
         ((_a = datasquirelSchema.dbFullName) === null || _a === void 0 ? void 0 : _a.replace(new RegExp(`${app_names_1.AppNames["DsqlDbPrefix"]}\\d+_`), "")))) === null || _b === void 0 ? void 0 : _b.toUpperCase().replace(/ /g, "_");
+    const finalDefDbName = (0, slugify_1.default)(defDbName);
     const defNames = [];
     const schemas = dbTablesSchemas
         .map((table) => {
@@ -36,7 +38,7 @@ function dbSchemaToType(params) {
         const defObj = (0, generate_type_definitions_1.default)({
             paradigm: "TypeScript",
             table,
-            typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
+            typeDefName: `DSQL_${finalDefDbName}_${table.tableName.toUpperCase()}`,
             allValuesOptional: true,
             addExport: true,
         });
@@ -47,7 +49,7 @@ function dbSchemaToType(params) {
     })
         .filter((schm) => typeof schm == "string");
     const allTd = (defNames === null || defNames === void 0 ? void 0 : defNames[0])
-        ? `export type DSQL_${defDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
+        ? `export type DSQL_${finalDefDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
         : ``;
     return [tableNames, ...schemas, allTd];
 }
diff --git a/dist/package-shared/functions/dsql/generate-type-definitions.js b/dist/package-shared/functions/dsql/generate-type-definitions.js
index bdbe8fe..1f704d8 100644
--- a/dist/package-shared/functions/dsql/generate-type-definitions.js
+++ b/dist/package-shared/functions/dsql/generate-type-definitions.js
@@ -11,7 +11,7 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
     let tdName = ``;
     try {
         tdName = typeDefName
-            ? (0, slugify_1.default)(typeDefName, "_").toUpperCase()
+            ? typeDefName
             : dbName
                 ? (0, slugify_1.default)(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
                 : (0, slugify_1.default)(`DSQL_${query.single}_${query.single_table}`, "_").toUpperCase();
diff --git a/package-shared/functions/dsql/db-schema-to-type.ts b/package-shared/functions/dsql/db-schema-to-type.ts
index a2c5611..ca17538 100644
--- a/package-shared/functions/dsql/db-schema-to-type.ts
+++ b/package-shared/functions/dsql/db-schema-to-type.ts
@@ -3,6 +3,7 @@ import _ from "lodash";
 import generateTypeDefinition from "./generate-type-definitions";
 import { AppNames } from "../../dict/app-names";
 import defaultFields from "../../data/defaultFields.json";
+import slugify from "../../utils/slugify";
 
 type Params = {
     dbSchema?: DSQL_DatabaseSchemaType;
@@ -36,12 +37,14 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
         datasquirelSchema.dbName ||
         datasquirelSchema.dbFullName?.replace(
             new RegExp(`${AppNames["DsqlDbPrefix"]}\\d+_`),
-            ""
+            "",
         )
     )
         ?.toUpperCase()
         .replace(/ /g, "_");
 
+    const finalDefDbName = slugify(defDbName);
+
     const defNames: string[] = [];
 
     const schemas = dbTablesSchemas
@@ -49,7 +52,7 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
             const defObj = generateTypeDefinition({
                 paradigm: "TypeScript",
                 table,
-                typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
+                typeDefName: `DSQL_${finalDefDbName}_${table.tableName.toUpperCase()}`,
                 allValuesOptional: true,
                 addExport: true,
             });
@@ -63,7 +66,7 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
         .filter((schm) => typeof schm == "string");
 
     const allTd = defNames?.[0]
-        ? `export type DSQL_${defDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
+        ? `export type DSQL_${finalDefDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
         : ``;
 
     return [tableNames, ...schemas, allTd];
diff --git a/package-shared/functions/dsql/generate-type-definitions.ts b/package-shared/functions/dsql/generate-type-definitions.ts
index a22c91f..037ec83 100644
--- a/package-shared/functions/dsql/generate-type-definitions.ts
+++ b/package-shared/functions/dsql/generate-type-definitions.ts
@@ -26,7 +26,7 @@ export default function generateTypeDefinition({
 
     try {
         tdName = typeDefName
-            ? slugify(typeDefName, "_").toUpperCase()
+            ? typeDefName
             : dbName
               ? slugify(`DSQL_${dbName}_${table.tableName}`, "_").toUpperCase()
               : slugify(
diff --git a/package.json b/package.json
index e4ce915..aecced2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.7.49",
+    "version": "5.7.50",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {