diff --git a/src/cpl_cli/command/generate.py b/src/cpl_cli/command/generate.py
index c5e355ea..451570e1 100644
--- a/src/cpl_cli/command/generate.py
+++ b/src/cpl_cli/command/generate.py
@@ -5,7 +5,7 @@ from cpl.application.application_abc import ApplicationRuntimeABC
 from cpl.configuration.configuration_abc import ConfigurationABC
 from cpl.console.foreground_color import ForegroundColor
 from cpl.console.console import Console
-from cpl.utils.string import String
+from cpl.utils.string_class import String
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.templates.generate.abc_template import ABCTemplate
 from cpl_cli.templates.generate.class_template import ClassTemplate
diff --git a/src/cpl_cli/templates/generate/abc_template.py b/src/cpl_cli/templates/generate/abc_template.py
index 9891bd40..cb6474a7 100644
--- a/src/cpl_cli/templates/generate/abc_template.py
+++ b/src/cpl_cli/templates/generate/abc_template.py
@@ -10,7 +10,7 @@ class ABCTemplate(TemplateFileABC):
     def __init__(self, name: str, schematic: str, schematic_upper: str, path: str):
         TemplateFileABC.__init__(self)
 
-        self._name = f'{String.convert_to_snake_case(name)}.{schematic}.py'
+        self._name = f'{String.convert_to_snake_case(name)}_{schematic}.py'
         self._class_name = f'{String.first_to_upper(name)}{schematic_upper}'
         self._path = path
         self._value = textwrap.dedent("""\
diff --git a/src/cpl_cli/templates/generate/class_template.py b/src/cpl_cli/templates/generate/class_template.py
index b37972eb..1eb2ed53 100644
--- a/src/cpl_cli/templates/generate/class_template.py
+++ b/src/cpl_cli/templates/generate/class_template.py
@@ -10,7 +10,7 @@ class ClassTemplate(TemplateFileABC):
     def __init__(self, name: str, schematic: str, schematic_upper: str, path: str):
         TemplateFileABC.__init__(self)
 
-        self._name = f'{String.convert_to_snake_case(name)}.{schematic}.py'
+        self._name = f'{String.convert_to_snake_case(name)}_{schematic}.py'
         self._class_name = f'{String.first_to_upper(name)}{schematic_upper}'
         self._path = path
         self._value = textwrap.dedent("""\
diff --git a/src/cpl_cli/templates/generate/configmodel_template.py b/src/cpl_cli/templates/generate/configmodel_template.py
index f4c4afb3..2c9461e1 100644
--- a/src/cpl_cli/templates/generate/configmodel_template.py
+++ b/src/cpl_cli/templates/generate/configmodel_template.py
@@ -10,7 +10,7 @@ class ConfigModelTemplate(TemplateFileABC):
     def __init__(self, name: str, schematic: str, schematic_upper: str, path: str):
         TemplateFileABC.__init__(self)
 
-        self._name = f'{String.convert_to_snake_case(name)}.{schematic}.py'
+        self._name = f'{String.convert_to_snake_case(name)}_{schematic}.py'
         self._class_name = f'{String.first_to_upper(name)}{schematic_upper}'
         self._path = path
         self._value = textwrap.dedent("""\
diff --git a/src/cpl_cli/templates/generate/enum_template.py b/src/cpl_cli/templates/generate/enum_template.py
index d0f69e50..9cf20ab9 100644
--- a/src/cpl_cli/templates/generate/enum_template.py
+++ b/src/cpl_cli/templates/generate/enum_template.py
@@ -10,7 +10,7 @@ class EnumTemplate(TemplateFileABC):
     def __init__(self, name: str, schematic: str, schematic_upper: str, path: str):
         TemplateFileABC.__init__(self)
 
-        self._name = f'{String.convert_to_snake_case(name)}.{schematic}.py'
+        self._name = f'{String.convert_to_snake_case(name)}_{schematic}.py'
         self._class_name = f'{String.first_to_upper(name)}{schematic_upper}'
         self._path = path
         self._value = textwrap.dedent("""\
diff --git a/src/cpl_cli/templates/generate/service_template.py b/src/cpl_cli/templates/generate/service_template.py
index 3fd3a9cf..65622711 100644
--- a/src/cpl_cli/templates/generate/service_template.py
+++ b/src/cpl_cli/templates/generate/service_template.py
@@ -10,7 +10,7 @@ class ServiceTemplate(TemplateFileABC):
     def __init__(self, name: str, schematic: str, schematic_upper: str, path: str):
         TemplateFileABC.__init__(self)
 
-        self._name = f'{String.convert_to_snake_case(name)}.{schematic}.py'
+        self._name = f'{String.convert_to_snake_case(name)}_{schematic}.py'
         self._class_name = f'{String.first_to_upper(name)}{schematic_upper}'
         self._path = path
         self._value = textwrap.dedent("""\