diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py
index e16126d8..362ba3c4 100644
--- a/src/cpl/configuration/__init__.py
+++ b/src/cpl/configuration/__init__.py
@@ -23,7 +23,7 @@ from collections import namedtuple
 from .configuration import Configuration
 from .configuration_abc import ConfigurationABC
 from .configuration_model_abc import ConfigurationModelABC
-from .configuration_variable_name import ConfigurationVariableName
+from .configuration_variable_name_enum import ConfigurationVariableNameEnum
 from .console_argument import ConsoleArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
diff --git a/src/cpl/configuration/configuration.py b/src/cpl/configuration/configuration.py
index 824f3d63..25482b8c 100644
--- a/src/cpl/configuration/configuration.py
+++ b/src/cpl/configuration/configuration.py
@@ -6,13 +6,13 @@ from typing import Union, Type, Optional
 
 from cpl.configuration.configuration_abc import ConfigurationABC
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.configuration.configuration_variable_name import ConfigurationVariableName
+from cpl.configuration.configuration_variable_name_enum import ConfigurationVariableNameEnum
 from cpl.configuration.console_argument import ConsoleArgument
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.environment.hosting_environment import HostingEnvironment
 from cpl.environment.environment_abc import EnvironmentABC
-from cpl.environment.environment_name import EnvironmentName
+from cpl.environment.environment_name_enum import EnvironmentName
 
 
 class Configuration(ConfigurationABC):
@@ -69,13 +69,13 @@ class Configuration(ConfigurationABC):
         Console.set_foreground_color(ForegroundColor.default)
 
     def _set_variable(self, name: str, value: str):
-        if name == ConfigurationVariableName.environment.value:
+        if name == ConfigurationVariableNameEnum.environment.value:
             self._hosting_environment.environment_name = EnvironmentName(value)
 
-        elif name == ConfigurationVariableName.name.value:
+        elif name == ConfigurationVariableNameEnum.name.value:
             self._hosting_environment.application_name = value
 
-        elif name == ConfigurationVariableName.customer.value:
+        elif name == ConfigurationVariableNameEnum.customer.value:
             self._hosting_environment.customer = value
 
         else:
@@ -155,7 +155,7 @@ class Configuration(ConfigurationABC):
         return result
 
     def add_environment_variables(self, prefix: str):
-        for variable in ConfigurationVariableName.to_list():
+        for variable in ConfigurationVariableNameEnum.to_list():
             var_name = f'{prefix}{variable}'
             if var_name in [key.upper() for key in os.environ.keys()]:
                 self._set_variable(variable, os.environ[var_name])
@@ -164,7 +164,7 @@ class Configuration(ConfigurationABC):
         self._argument_types.append(argument)
 
     def add_console_arguments(self):
-        for arg_name in ConfigurationVariableName.to_list():
+        for arg_name in ConfigurationVariableNameEnum.to_list():
             self.add_console_argument(ConsoleArgument('--', str(arg_name).upper(), [str(arg_name).lower()], '='))
 
         arg_list = sys.argv[1:]
@@ -243,13 +243,13 @@ class Configuration(ConfigurationABC):
 
     def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[str, Callable[ConfigurationModelABC]]:
         if type(search_type) is str:
-            if search_type == ConfigurationVariableName.environment.value:
+            if search_type == ConfigurationVariableNameEnum.environment.value:
                 return self._hosting_environment.environment_name
 
-            elif search_type == ConfigurationVariableName.name.value:
+            elif search_type == ConfigurationVariableNameEnum.name.value:
                 return self._hosting_environment.application_name
 
-            elif search_type == ConfigurationVariableName.customer.value:
+            elif search_type == ConfigurationVariableNameEnum.customer.value:
                 return self._hosting_environment.customer
 
         if search_type not in self._config:
diff --git a/src/cpl/configuration/configuration_variable_name.py b/src/cpl/configuration/configuration_variable_name_enum.py
similarity index 55%
rename from src/cpl/configuration/configuration_variable_name.py
rename to src/cpl/configuration/configuration_variable_name_enum.py
index c89deb88..7db3688d 100644
--- a/src/cpl/configuration/configuration_variable_name.py
+++ b/src/cpl/configuration/configuration_variable_name_enum.py
@@ -1,7 +1,7 @@
 from enum import Enum
 
 
-class ConfigurationVariableName(Enum):
+class ConfigurationVariableNameEnum(Enum):
 
     environment = 'ENVIRONMENT'
     name = 'NAME'
@@ -9,4 +9,4 @@ class ConfigurationVariableName(Enum):
 
     @staticmethod
     def to_list():
-        return [var.value for var in ConfigurationVariableName]
+        return [var.value for var in ConfigurationVariableNameEnum]
diff --git a/src/cpl/configuration/console_argument.py b/src/cpl/configuration/console_argument.py
index 84b37b35..d49f7de8 100644
--- a/src/cpl/configuration/console_argument.py
+++ b/src/cpl/configuration/console_argument.py
@@ -1,6 +1,7 @@
 class ConsoleArgument:
 
-    def __init__(self, token: str, name: str, aliases: list[str], value_token: str, console_arguments: list['ConsoleArgument'] = None):
+    def __init__(self, token: str, name: str, aliases: list[str], value_token: str, console_arguments: list[
+        'ConsoleArgument'] = None):
         self._token = token
         self._name = name
         self._aliases = aliases
diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py
index 00be5915..caaa96b0 100644
--- a/src/cpl/console/__init__.py
+++ b/src/cpl/console/__init__.py
@@ -20,10 +20,10 @@ __version__ = '2021.4.1'
 from collections import namedtuple
 
 # imports:
-from .background_color import BackgroundColor
+from .background_color_enum import BackgroundColorEnum
 from .console import Console
 from .console_call import ConsoleCall
-from .foreground_color import ForegroundColor
+from .foreground_color_enum import ForegroundColor
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
diff --git a/src/cpl/console/background_color.py b/src/cpl/console/background_color_enum.py
similarity index 87%
rename from src/cpl/console/background_color.py
rename to src/cpl/console/background_color_enum.py
index f4947e30..64258332 100644
--- a/src/cpl/console/background_color.py
+++ b/src/cpl/console/background_color_enum.py
@@ -1,7 +1,7 @@
 from enum import Enum
 
 
-class BackgroundColor(Enum):
+class BackgroundColorEnum(Enum):
 
     default = 'on_default'
     grey = 'on_grey'
diff --git a/src/cpl/console/console.py b/src/cpl/console/console.py
index dba6f319..23405deb 100644
--- a/src/cpl/console/console.py
+++ b/src/cpl/console/console.py
@@ -6,16 +6,16 @@ import pyfiglet
 from tabulate import tabulate
 from termcolor import colored
 
-from cpl.console.background_color import BackgroundColor
+from cpl.console.background_color_enum import BackgroundColorEnum
 from cpl.console.console_call import ConsoleCall
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.console.spinner_thread import SpinnerThread
 
 
 class Console:
     _is_first_write = True
 
-    _background_color: BackgroundColor = BackgroundColor.default
+    _background_color: BackgroundColorEnum = BackgroundColorEnum.default
     _foreground_color: ForegroundColor = ForegroundColor.default
     _x: Optional[int] = None
     _y: Optional[int] = None
@@ -47,9 +47,9 @@ class Console:
         cls._hold_back = value
 
     @classmethod
-    def set_background_color(cls, color: Union[BackgroundColor, str]):
+    def set_background_color(cls, color: Union[BackgroundColorEnum, str]):
         if type(color) is str:
-            cls._background_color = BackgroundColor[color]
+            cls._background_color = BackgroundColorEnum[color]
         else:
             cls._background_color = color
 
@@ -88,11 +88,11 @@ class Console:
             args.append(f'\033[{cls._y};{cls._x}H')
 
         colored_args.append(string)
-        if cls._foreground_color != ForegroundColor.default and cls._background_color == BackgroundColor.default:
+        if cls._foreground_color != ForegroundColor.default and cls._background_color == BackgroundColorEnum.default:
             colored_args.append(cls._foreground_color.value)
-        elif cls._foreground_color == ForegroundColor.default and cls._background_color != BackgroundColor.default:
+        elif cls._foreground_color == ForegroundColor.default and cls._background_color != BackgroundColorEnum.default:
             colored_args.append(cls._background_color.value)
-        elif cls._foreground_color != ForegroundColor.default and cls._background_color != BackgroundColor.default:
+        elif cls._foreground_color != ForegroundColor.default and cls._background_color != BackgroundColorEnum.default:
             colored_args.append(cls._foreground_color.value)
             colored_args.append(cls._background_color.value)
 
@@ -182,7 +182,7 @@ class Console:
 
     @classmethod
     def reset(cls):
-        cls._background_color = BackgroundColor.default
+        cls._background_color = BackgroundColorEnum.default
         cls._foreground_color = ForegroundColor.default
 
     @classmethod
@@ -252,7 +252,7 @@ class Console:
         cls._output(string, x, y, end='')
 
     @classmethod
-    def spinner(cls, message: str, call: Callable, *args, text_foreground_color: ForegroundColor = None, spinner_foreground_color: ForegroundColor = None, text_background_color: BackgroundColor = None, spinner_background_color: BackgroundColor = None) -> any:
+    def spinner(cls, message: str, call: Callable, *args, text_foreground_color: ForegroundColor = None, spinner_foreground_color: ForegroundColor = None, text_background_color: BackgroundColorEnum = None, spinner_background_color: BackgroundColorEnum = None) -> any:
         if cls._hold_back:
             cls._hold_back_calls.append(ConsoleCall(cls.spinner, message, call, *args))
             return
@@ -272,7 +272,7 @@ class Console:
         cls.set_hold_back(False)
 
         cls.set_foreground_color(ForegroundColor.default)
-        cls.set_background_color(BackgroundColor.default)
+        cls.set_background_color(BackgroundColorEnum.default)
 
         for call in cls._hold_back_calls:
             call.function(*call.args)
diff --git a/src/cpl/console/foreground_color.py b/src/cpl/console/foreground_color_enum.py
similarity index 100%
rename from src/cpl/console/foreground_color.py
rename to src/cpl/console/foreground_color_enum.py
diff --git a/src/cpl/console/spinner_thread.py b/src/cpl/console/spinner_thread.py
index ff13eb9e..89e4c2b1 100644
--- a/src/cpl/console/spinner_thread.py
+++ b/src/cpl/console/spinner_thread.py
@@ -5,13 +5,13 @@ import time
 
 from termcolor import colored
 
-from cpl.console.background_color import BackgroundColor
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.background_color_enum import BackgroundColorEnum
+from cpl.console.foreground_color_enum import ForegroundColor
 
 
 class SpinnerThread(threading.Thread):
 
-    def __init__(self, msg_len: int, foreground_color: ForegroundColor, background_color: BackgroundColor):
+    def __init__(self, msg_len: int, foreground_color: ForegroundColor, background_color: BackgroundColorEnum):
         threading.Thread.__init__(self)
 
         self._msg_len = msg_len
diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py
index da0ebbc3..5a33e0d3 100644
--- a/src/cpl/database/__init__.py
+++ b/src/cpl/database/__init__.py
@@ -22,7 +22,7 @@ from collections import namedtuple
 # imports:
 from .database_model import DatabaseModel
 from .database_settings import DatabaseSettings
-from .database_settings_name import DatabaseSettingsName
+from .database_settings_name_enum import DatabaseSettingsName
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/database/connection/database_connection.py b/src/cpl/database/connection/database_connection.py
index 9176ed37..d9ca3374 100644
--- a/src/cpl/database/connection/database_connection.py
+++ b/src/cpl/database/connection/database_connection.py
@@ -4,7 +4,7 @@ from sqlalchemy import engine, create_engine
 from sqlalchemy.orm import Session, sessionmaker
 
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.database.connection.database_connection_abc import DatabaseConnectionABC
 from cpl.database.database_settings import DatabaseSettings
 
diff --git a/src/cpl/database/context/database_context.py b/src/cpl/database/context/database_context.py
index 4eeeabdb..84a07a65 100644
--- a/src/cpl/database/context/database_context.py
+++ b/src/cpl/database/context/database_context.py
@@ -2,7 +2,7 @@ from sqlalchemy import engine, Table
 from sqlalchemy.orm import Session
 
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.database.connection.database_connection import DatabaseConnection
 from cpl.database.connection.database_connection_abc import DatabaseConnectionABC
 from cpl.database.context.database_context_abc import DatabaseContextABC
diff --git a/src/cpl/database/database_settings.py b/src/cpl/database/database_settings.py
index d6e6c3ff..aafdcbf4 100644
--- a/src/cpl/database/database_settings.py
+++ b/src/cpl/database/database_settings.py
@@ -3,8 +3,8 @@ from typing import Optional
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
-from cpl.database.database_settings_name import DatabaseSettingsName
+from cpl.console.foreground_color_enum import ForegroundColor
+from cpl.database.database_settings_name_enum import DatabaseSettingsName
 
 
 class DatabaseSettings(ConfigurationModelABC):
diff --git a/src/cpl/database/database_settings_name.py b/src/cpl/database/database_settings_name_enum.py
similarity index 100%
rename from src/cpl/database/database_settings_name.py
rename to src/cpl/database/database_settings_name_enum.py
diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py
index 0cc01d06..5b1e64c0 100644
--- a/src/cpl/environment/__init__.py
+++ b/src/cpl/environment/__init__.py
@@ -21,7 +21,7 @@ from collections import namedtuple
 
 # imports:
 from .environment_abc import EnvironmentABC
-from .environment_name import EnvironmentName
+from .environment_name_enum import EnvironmentName
 from .hosting_environment import HostingEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
diff --git a/src/cpl/environment/environment_name.py b/src/cpl/environment/environment_name_enum.py
similarity index 100%
rename from src/cpl/environment/environment_name.py
rename to src/cpl/environment/environment_name_enum.py
diff --git a/src/cpl/environment/hosting_environment.py b/src/cpl/environment/hosting_environment.py
index 1bc22da3..9258a6c8 100644
--- a/src/cpl/environment/hosting_environment.py
+++ b/src/cpl/environment/hosting_environment.py
@@ -2,7 +2,7 @@ from socket import gethostname
 from typing import Optional
 
 from cpl.environment.environment_abc import EnvironmentABC
-from cpl.environment.environment_name import EnvironmentName
+from cpl.environment.environment_name_enum import EnvironmentName
 
 
 class HostingEnvironment(EnvironmentABC):
diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py
index 7ed0b091..5f101bbd 100644
--- a/src/cpl/logging/__init__.py
+++ b/src/cpl/logging/__init__.py
@@ -20,11 +20,11 @@ __version__ = '2021.4.1'
 from collections import namedtuple
 
 # imports:
-from .logger import Logger
+from .logger_service import Logger
 from .logger_abc import LoggerABC
-from .logging_level import LoggingLevel
+from .logging_level_enum import LoggingLevel
 from .logging_settings import LoggingSettings
-from .logging_settings_name import LoggingSettingsName
+from .logging_settings_name_enum import LoggingSettingsName
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/logging/logger.py b/src/cpl/logging/logger_service.py
similarity index 98%
rename from src/cpl/logging/logger.py
rename to src/cpl/logging/logger_service.py
index 69163fec..be394267 100644
--- a/src/cpl/logging/logger.py
+++ b/src/cpl/logging/logger_service.py
@@ -5,9 +5,9 @@ from string import Template
 
 from cpl.application.application_runtime_abc import ApplicationRuntimeABC
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.logging.logger_abc import LoggerABC
-from cpl.logging.logging_level import LoggingLevel
+from cpl.logging.logging_level_enum import LoggingLevel
 from cpl.logging.logging_settings import LoggingSettings
 from cpl.time.time_format_settings import TimeFormatSettings
 
diff --git a/src/cpl/logging/logging_level.py b/src/cpl/logging/logging_level_enum.py
similarity index 100%
rename from src/cpl/logging/logging_level.py
rename to src/cpl/logging/logging_level_enum.py
diff --git a/src/cpl/logging/logging_settings.py b/src/cpl/logging/logging_settings.py
index 191298f8..92baf1a2 100644
--- a/src/cpl/logging/logging_settings.py
+++ b/src/cpl/logging/logging_settings.py
@@ -3,9 +3,9 @@ from typing import Optional
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
-from cpl.logging.logging_level import LoggingLevel
-from cpl.logging.logging_settings_name import LoggingSettingsName
+from cpl.console.foreground_color_enum import ForegroundColor
+from cpl.logging.logging_level_enum import LoggingLevel
+from cpl.logging.logging_settings_name_enum import LoggingSettingsName
 
 
 class LoggingSettings(ConfigurationModelABC):
diff --git a/src/cpl/logging/logging_settings_name.py b/src/cpl/logging/logging_settings_name_enum.py
similarity index 100%
rename from src/cpl/logging/logging_settings_name.py
rename to src/cpl/logging/logging_settings_name_enum.py
diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py
index 36c88dff..fc3617f0 100644
--- a/src/cpl/mailing/__init__.py
+++ b/src/cpl/mailing/__init__.py
@@ -21,10 +21,10 @@ from collections import namedtuple
 
 # imports:
 from .email import EMail
-from .email_client import EMailClient
+from .email_client_service import EMailClient
 from .email_client_abc import EMailClientABC
 from .email_client_settings import EMailClientSettings
-from .email_client_settings_name import EMailClientSettingsName
+from .email_client_settings_name_enum import EMailClientSettingsName
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/mailing/email_client.py b/src/cpl/mailing/email_client_service.py
similarity index 100%
rename from src/cpl/mailing/email_client.py
rename to src/cpl/mailing/email_client_service.py
diff --git a/src/cpl/mailing/email_client_settings.py b/src/cpl/mailing/email_client_settings.py
index 87ac9f4f..2b53250c 100644
--- a/src/cpl/mailing/email_client_settings.py
+++ b/src/cpl/mailing/email_client_settings.py
@@ -2,7 +2,7 @@ import traceback
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl.console.console import Console
-from cpl.mailing.email_client_settings_name import EMailClientSettingsName
+from cpl.mailing.email_client_settings_name_enum import EMailClientSettingsName
 
 
 class EMailClientSettings(ConfigurationModelABC):
diff --git a/src/cpl/mailing/email_client_settings_name.py b/src/cpl/mailing/email_client_settings_name_enum.py
similarity index 100%
rename from src/cpl/mailing/email_client_settings_name.py
rename to src/cpl/mailing/email_client_settings_name_enum.py
diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py
index 6d43e54b..5c075d4d 100644
--- a/src/cpl/time/__init__.py
+++ b/src/cpl/time/__init__.py
@@ -21,7 +21,7 @@ from collections import namedtuple
 
 # imports:
 from .time_format_settings import TimeFormatSettings
-from .time_format_settings_names import TimeFormatSettingsNames
+from .time_format_settings_names_enum import TimeFormatSettingsNames
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl/time/time_format_settings.py b/src/cpl/time/time_format_settings.py
index 52a99a08..f810bf21 100644
--- a/src/cpl/time/time_format_settings.py
+++ b/src/cpl/time/time_format_settings.py
@@ -3,8 +3,8 @@ from typing import Optional
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
-from cpl.time.time_format_settings_names import TimeFormatSettingsNames
+from cpl.console.foreground_color_enum import ForegroundColor
+from cpl.time.time_format_settings_names_enum import TimeFormatSettingsNames
 
 
 class TimeFormatSettings(ConfigurationModelABC):
diff --git a/src/cpl/time/time_format_settings_names.py b/src/cpl/time/time_format_settings_names_enum.py
similarity index 100%
rename from src/cpl/time/time_format_settings_names.py
rename to src/cpl/time/time_format_settings_names_enum.py
diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py
index 607c4864..86e7cc32 100644
--- a/src/cpl/utils/__init__.py
+++ b/src/cpl/utils/__init__.py
@@ -21,6 +21,7 @@ from collections import namedtuple
 
 # imports:
 from .credential_manager import CredentialManager
+from .string import String
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl_cli/command/generate.py b/src/cpl_cli/command/generate.py
index 20a109ce..0afe9b51 100644
--- a/src/cpl_cli/command/generate.py
+++ b/src/cpl_cli/command/generate.py
@@ -3,7 +3,7 @@ from collections import Callable
 
 from cpl.application.application_abc import ApplicationRuntimeABC
 from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.console.console import Console
 from cpl.utils.string import String
 from cpl_cli.command_abc import CommandABC
@@ -26,7 +26,7 @@ class Generate(CommandABC):
                 "Template": ABCTemplate
             },
             "class": {
-                "Upper": "Class",
+                "Upper": "",
                 "Template": ClassTemplate
             },
             "enum": {
diff --git a/src/cpl_cli/command/help.py b/src/cpl_cli/command/help.py
index 33bfd959..fc5628c2 100644
--- a/src/cpl_cli/command/help.py
+++ b/src/cpl_cli/command/help.py
@@ -1,5 +1,5 @@
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl_cli.command_abc import CommandABC
 
 
diff --git a/src/cpl_cli/command/new.py b/src/cpl_cli/command/new.py
index 175aa870..c8614c68 100644
--- a/src/cpl_cli/command/new.py
+++ b/src/cpl_cli/command/new.py
@@ -6,7 +6,7 @@ from typing import Optional
 
 from cpl.application.application_runtime_abc import ApplicationRuntimeABC
 from cpl.configuration.configuration_abc import ConfigurationABC
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.console.console import Console
 from cpl_cli.command_abc import CommandABC
 from cpl_cli.configuration.build_settings import BuildSettings
diff --git a/src/cpl_cli/command/version.py b/src/cpl_cli/command/version.py
index 1c7e6a7b..5c4c3036 100644
--- a/src/cpl_cli/command/version.py
+++ b/src/cpl_cli/command/version.py
@@ -7,7 +7,7 @@ import pkg_resources
 import cpl
 import cpl_cli
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl_cli.command_abc import CommandABC
 
 
diff --git a/src/cpl_cli/configuration/build_settings.py b/src/cpl_cli/configuration/build_settings.py
index 3e5e0f3f..40983740 100644
--- a/src/cpl_cli/configuration/build_settings.py
+++ b/src/cpl_cli/configuration/build_settings.py
@@ -3,7 +3,7 @@ from typing import Optional
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl_cli.configuration.build_settings_name import BuildSettingsName
 
 
diff --git a/src/cpl_cli/configuration/project_settings.py b/src/cpl_cli/configuration/project_settings.py
index e861fc7c..4e4297eb 100644
--- a/src/cpl_cli/configuration/project_settings.py
+++ b/src/cpl_cli/configuration/project_settings.py
@@ -3,7 +3,7 @@ from typing import Optional
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl.console.console import Console
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl_cli.configuration.version import Version
 from cpl_cli.configuration.project_settings_name import ProjectSettingsName
 
diff --git a/src/cpl_cli/publish/publisher.py b/src/cpl_cli/publish/publisher.py
index b7bfd2f8..3657b123 100644
--- a/src/cpl_cli/publish/publisher.py
+++ b/src/cpl_cli/publish/publisher.py
@@ -7,7 +7,7 @@ import setuptools
 from setuptools import sandbox
 
 from cpl.application.application_runtime_abc import ApplicationRuntimeABC
-from cpl.console.foreground_color import ForegroundColor
+from cpl.console.foreground_color_enum import ForegroundColor
 from cpl.console.console import Console
 from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.configuration.project_settings import ProjectSettings
diff --git a/src/cpl_cli/templates/generate/__init__.py b/src/cpl_cli/templates/generate/__init__.py
index e69de29b..2be4ae3c 100644
--- a/src/cpl_cli/templates/generate/__init__.py
+++ b/src/cpl_cli/templates/generate/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+sh_cpl sh-edraft Common Python library
+~~~~~~~~~~~~~~~~~~~
+
+sh-edraft Common Python library
+
+:copyright: (c) 2020 - 2021 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'cpl_cli.templates.generate'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
+__version__ = '2021.4.1'
+
+from collections import namedtuple
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl_cli/templates/generate/class_template.py b/src/cpl_cli/templates/generate/class_template.py
index 1eb2ed53..2c754027 100644
--- a/src/cpl_cli/templates/generate/class_template.py
+++ b/src/cpl_cli/templates/generate/class_template.py
@@ -10,8 +10,8 @@ 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._class_name = f'{String.first_to_upper(name)}{schematic_upper}'
+        self._name = f'{String.convert_to_snake_case(name)}.py'
+        self._class_name = f'{String.first_to_upper(name)}'
         self._path = path
         self._value = textwrap.dedent("""\
         class $Name:
diff --git a/src/tests/startup.py b/src/tests/startup.py
index 3e0b0a5e..f667cc4c 100644
--- a/src/tests/startup.py
+++ b/src/tests/startup.py
@@ -7,9 +7,9 @@ from cpl.configuration.configuration_abc import ConfigurationABC
 from cpl.database.context.database_context import DatabaseContext
 from cpl.database.database_settings import DatabaseSettings
 from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
-from cpl.logging.logger import Logger
+from cpl.logging.logger_service import Logger
 from cpl.logging.logger_abc import LoggerABC
-from cpl.mailing.email_client import EMailClient
+from cpl.mailing.email_client_service import EMailClient
 from cpl.mailing.email_client_abc import EMailClientABC
 from cpl.utils.credential_manager import CredentialManager