diff --git a/backend/src/collections/preference-db/preference-common.service.ts b/backend/src/collections/preference-db/preference-common.service.ts
index 2ccc724..ee7012a 100644
--- a/backend/src/collections/preference-db/preference-common.service.ts
+++ b/backend/src/collections/preference-db/preference-common.service.ts
@@ -24,7 +24,7 @@ type EncodedPref = {
 
 @Injectable()
 export class PreferenceCommonService {
-  private readonly logger = new Logger('PreferenceCommonService');
+  private readonly logger = new Logger(PreferenceCommonService.name);
 
   // Preferences values are only validated upon encoding, not decoding
   // The preference keys are always validated
diff --git a/backend/src/collections/preference-db/preference-db.module.ts b/backend/src/collections/preference-db/preference-db.module.ts
index 76e30cb..34ca89b 100644
--- a/backend/src/collections/preference-db/preference-db.module.ts
+++ b/backend/src/collections/preference-db/preference-db.module.ts
@@ -5,8 +5,8 @@ import { ESysPreferenceBackend } from '../../database/entities/sys-preference.en
 import { EUsrPreferenceBackend } from '../../database/entities/usr-preference.entity';
 import { PreferenceCommonService } from './preference-common.service';
 import { PreferenceDefaultsService } from './preference-defaults.service';
-import { SysPreferenceService } from './sys-preference-db.service';
-import { UsrPreferenceService } from './usr-preference-db.service';
+import { SysPreferenceDbService } from './sys-preference-db.service';
+import { UsrPreferenceDbService } from './usr-preference-db.service';
 
 @Module({
   imports: [
@@ -14,11 +14,11 @@ import { UsrPreferenceService } from './usr-preference-db.service';
     EarlyConfigModule,
   ],
   providers: [
-    SysPreferenceService,
-    UsrPreferenceService,
+    SysPreferenceDbService,
+    UsrPreferenceDbService,
     PreferenceDefaultsService,
     PreferenceCommonService,
   ],
-  exports: [SysPreferenceService, UsrPreferenceService],
+  exports: [SysPreferenceDbService, UsrPreferenceDbService],
 })
-export class PreferenceModule {}
+export class PreferenceDbModule {}
diff --git a/backend/src/collections/preference-db/preference-defaults.service.ts b/backend/src/collections/preference-db/preference-defaults.service.ts
index b37a2e9..98021a8 100644
--- a/backend/src/collections/preference-db/preference-defaults.service.ts
+++ b/backend/src/collections/preference-db/preference-defaults.service.ts
@@ -11,7 +11,7 @@ import { EarlyJwtConfigService } from '../../config/early/early-jwt.config.servi
 
 @Injectable()
 export class PreferenceDefaultsService {
-  private readonly logger = new Logger('PreferenceDefaultsService');
+  private readonly logger = new Logger(PreferenceDefaultsService.name);
 
   constructor(private readonly jwtConfigService: EarlyJwtConfigService) {}
 
diff --git a/backend/src/collections/preference-db/sys-preference-db.service.ts b/backend/src/collections/preference-db/sys-preference-db.service.ts
index 070dc12..ed40f38 100644
--- a/backend/src/collections/preference-db/sys-preference-db.service.ts
+++ b/backend/src/collections/preference-db/sys-preference-db.service.ts
@@ -1,28 +1,28 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import {
-    DecodedSysPref,
-    PrefValueType,
-    PrefValueTypeStrings
+  DecodedSysPref,
+  PrefValueType,
+  PrefValueTypeStrings
 } from 'picsur-shared/dist/dto/preferences.dto';
 import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
 import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';
 import { Repository } from 'typeorm';
 import {
-    ESysPreferenceBackend,
-    ESysPreferenceSchema
+  ESysPreferenceBackend,
+  ESysPreferenceSchema
 } from '../../database/entities/sys-preference.entity';
 import {
-    SysPreferenceList,
-    SysPreferenceValueTypes
+  SysPreferenceList,
+  SysPreferenceValueTypes
 } from '../../models/constants/syspreferences.const';
 import { MutexFallBack } from '../../util/mutex-fallback';
 import { PreferenceCommonService } from './preference-common.service';
 import { PreferenceDefaultsService } from './preference-defaults.service';
 
 @Injectable()
-export class SysPreferenceService {
-  private readonly logger = new Logger('SysPreferenceService');
+export class SysPreferenceDbService {
+  private readonly logger = new Logger(SysPreferenceDbService.name);
 
   constructor(
     @InjectRepository(ESysPreferenceBackend)
diff --git a/backend/src/collections/preference-db/usr-preference-db.service.ts b/backend/src/collections/preference-db/usr-preference-db.service.ts
index 0053b9c..fed3c12 100644
--- a/backend/src/collections/preference-db/usr-preference-db.service.ts
+++ b/backend/src/collections/preference-db/usr-preference-db.service.ts
@@ -1,28 +1,28 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import {
-    DecodedUsrPref,
-    PrefValueType,
-    PrefValueTypeStrings
+  DecodedUsrPref,
+  PrefValueType,
+  PrefValueTypeStrings
 } from 'picsur-shared/dist/dto/preferences.dto';
 import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.enum';
 import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';
 import { Repository } from 'typeorm';
 import {
-    EUsrPreferenceBackend,
-    EUsrPreferenceSchema
+  EUsrPreferenceBackend,
+  EUsrPreferenceSchema
 } from '../../database/entities/usr-preference.entity';
 import {
-    UsrPreferenceList,
-    UsrPreferenceValueTypes
+  UsrPreferenceList,
+  UsrPreferenceValueTypes
 } from '../../models/constants/usrpreferences.const';
 import { MutexFallBack } from '../../util/mutex-fallback';
 import { PreferenceCommonService } from './preference-common.service';
 import { PreferenceDefaultsService } from './preference-defaults.service';
 
 @Injectable()
-export class UsrPreferenceService {
-  private readonly logger = new Logger('UsrPreferenceService');
+export class UsrPreferenceDbService {
+  private readonly logger = new Logger(UsrPreferenceDbService.name);
 
   constructor(
     @InjectRepository(EUsrPreferenceBackend)
diff --git a/backend/src/collections/role-db/role-db.module.ts b/backend/src/collections/role-db/role-db.module.ts
index 7c17b15..ce4e119 100644
--- a/backend/src/collections/role-db/role-db.module.ts
+++ b/backend/src/collections/role-db/role-db.module.ts
@@ -9,18 +9,18 @@ import {
   SystemRoleDefaults,
   SystemRolesList
 } from '../../models/constants/roles.const';
-import { RolesService } from './role-db.service';
+import { RoleDbService } from './role-db.service';
 
 @Module({
   imports: [EarlyConfigModule, TypeOrmModule.forFeature([ERoleBackend])],
-  providers: [RolesService],
-  exports: [RolesService],
+  providers: [RoleDbService],
+  exports: [RoleDbService],
 })
-export class RolesModule implements OnModuleInit {
-  private readonly logger = new Logger(RolesModule.name);
+export class RoleDbModule implements OnModuleInit {
+  private readonly logger = new Logger(RoleDbModule.name);
 
   constructor(
-    private readonly rolesService: RolesService,
+    private readonly rolesService: RoleDbService,
     private readonly hostConfig: HostConfigService,
   ) {}
 
diff --git a/backend/src/collections/role-db/role-db.service.ts b/backend/src/collections/role-db/role-db.service.ts
index 39299e3..f38a870 100644
--- a/backend/src/collections/role-db/role-db.service.ts
+++ b/backend/src/collections/role-db/role-db.service.ts
@@ -18,8 +18,8 @@ import {
 } from '../../models/constants/roles.const';
 
 @Injectable()
-export class RolesService {
-  private readonly logger = new Logger('UsersService');
+export class RoleDbService {
+  private readonly logger = new Logger(RoleDbService.name);
 
   constructor(
     @InjectRepository(ERoleBackend)
diff --git a/backend/src/collections/user-db/user-db.module.ts b/backend/src/collections/user-db/user-db.module.ts
index 234c464..b8c7127 100644
--- a/backend/src/collections/user-db/user-db.module.ts
+++ b/backend/src/collections/user-db/user-db.module.ts
@@ -5,25 +5,25 @@ import { generateRandomString } from 'picsur-shared/dist/util/random';
 import { AuthConfigService } from '../../config/early/auth.config.service';
 import { EarlyConfigModule } from '../../config/early/early-config.module';
 import { EUserBackend } from '../../database/entities/user.entity';
-import { PreferenceModule } from '../preference-db/preference-db.module';
-import { RolesModule } from '../role-db/role-db.module';
-import { UsersService } from './user-db.service';
+import { PreferenceDbModule } from '../preference-db/preference-db.module';
+import { RoleDbModule } from '../role-db/role-db.module';
+import { UserDbService } from './user-db.service';
 
 @Module({
   imports: [
     EarlyConfigModule,
-    RolesModule,
-    PreferenceModule,
+    RoleDbModule,
+    PreferenceDbModule,
     TypeOrmModule.forFeature([EUserBackend]),
   ],
-  providers: [UsersService],
-  exports: [UsersService],
+  providers: [UserDbService],
+  exports: [UserDbService],
 })
-export class UsersModule implements OnModuleInit {
-  private readonly logger = new Logger('UsersModule');
+export class UserDbModule implements OnModuleInit {
+  private readonly logger = new Logger(UserDbModule.name);
 
   constructor(
-    private readonly usersService: UsersService,
+    private readonly usersService: UserDbService,
     private readonly authConfigService: AuthConfigService,
   ) {}
 
diff --git a/backend/src/collections/user-db/user-db.service.ts b/backend/src/collections/user-db/user-db.service.ts
index 1196783..e8e1239 100644
--- a/backend/src/collections/user-db/user-db.service.ts
+++ b/backend/src/collections/user-db/user-db.service.ts
@@ -3,11 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
 import * as bcrypt from 'bcrypt';
 import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
 import {
-    AsyncFailable,
-    Fail,
-    FT,
-    HasFailed,
-    HasSuccess
+  AsyncFailable,
+  Fail,
+  FT,
+  HasFailed,
+  HasSuccess
 } from 'picsur-shared/dist/types';
 import { FindResult } from 'picsur-shared/dist/types/find-result';
 import { makeUnique } from 'picsur-shared/dist/util/unique';
@@ -15,27 +15,27 @@ import { Repository } from 'typeorm';
 import { EUserBackend } from '../../database/entities/user.entity';
 import { Permissions } from '../../models/constants/permissions.const';
 import {
-    DefaultRolesList,
-    SoulBoundRolesList
+  DefaultRolesList,
+  SoulBoundRolesList
 } from '../../models/constants/roles.const';
 import {
-    ImmutableUsersList,
-    LockedLoginUsersList,
-    UndeletableUsersList
+  ImmutableUsersList,
+  LockedLoginUsersList,
+  UndeletableUsersList
 } from '../../models/constants/special-users.const';
 import { GetCols } from '../../util/collection';
-import { SysPreferenceService } from '../preference-db/sys-preference-db.service';
-import { RolesService } from '../role-db/role-db.service';
+import { SysPreferenceDbService } from '../preference-db/sys-preference-db.service';
+import { RoleDbService } from '../role-db/role-db.service';
 
 @Injectable()
-export class UsersService {
-  private readonly logger = new Logger('UsersService');
+export class UserDbService {
+  private readonly logger = new Logger(UserDbService.name);
 
   constructor(
     @InjectRepository(EUserBackend)
     private readonly usersRepository: Repository<EUserBackend>,
-    private readonly rolesService: RolesService,
-    private readonly prefService: SysPreferenceService,
+    private readonly rolesService: RoleDbService,
+    private readonly prefService: SysPreferenceDbService,
   ) {}
 
   // Creation and deletion
diff --git a/backend/src/config/early/host.config.service.ts b/backend/src/config/early/host.config.service.ts
index d474cab..54c7df3 100644
--- a/backend/src/config/early/host.config.service.ts
+++ b/backend/src/config/early/host.config.service.ts
@@ -9,7 +9,7 @@ import { EnvPrefix } from '../config.static';
 
 @Injectable()
 export class HostConfigService {
-  private readonly logger = new Logger('HostConfigService');
+  private readonly logger = new Logger(HostConfigService.name);
 
   constructor(private readonly configService: ConfigService) {
     this.logger.log('Production: ' + this.isProduction());
diff --git a/backend/src/config/early/multipart.config.service.ts b/backend/src/config/early/multipart.config.service.ts
index 3625130..a31902d 100644
--- a/backend/src/config/early/multipart.config.service.ts
+++ b/backend/src/config/early/multipart.config.service.ts
@@ -5,7 +5,7 @@ import { EnvPrefix } from '../config.static';
 
 @Injectable()
 export class MultipartConfigService {
-  private readonly logger = new Logger('MultipartConfigService');
+  private readonly logger = new Logger(MultipartConfigService.name);
 
   constructor(private readonly configService: ConfigService) {
     this.logger.log('Max file size: ' + this.getMaxFileSize());
diff --git a/backend/src/config/early/serve-static.config.service.ts b/backend/src/config/early/serve-static.config.service.ts
index 3ad0168..dd97130 100644
--- a/backend/src/config/early/serve-static.config.service.ts
+++ b/backend/src/config/early/serve-static.config.service.ts
@@ -12,7 +12,7 @@ import { EnvPrefix, PackageRoot } from '../config.static';
 export class ServeStaticConfigService
   implements ServeStaticModuleOptionsFactory
 {
-  private readonly logger = new Logger('ServeStaticConfigService');
+  private readonly logger = new Logger(ServeStaticConfigService.name);
 
   private defaultLocation = join(PackageRoot, '../frontend/dist');
 
diff --git a/backend/src/config/early/type-orm.config.service.ts b/backend/src/config/early/type-orm.config.service.ts
index fa3aa0f..818b232 100644
--- a/backend/src/config/early/type-orm.config.service.ts
+++ b/backend/src/config/early/type-orm.config.service.ts
@@ -9,7 +9,7 @@ import { HostConfigService } from './host.config.service';
 
 @Injectable()
 export class TypeOrmConfigService implements TypeOrmOptionsFactory {
-  private readonly logger = new Logger('TypeOrmConfigService');
+  private readonly logger = new Logger(TypeOrmConfigService.name);
 
   constructor(
     private readonly configService: ConfigService,
diff --git a/backend/src/config/late/jwt.config.service.ts b/backend/src/config/late/jwt.config.service.ts
index e61a4fd..9856127 100644
--- a/backend/src/config/late/jwt.config.service.ts
+++ b/backend/src/config/late/jwt.config.service.ts
@@ -2,13 +2,13 @@ import { FactoryProvider, Injectable, Logger } from '@nestjs/common';
 import { JwtModuleOptions, JwtOptionsFactory } from '@nestjs/jwt';
 import ms from 'ms';
 import { ThrowIfFailed } from 'picsur-shared/dist/types';
-import { SysPreferenceService } from '../../collections/preference-db/sys-preference-db.service';
+import { SysPreferenceDbService } from '../../collections/preference-db/sys-preference-db.service';
 
 @Injectable()
 export class JwtConfigService implements JwtOptionsFactory {
-  private readonly logger = new Logger('JwtConfigService');
+  private readonly logger = new Logger(JwtConfigService.name);
 
-  constructor(private readonly prefService: SysPreferenceService) {
+  constructor(private readonly prefService: SysPreferenceDbService) {
     this.printDebug().catch(this.logger.error);
   }
 
diff --git a/backend/src/config/late/late-config.module.ts b/backend/src/config/late/late-config.module.ts
index 11a2060..6d3edbc 100644
--- a/backend/src/config/late/late-config.module.ts
+++ b/backend/src/config/late/late-config.module.ts
@@ -1,6 +1,6 @@
 import { Logger, Module, OnModuleInit } from '@nestjs/common';
-import { PreferenceModule } from '../../collections/preference-db/preference-db.module';
-import { SysPreferenceService } from '../../collections/preference-db/sys-preference-db.service';
+import { PreferenceDbModule } from '../../collections/preference-db/preference-db.module';
+import { SysPreferenceDbService } from '../../collections/preference-db/sys-preference-db.service';
 import { EarlyConfigModule } from '../early/early-config.module';
 import { EarlyJwtConfigService } from '../early/early-jwt.config.service';
 import { JwtConfigService } from './jwt.config.service';
@@ -11,16 +11,16 @@ import { JwtConfigService } from './jwt.config.service';
 // Otherwise we will create a circular depedency
 
 @Module({
-  imports: [PreferenceModule, EarlyConfigModule],
+  imports: [PreferenceDbModule, EarlyConfigModule],
   providers: [JwtConfigService],
   exports: [JwtConfigService, EarlyConfigModule],
 })
 export class LateConfigModule implements OnModuleInit {
-  private readonly logger = new Logger('LateConfigModule');
+  private readonly logger = new Logger(LateConfigModule.name);
 
   constructor(
     private readonly envJwtConfigService: EarlyJwtConfigService,
-    private readonly prefService: SysPreferenceService,
+    private readonly prefService: SysPreferenceDbService,
   ) {}
 
   async onModuleInit() {
diff --git a/backend/src/decorators/multipart/multipart.pipe.ts b/backend/src/decorators/multipart/multipart.pipe.ts
index d381389..d51bab4 100644
--- a/backend/src/decorators/multipart/multipart.pipe.ts
+++ b/backend/src/decorators/multipart/multipart.pipe.ts
@@ -16,7 +16,7 @@ import {
 
 @Injectable({ scope: Scope.REQUEST })
 export class MultiPartPipe implements PipeTransform {
-  private readonly logger = new Logger('MultiPartPipe');
+  private readonly logger = new Logger(MultiPartPipe.name);
 
   constructor(
     private readonly multipartConfigService: MultipartConfigService,
diff --git a/backend/src/decorators/multipart/postfile.pipe.ts b/backend/src/decorators/multipart/postfile.pipe.ts
index 57d96d9..c2d66c3 100644
--- a/backend/src/decorators/multipart/postfile.pipe.ts
+++ b/backend/src/decorators/multipart/postfile.pipe.ts
@@ -11,7 +11,7 @@ import { MultipartConfigService } from '../../config/early/multipart.config.serv
 
 @Injectable({ scope: Scope.REQUEST })
 export class PostFilePipe implements PipeTransform {
-  private readonly logger = new Logger('PostFilePipe');
+  private readonly logger = new Logger(PostFilePipe.name);
 
   constructor(
     private readonly multipartConfigService: MultipartConfigService,
diff --git a/backend/src/layers/exception/exception.filter.ts b/backend/src/layers/exception/exception.filter.ts
index 94d8ff6..396a468 100644
--- a/backend/src/layers/exception/exception.filter.ts
+++ b/backend/src/layers/exception/exception.filter.ts
@@ -22,7 +22,7 @@ import {
 
 @Catch()
 export class MainExceptionFilter implements ExceptionFilter {
-  private static readonly logger = new Logger('MainExceptionFilter');
+  private static readonly logger = new Logger(MainExceptionFilter.name);
 
   catch(exception: Failure, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
diff --git a/backend/src/main.ts b/backend/src/main.ts
index 7b18b20..e51bc24 100644
--- a/backend/src/main.ts
+++ b/backend/src/main.ts
@@ -6,7 +6,7 @@ import {
   NestFastifyApplication
 } from '@nestjs/platform-fastify';
 import { AppModule } from './app.module';
-import { UsersService } from './collections/user-db/user-db.service';
+import { UserDbService } from './collections/user-db/user-db.service';
 import { HostConfigService } from './config/early/host.config.service';
 import { MainExceptionFilter } from './layers/exception/exception.filter';
 import { SuccessInterceptor } from './layers/success/success.interceptor';
@@ -40,7 +40,7 @@ async function bootstrap() {
   app.useGlobalInterceptors(new SuccessInterceptor(app.get(Reflector)));
   app.useGlobalPipes(new ZodValidationPipe());
   app.useGlobalGuards(
-    new MainAuthGuard(app.get(Reflector), app.get(UsersService)),
+    new MainAuthGuard(app.get(Reflector), app.get(UserDbService)),
   );
 
   // Start app
diff --git a/backend/src/managers/auth/auth.module.ts b/backend/src/managers/auth/auth.module.ts
index c79ac58..4a5dcec 100644
--- a/backend/src/managers/auth/auth.module.ts
+++ b/backend/src/managers/auth/auth.module.ts
@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
-import { PreferenceModule } from '../../collections/preference-db/preference-db.module';
-import { UsersModule } from '../../collections/user-db/user-db.module';
+import { PreferenceDbModule } from '../../collections/preference-db/preference-db.module';
+import { UserDbModule } from '../../collections/user-db/user-db.module';
 import {
   JwtConfigService,
-  JwtSecretProvider,
+  JwtSecretProvider
 } from '../../config/late/jwt.config.service';
 import { LateConfigModule } from '../../config/late/late-config.module';
 import { AuthManagerService } from './auth.service';
@@ -16,9 +16,9 @@ import { GuestService } from './guest.service';
 
 @Module({
   imports: [
-    UsersModule,
+    UserDbModule,
     PassportModule,
-    PreferenceModule,
+    PreferenceDbModule,
     LateConfigModule,
     JwtModule.registerAsync({
       useExisting: JwtConfigService,
@@ -33,6 +33,6 @@ import { GuestService } from './guest.service';
     JwtSecretProvider,
     GuestService,
   ],
-  exports: [UsersModule, AuthManagerService],
+  exports: [UserDbModule, AuthManagerService],
 })
 export class AuthManagerModule {}
diff --git a/backend/src/managers/auth/auth.service.ts b/backend/src/managers/auth/auth.service.ts
index 76989dc..0cb9a43 100644
--- a/backend/src/managers/auth/auth.service.ts
+++ b/backend/src/managers/auth/auth.service.ts
@@ -6,7 +6,7 @@ import { AsyncFailable, Fail, FT } from 'picsur-shared/dist/types';
 
 @Injectable()
 export class AuthManagerService {
-  private readonly logger = new Logger('AuthService');
+  private readonly logger = new Logger(AuthManagerService.name);
 
   constructor(private readonly jwtService: JwtService) {}
 
diff --git a/backend/src/managers/auth/guards/jwt.strategy.ts b/backend/src/managers/auth/guards/jwt.strategy.ts
index 49333a1..f0850cc 100644
--- a/backend/src/managers/auth/guards/jwt.strategy.ts
+++ b/backend/src/managers/auth/guards/jwt.strategy.ts
@@ -6,7 +6,7 @@ import { EUser } from 'picsur-shared/dist/entities/user.entity';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(JwtPassportStrategy, 'jwt') {
-  private readonly logger = new Logger('JwtStrategy');
+  private readonly logger = new Logger(JwtStrategy.name);
 
   constructor(@Inject('JWT_SECRET') jwtSecret: string) {
     // This will validate the jwt token itself
diff --git a/backend/src/managers/auth/guards/local-auth.strategy.ts b/backend/src/managers/auth/guards/local-auth.strategy.ts
index e758434..10ce936 100644
--- a/backend/src/managers/auth/guards/local-auth.strategy.ts
+++ b/backend/src/managers/auth/guards/local-auth.strategy.ts
@@ -3,12 +3,12 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Strategy } from 'passport-local';
 import { EUser } from 'picsur-shared/dist/entities/user.entity';
 import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';
-import { UsersService } from '../../../collections/user-db/user-db.service';
+import { UserDbService } from '../../../collections/user-db/user-db.service';
 import { EUserBackend2EUser } from '../../../models/transformers/user.transformer';
 
 @Injectable()
 export class LocalAuthStrategy extends PassportStrategy(Strategy, 'local') {
-  constructor(private readonly usersService: UsersService) {
+  constructor(private readonly usersService: UserDbService) {
     super();
   }
 
diff --git a/backend/src/managers/auth/guards/main.guard.ts b/backend/src/managers/auth/guards/main.guard.ts
index dec94f5..46cf0b8 100644
--- a/backend/src/managers/auth/guards/main.guard.ts
+++ b/backend/src/managers/auth/guards/main.guard.ts
@@ -3,7 +3,7 @@ import { Reflector } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { EUser, EUserSchema } from 'picsur-shared/dist/entities/user.entity';
 import { Fail, Failable, FT, HasFailed } from 'picsur-shared/dist/types';
-import { UsersService } from '../../../collections/user-db/user-db.service';
+import { UserDbService } from '../../../collections/user-db/user-db.service';
 import { Permissions } from '../../../models/constants/permissions.const';
 import { isPermissionsArray } from '../../../models/validators/permissions.validator';
 
@@ -13,11 +13,11 @@ import { isPermissionsArray } from '../../../models/validators/permissions.valid
 
 @Injectable()
 export class MainAuthGuard extends AuthGuard(['jwt', 'guest']) {
-  private readonly logger = new Logger('MainAuthGuard');
+  private readonly logger = new Logger(MainAuthGuard.name);
 
   constructor(
     private readonly reflector: Reflector,
-    private readonly usersService: UsersService,
+    private readonly usersService: UserDbService,
   ) {
     super();
   }
diff --git a/backend/src/managers/auth/guest.service.ts b/backend/src/managers/auth/guest.service.ts
index 2a7266c..7e677f1 100644
--- a/backend/src/managers/auth/guest.service.ts
+++ b/backend/src/managers/auth/guest.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { HasFailed } from 'picsur-shared/dist/types';
-import { UsersService } from '../../collections/user-db/user-db.service';
+import { UserDbService } from '../../collections/user-db/user-db.service';
 import { EUserBackend } from '../../database/entities/user.entity';
 
 @Injectable()
 export class GuestService {
   private fallBackUser: EUserBackend;
 
-  constructor(private readonly usersService: UsersService) {
+  constructor(private readonly usersService: UserDbService) {
     this.fallBackUser = new EUserBackend();
     this.fallBackUser.username = 'guest';
     this.fallBackUser.roles = ['guest'];
diff --git a/backend/src/managers/demo/demo.module.ts b/backend/src/managers/demo/demo.module.ts
index 955a556..b2e5028 100644
--- a/backend/src/managers/demo/demo.module.ts
+++ b/backend/src/managers/demo/demo.module.ts
@@ -1,16 +1,16 @@
 import { Logger, Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { ImageDBModule } from '../../collections/image-db/image-db.module';
-import { RolesModule } from '../../collections/role-db/role-db.module';
+import { RoleDbModule } from '../../collections/role-db/role-db.module';
 import { EarlyConfigModule } from '../../config/early/early-config.module';
 import { HostConfigService } from '../../config/early/host.config.service';
 import { DemoManagerService } from './demo.service';
 
 @Module({
-  imports: [ImageDBModule, EarlyConfigModule, RolesModule],
+  imports: [ImageDBModule, EarlyConfigModule, RoleDbModule],
   providers: [DemoManagerService],
 })
 export class DemoManagerModule implements OnModuleInit, OnModuleDestroy {
-  private readonly logger = new Logger('DemoManagerModule');
+  private readonly logger = new Logger(DemoManagerModule.name);
   private interval: NodeJS.Timeout;
 
   constructor(
diff --git a/backend/src/managers/demo/demo.service.ts b/backend/src/managers/demo/demo.service.ts
index 5053457..47e2717 100644
--- a/backend/src/managers/demo/demo.service.ts
+++ b/backend/src/managers/demo/demo.service.ts
@@ -1,15 +1,15 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { ImageDBService } from '../../collections/image-db/image-db.service';
-import { RolesService } from '../../collections/role-db/role-db.service';
+import { RoleDbService } from '../../collections/role-db/role-db.service';
 import { Permission } from '../../models/constants/permissions.const';
 
 @Injectable()
 export class DemoManagerService {
-  private readonly logger = new Logger('DemoManagerService');
+  private readonly logger = new Logger(DemoManagerService.name);
 
   constructor(
     private readonly imagesService: ImageDBService,
-    private readonly rolesService: RolesService,
+    private readonly rolesService: RoleDbService,
   ) {}
 
   public async setupRoles() {
diff --git a/backend/src/managers/image/image-converter.service.ts b/backend/src/managers/image/image-converter.service.ts
index 97455f2..4cef436 100644
--- a/backend/src/managers/image/image-converter.service.ts
+++ b/backend/src/managers/image/image-converter.service.ts
@@ -8,13 +8,13 @@ import {
 import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
 import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';
 import { SharpOptions } from 'sharp';
-import { SysPreferenceService } from '../../collections/preference-db/sys-preference-db.service';
+import { SysPreferenceDbService } from '../../collections/preference-db/sys-preference-db.service';
 import { SharpWrapper } from '../../workers/sharp.wrapper';
 import { ImageResult } from './imageresult';
 
 @Injectable()
 export class ImageConverterService {
-  constructor(private readonly sysPref: SysPreferenceService) {}
+  constructor(private readonly sysPref: SysPreferenceDbService) {}
 
   public async convert(
     image: Buffer,
diff --git a/backend/src/managers/image/image.module.ts b/backend/src/managers/image/image.module.ts
index f15b45a..f306374 100644
--- a/backend/src/managers/image/image.module.ts
+++ b/backend/src/managers/image/image.module.ts
@@ -4,14 +4,14 @@ import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
 import { HasFailed } from 'picsur-shared/dist/types';
 import { ImageDBModule } from '../../collections/image-db/image-db.module';
 import { ImageFileDBService } from '../../collections/image-db/image-file-db.service';
-import { PreferenceModule } from '../../collections/preference-db/preference-db.module';
-import { SysPreferenceService } from '../../collections/preference-db/sys-preference-db.service';
+import { PreferenceDbModule } from '../../collections/preference-db/preference-db.module';
+import { SysPreferenceDbService } from '../../collections/preference-db/sys-preference-db.service';
 import { ImageConverterService } from './image-converter.service';
 import { ImageProcessorService } from './image-processor.service';
 import { ImageManagerService } from './image.service';
 
 @Module({
-  imports: [ImageDBModule, PreferenceModule],
+  imports: [ImageDBModule, PreferenceDbModule],
   providers: [
     ImageManagerService,
     ImageProcessorService,
@@ -20,11 +20,11 @@ import { ImageManagerService } from './image.service';
   exports: [ImageManagerService],
 })
 export class ImageManagerModule implements OnModuleInit, OnModuleDestroy {
-  private readonly logger = new Logger('ImageManagerModule');
+  private readonly logger = new Logger(ImageManagerModule.name);
   private interval: NodeJS.Timeout;
 
   constructor(
-    private readonly prefManager: SysPreferenceService,
+    private readonly prefManager: SysPreferenceDbService,
     private readonly imageFileDB: ImageFileDBService,
   ) {}
 
diff --git a/backend/src/managers/image/image.service.ts b/backend/src/managers/image/image.service.ts
index 32706a6..0f4c5cc 100644
--- a/backend/src/managers/image/image.service.ts
+++ b/backend/src/managers/image/image.service.ts
@@ -4,10 +4,10 @@ import { fileTypeFromBuffer, FileTypeResult } from 'file-type';
 import { ImageRequestParams } from 'picsur-shared/dist/dto/api/image.dto';
 import { ImageEntryVariant } from 'picsur-shared/dist/dto/image-entry-variant.enum';
 import {
-    AnimFileType,
-    FileType,
-    ImageFileType,
-    Mime2FileType
+  AnimFileType,
+  FileType,
+  ImageFileType,
+  Mime2FileType
 } from 'picsur-shared/dist/dto/mimes.dto';
 import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
 import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.enum';
@@ -17,8 +17,8 @@ import { ParseFileType } from 'picsur-shared/dist/util/parse-mime';
 import { IsQOI } from 'qoi-img';
 import { ImageDBService } from '../../collections/image-db/image-db.service';
 import { ImageFileDBService } from '../../collections/image-db/image-file-db.service';
-import { SysPreferenceService } from '../../collections/preference-db/sys-preference-db.service';
-import { UsrPreferenceService } from '../../collections/preference-db/usr-preference-db.service';
+import { SysPreferenceDbService } from '../../collections/preference-db/sys-preference-db.service';
+import { UsrPreferenceDbService } from '../../collections/preference-db/usr-preference-db.service';
 import { EImageDerivativeBackend } from '../../database/entities/image-derivative.entity';
 import { EImageFileBackend } from '../../database/entities/image-file.entity';
 import { EImageBackend } from '../../database/entities/image.entity';
@@ -36,8 +36,8 @@ export class ImageManagerService {
     private readonly imageFilesService: ImageFileDBService,
     private readonly processService: ImageProcessorService,
     private readonly convertService: ImageConverterService,
-    private readonly userPref: UsrPreferenceService,
-    private readonly sysPref: SysPreferenceService,
+    private readonly userPref: UsrPreferenceDbService,
+    private readonly sysPref: SysPreferenceDbService,
   ) {}
 
   public async findOne(id: string): AsyncFailable<EImageBackend> {
diff --git a/backend/src/routes/api/pref/pref.module.ts b/backend/src/routes/api/pref/pref.module.ts
index d423f13..f7ca645 100644
--- a/backend/src/routes/api/pref/pref.module.ts
+++ b/backend/src/routes/api/pref/pref.module.ts
@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
-import { PreferenceModule } from '../../../collections/preference-db/preference-db.module';
+import { PreferenceDbModule } from '../../../collections/preference-db/preference-db.module';
 import { SysPrefController } from './sys-pref.controller';
 import { UsrPrefController } from './usr-pref.controller';
 
 @Module({
-  imports: [PreferenceModule],
+  imports: [PreferenceDbModule],
   controllers: [SysPrefController, UsrPrefController],
 })
 export class PrefModule {}
diff --git a/backend/src/routes/api/pref/sys-pref.controller.ts b/backend/src/routes/api/pref/sys-pref.controller.ts
index a4b4239..b855ef5 100644
--- a/backend/src/routes/api/pref/sys-pref.controller.ts
+++ b/backend/src/routes/api/pref/sys-pref.controller.ts
@@ -12,7 +12,7 @@ import {
   UpdatePreferenceResponse
 } from 'picsur-shared/dist/dto/api/pref.dto';
 import { ThrowIfFailed } from 'picsur-shared/dist/types';
-import { SysPreferenceService } from '../../../collections/preference-db/sys-preference-db.service';
+import { SysPreferenceDbService } from '../../../collections/preference-db/sys-preference-db.service';
 import { RequiredPermissions } from '../../../decorators/permissions.decorator';
 import { Returns } from '../../../decorators/returns.decorator';
 import { Permission } from '../../../models/constants/permissions.const';
@@ -20,9 +20,9 @@ import { Permission } from '../../../models/constants/permissions.const';
 @Controller('api/pref/sys')
 @RequiredPermissions(Permission.SysPrefAdmin)
 export class SysPrefController {
-  private readonly logger = new Logger('SysPrefController');
+  private readonly logger = new Logger(SysPrefController.name);
 
-  constructor(private readonly prefService: SysPreferenceService) {}
+  constructor(private readonly prefService: SysPreferenceDbService) {}
 
   @Get()
   @Returns(MultiplePreferencesResponse)
diff --git a/backend/src/routes/api/pref/usr-pref.controller.ts b/backend/src/routes/api/pref/usr-pref.controller.ts
index 4faf894..782c672 100644
--- a/backend/src/routes/api/pref/usr-pref.controller.ts
+++ b/backend/src/routes/api/pref/usr-pref.controller.ts
@@ -12,7 +12,7 @@ import {
   UpdatePreferenceResponse
 } from 'picsur-shared/dist/dto/api/pref.dto';
 import { ThrowIfFailed } from 'picsur-shared/dist/types';
-import { UsrPreferenceService } from '../../../collections/preference-db/usr-preference-db.service';
+import { UsrPreferenceDbService } from '../../../collections/preference-db/usr-preference-db.service';
 import { RequiredPermissions } from '../../../decorators/permissions.decorator';
 import { ReqUserID } from '../../../decorators/request-user.decorator';
 import { Returns } from '../../../decorators/returns.decorator';
@@ -21,9 +21,9 @@ import { Permission } from '../../../models/constants/permissions.const';
 @Controller('api/pref/usr')
 @RequiredPermissions(Permission.Settings)
 export class UsrPrefController {
-  private readonly logger = new Logger('UsrPrefController');
+  private readonly logger = new Logger(UsrPrefController.name);
 
-  constructor(private readonly prefService: UsrPreferenceService) {}
+  constructor(private readonly prefService: UsrPreferenceDbService) {}
 
   @Get()
   @Returns(MultiplePreferencesResponse)
diff --git a/backend/src/routes/api/roles/roles.controller.ts b/backend/src/routes/api/roles/roles.controller.ts
index 67b52bd..cef9c85 100644
--- a/backend/src/routes/api/roles/roles.controller.ts
+++ b/backend/src/routes/api/roles/roles.controller.ts
@@ -17,8 +17,8 @@ import {
   SpecialRolesResponse
 } from 'picsur-shared/dist/dto/api/roles.dto';
 import { Fail, FT, ThrowIfFailed } from 'picsur-shared/dist/types';
-import { RolesService } from '../../../collections/role-db/role-db.service';
-import { UsersService } from '../../../collections/user-db/user-db.service';
+import { RoleDbService } from '../../../collections/role-db/role-db.service';
+import { UserDbService } from '../../../collections/user-db/user-db.service';
 import { RequiredPermissions } from '../../../decorators/permissions.decorator';
 import { Returns } from '../../../decorators/returns.decorator';
 import { Permission } from '../../../models/constants/permissions.const';
@@ -33,11 +33,11 @@ import { isPermissionsArray } from '../../../models/validators/permissions.valid
 @Controller('api/roles')
 @RequiredPermissions(Permission.RoleAdmin)
 export class RolesController {
-  private readonly logger = new Logger('RolesController');
+  private readonly logger = new Logger(RolesController.name);
 
   constructor(
-    private readonly rolesService: RolesService,
-    private readonly usersService: UsersService,
+    private readonly rolesService: RoleDbService,
+    private readonly usersService: UserDbService,
   ) {}
 
   @Get('list')
diff --git a/backend/src/routes/api/roles/roles.module.ts b/backend/src/routes/api/roles/roles.module.ts
index 9e3b858..aec9c73 100644
--- a/backend/src/routes/api/roles/roles.module.ts
+++ b/backend/src/routes/api/roles/roles.module.ts
@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
-import { RolesModule } from '../../../collections/role-db/role-db.module';
-import { UsersModule } from '../../../collections/user-db/user-db.module';
+import { RoleDbModule } from '../../../collections/role-db/role-db.module';
+import { UserDbModule } from '../../../collections/user-db/user-db.module';
 import { RolesController } from './roles.controller';
 
 @Module({
-  imports: [RolesModule, UsersModule],
+  imports: [RoleDbModule, UserDbModule],
   controllers: [RolesController],
 })
 export class RolesApiModule {}
diff --git a/backend/src/routes/api/user/user-manage.controller.ts b/backend/src/routes/api/user/user-manage.controller.ts
index d448952..79d2beb 100644
--- a/backend/src/routes/api/user/user-manage.controller.ts
+++ b/backend/src/routes/api/user/user-manage.controller.ts
@@ -18,7 +18,7 @@ import {
   UserUpdateResponse
 } from 'picsur-shared/dist/dto/api/user-manage.dto';
 import { ThrowIfFailed } from 'picsur-shared/dist/types';
-import { UsersService } from '../../../collections/user-db/user-db.service';
+import { UserDbService } from '../../../collections/user-db/user-db.service';
 import { RequiredPermissions } from '../../../decorators/permissions.decorator';
 import { Returns } from '../../../decorators/returns.decorator';
 import { Permission } from '../../../models/constants/permissions.const';
@@ -32,9 +32,9 @@ import { EUserBackend2EUser } from '../../../models/transformers/user.transforme
 @Controller('api/user')
 @RequiredPermissions(Permission.UserAdmin)
 export class UserAdminController {
-  private readonly logger = new Logger('UserAdminController');
+  private readonly logger = new Logger(UserAdminController.name);
 
-  constructor(private readonly usersService: UsersService) {}
+  constructor(private readonly usersService: UserDbService) {}
 
   @Post('list')
   @Returns(UserListResponse)
diff --git a/backend/src/routes/api/user/user.controller.ts b/backend/src/routes/api/user/user.controller.ts
index 7230a03..6467bf0 100644
--- a/backend/src/routes/api/user/user.controller.ts
+++ b/backend/src/routes/api/user/user.controller.ts
@@ -13,7 +13,7 @@ import {
 } from 'picsur-shared/dist/dto/api/user.dto';
 import type { EUser } from 'picsur-shared/dist/entities/user.entity';
 import { ThrowIfFailed } from 'picsur-shared/dist/types';
-import { UsersService } from '../../../collections/user-db/user-db.service';
+import { UserDbService } from '../../../collections/user-db/user-db.service';
 import {
   NoPermissions,
   RequiredPermissions,
@@ -27,10 +27,10 @@ import { EUserBackend2EUser } from '../../../models/transformers/user.transforme
 
 @Controller('api/user')
 export class UserController {
-  private readonly logger = new Logger('UserController');
+  private readonly logger = new Logger(UserController.name);
 
   constructor(
-    private readonly usersService: UsersService,
+    private readonly usersService: UserDbService,
     private readonly authService: AuthManagerService,
   ) {}
 
diff --git a/backend/src/routes/image/image-manage.controller.ts b/backend/src/routes/image/image-manage.controller.ts
index f493759..7d91acf 100644
--- a/backend/src/routes/image/image-manage.controller.ts
+++ b/backend/src/routes/image/image-manage.controller.ts
@@ -21,7 +21,7 @@ import { ImageUploadDto } from '../../models/dto/image-upload.dto';
 @Controller('api/image')
 @RequiredPermissions(Permission.ImageUpload)
 export class ImageManageController {
-  private readonly logger = new Logger('ImageManageController');
+  private readonly logger = new Logger(ImageManageController.name);
 
   constructor(private readonly imagesService: ImageManagerService) {}
 
diff --git a/backend/src/routes/image/image.controller.ts b/backend/src/routes/image/image.controller.ts
index c079144..1bb5729 100644
--- a/backend/src/routes/image/image.controller.ts
+++ b/backend/src/routes/image/image.controller.ts
@@ -7,7 +7,7 @@ import {
 import { ImageEntryVariant } from 'picsur-shared/dist/dto/image-entry-variant.enum';
 import { FileType2Mime } from 'picsur-shared/dist/dto/mimes.dto';
 import { FT, IsFailure, ThrowIfFailed } from 'picsur-shared/dist/types';
-import { UsersService } from '../../collections/user-db/user-db.service';
+import { UserDbService } from '../../collections/user-db/user-db.service';
 import { ImageFullIdParam } from '../../decorators/image-id/image-full-id.decorator';
 import { ImageIdParam } from '../../decorators/image-id/image-id.decorator';
 import { RequiredPermissions } from '../../decorators/permissions.decorator';
@@ -22,11 +22,11 @@ import { BrandMessageType, GetBrandMessage } from '../../util/branding';
 @Controller('i')
 @RequiredPermissions(Permission.ImageView)
 export class ImageController {
-  private readonly logger = new Logger('ImageController');
+  private readonly logger = new Logger(ImageController.name);
 
   constructor(
     private readonly imagesService: ImageManagerService,
-    private readonly userService: UsersService,
+    private readonly userService: UserDbService,
   ) {}
 
   @Head(':id')
diff --git a/backend/src/routes/image/image.module.ts b/backend/src/routes/image/image.module.ts
index 3648159..dd61c51 100644
--- a/backend/src/routes/image/image.module.ts
+++ b/backend/src/routes/image/image.module.ts
@@ -1,12 +1,12 @@
 import { Module } from '@nestjs/common';
-import { UsersModule } from '../../collections/user-db/user-db.module';
+import { UserDbModule } from '../../collections/user-db/user-db.module';
 import { DecoratorsModule } from '../../decorators/decorators.module';
 import { ImageManagerModule } from '../../managers/image/image.module';
 import { ImageManageController } from './image-manage.controller';
 import { ImageController } from './image.controller';
 
 @Module({
-  imports: [ImageManagerModule, UsersModule, DecoratorsModule],
+  imports: [ImageManagerModule, UserDbModule, DecoratorsModule],
   controllers: [ImageController, ImageManageController],
 })
 export class ImageModule {}
diff --git a/frontend/src/app/components/picsur-img/picsur-img.component.ts b/frontend/src/app/components/picsur-img/picsur-img.component.ts
index c8df942..a892065 100644
--- a/frontend/src/app/components/picsur-img/picsur-img.component.ts
+++ b/frontend/src/app/components/picsur-img/picsur-img.component.ts
@@ -30,7 +30,7 @@ enum PicsurImgState {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PicsurImgComponent implements OnChanges {
-  private readonly logger = new Logger('ZodImgComponent');
+  private readonly logger = new Logger(ZodImgComponent.name);
 
   @ViewChild('targetcanvas') private canvas: ElementRef<HTMLCanvasElement>;
   @ViewChild('targetimg') private img: ElementRef<HTMLImageElement>;
diff --git a/frontend/src/app/guards/permission.guard.ts b/frontend/src/app/guards/permission.guard.ts
index 869a249..53677eb 100644
--- a/frontend/src/app/guards/permission.guard.ts
+++ b/frontend/src/app/guards/permission.guard.ts
@@ -16,7 +16,7 @@ import { Logger } from '../services/logger/logger.service';
   providedIn: 'root',
 })
 export class PermissionGuard implements CanActivate, CanActivateChild {
-  private readonly logger = new Logger('PermissionGuard');
+  private readonly logger = new Logger(PermissionGuard.name);
   private allPermissionsArray: string[] | null = null;
 
   constructor(
diff --git a/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts b/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts
index d05c3c5..dd928bb 100644
--- a/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts
+++ b/frontend/src/app/routes/settings/roles/settings-roles-edit/settings-roles-edit.component.ts
@@ -20,7 +20,7 @@ enum EditMode {
   styleUrls: ['./settings-roles-edit.component.scss'],
 })
 export class SettingsRolesEditComponent implements OnInit {
-  private readonly logger = new Logger('SettingsRolesEditComponent');
+  private readonly logger = new Logger(SettingsRolesEditComponent.name);
 
   private mode: EditMode = EditMode.edit;
 
diff --git a/frontend/src/app/routes/settings/roles/settings-roles.component.ts b/frontend/src/app/routes/settings/roles/settings-roles.component.ts
index f5e02db..070aac4 100644
--- a/frontend/src/app/routes/settings/roles/settings-roles.component.ts
+++ b/frontend/src/app/routes/settings/roles/settings-roles.component.ts
@@ -18,7 +18,7 @@ import { UtilService } from 'src/app/util/util-module/util.service';
   styleUrls: ['./settings-roles.component.scss'],
 })
 export class SettingsRolesComponent implements OnInit, AfterViewInit {
-  private readonly logger = new Logger('SettingsRolesComponent');
+  private readonly logger = new Logger(SettingsRolesComponent.name);
 
   public readonly displayedColumns: string[] = [
     'name',
diff --git a/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts b/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts
index e1c5984..e3555fb 100644
--- a/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts
+++ b/frontend/src/app/routes/settings/users/settings-users-edit/settings-users-edit.component.ts
@@ -23,7 +23,7 @@ enum EditMode {
   styleUrls: ['./settings-users-edit.component.scss'],
 })
 export class SettingsUsersEditComponent implements OnInit {
-  private readonly logger = new Logger('SettingsUsersEditComponent');
+  private readonly logger = new Logger(SettingsUsersEditComponent.name);
 
   private ImmutableUsersList: string[] = [];
   private mode: EditMode = EditMode.edit;
diff --git a/frontend/src/app/routes/settings/users/settings-users.component.ts b/frontend/src/app/routes/settings/users/settings-users.component.ts
index 1954ab5..40ce29c 100644
--- a/frontend/src/app/routes/settings/users/settings-users.component.ts
+++ b/frontend/src/app/routes/settings/users/settings-users.component.ts
@@ -18,7 +18,7 @@ import { UtilService } from 'src/app/util/util-module/util.service';
   styleUrls: ['./settings-users.component.scss'],
 })
 export class SettingsUsersComponent implements OnInit {
-  private readonly logger = new Logger('SettingsUsersComponent');
+  private readonly logger = new Logger(SettingsUsersComponent.name);
 
   private UndeletableUsersList: string[] = [];
 
diff --git a/frontend/src/app/routes/user/login/login.component.ts b/frontend/src/app/routes/user/login/login.component.ts
index 29fcc3d..b3eb4de 100644
--- a/frontend/src/app/routes/user/login/login.component.ts
+++ b/frontend/src/app/routes/user/login/login.component.ts
@@ -16,7 +16,7 @@ import { LoginControl } from '../../../models/forms/login.control';
   styleUrls: ['./login.component.scss'],
 })
 export class LoginComponent implements OnInit {
-  private readonly logger = new Logger('LoginComponent');
+  private readonly logger = new Logger(LoginComponent.name);
 
   public showRegister = false;
 
diff --git a/frontend/src/app/routes/user/register/register.component.ts b/frontend/src/app/routes/user/register/register.component.ts
index d4ab80e..1b8cbc0 100644
--- a/frontend/src/app/routes/user/register/register.component.ts
+++ b/frontend/src/app/routes/user/register/register.component.ts
@@ -16,7 +16,7 @@ import { RegisterControl } from '../../../models/forms/register.control';
   styleUrls: ['./register.component.scss'],
 })
 export class RegisterComponent implements OnInit {
-  private readonly logger = new Logger('RegisterComponent');
+  private readonly logger = new Logger(RegisterComponent.name);
 
   public showLogin = false;
 
diff --git a/frontend/src/app/services/api/api.service.ts b/frontend/src/app/services/api/api.service.ts
index 17cced8..7df548b 100644
--- a/frontend/src/app/services/api/api.service.ts
+++ b/frontend/src/app/services/api/api.service.ts
@@ -27,7 +27,7 @@ import { KeyService } from '../storage/key.service';
   providedIn: 'root',
 })
 export class ApiService {
-  private readonly logger = new Logger('ApiService');
+  private readonly logger = new Logger(ApiService.name);
 
   private errorSubject = new Subject<ApiError>();
 
diff --git a/frontend/src/app/services/api/info.service.ts b/frontend/src/app/services/api/info.service.ts
index 64ef8c5..92e50bb 100644
--- a/frontend/src/app/services/api/info.service.ts
+++ b/frontend/src/app/services/api/info.service.ts
@@ -15,7 +15,7 @@ import { ApiService } from './api.service';
   providedIn: 'root',
 })
 export class InfoService {
-  private readonly logger = new Logger('InfoService');
+  private readonly logger = new Logger(InfoService.name);
 
   public get live() {
     return this.infoSubject;
diff --git a/frontend/src/app/services/api/permission.service.ts b/frontend/src/app/services/api/permission.service.ts
index 4f3d787..7c62ef1 100644
--- a/frontend/src/app/services/api/permission.service.ts
+++ b/frontend/src/app/services/api/permission.service.ts
@@ -11,7 +11,7 @@ import { UserService } from './user.service';
 
 @Injectable({ providedIn: 'root' })
 export class PermissionService {
-  private readonly logger = new Logger('PermissionService');
+  private readonly logger = new Logger(PermissionService.name);
 
   private allPermissions: string[] = [];
   private permissionsSubject = new BehaviorSubject<string[] | null>(null);
diff --git a/frontend/src/app/services/api/sys-pref.service.ts b/frontend/src/app/services/api/sys-pref.service.ts
index 140e055..74ef9cf 100644
--- a/frontend/src/app/services/api/sys-pref.service.ts
+++ b/frontend/src/app/services/api/sys-pref.service.ts
@@ -24,7 +24,7 @@ import { PermissionService } from './permission.service';
   providedIn: 'root',
 })
 export class SysPrefService {
-  private readonly logger = new Logger('SysPrefService');
+  private readonly logger = new Logger(SysPrefService.name);
 
   private hasPermission = false;
 
diff --git a/frontend/src/app/services/api/user.service.ts b/frontend/src/app/services/api/user.service.ts
index a14f30f..ae0699e 100644
--- a/frontend/src/app/services/api/user.service.ts
+++ b/frontend/src/app/services/api/user.service.ts
@@ -19,7 +19,7 @@ import { ApiService } from './api.service';
   providedIn: 'root',
 })
 export class UserService {
-  private readonly logger = new Logger('UserService');
+  private readonly logger = new Logger(UserService.name);
   private userSubject = new BehaviorSubject<EUser | null>(null);
 
   public get live() {
diff --git a/frontend/src/app/services/api/usr-pref.service.ts b/frontend/src/app/services/api/usr-pref.service.ts
index 946f48d..833524c 100644
--- a/frontend/src/app/services/api/usr-pref.service.ts
+++ b/frontend/src/app/services/api/usr-pref.service.ts
@@ -30,7 +30,7 @@ import { PermissionService } from './permission.service';
   providedIn: 'root',
 })
 export class UsrPrefService {
-  private readonly logger = new Logger('UsrPrefService');
+  private readonly logger = new Logger(UsrPrefService.name);
 
   private hasPermission = false;
 
diff --git a/frontend/src/app/util/util-module/api-error.service.ts b/frontend/src/app/util/util-module/api-error.service.ts
index ca3ce1f..a39d213 100644
--- a/frontend/src/app/util/util-module/api-error.service.ts
+++ b/frontend/src/app/util/util-module/api-error.service.ts
@@ -9,7 +9,7 @@ import { UtilService } from './util.service';
   providedIn: 'root',
 })
 export class ApiErrorService {
-  private readonly logger = new Logger('ApiErrorService');
+  private readonly logger = new Logger(ApiErrorService.name);
 
   constructor(
     private readonly apiSerivce: ApiService,
diff --git a/frontend/src/app/util/util-module/bootstrap.service.ts b/frontend/src/app/util/util-module/bootstrap.service.ts
index f695a5b..331d7f1 100644
--- a/frontend/src/app/util/util-module/bootstrap.service.ts
+++ b/frontend/src/app/util/util-module/bootstrap.service.ts
@@ -17,7 +17,7 @@ export enum BSScreenSize {
   providedIn: 'root',
 })
 export class BootstrapService {
-  private readonly logger = new Logger('BootstrapService');
+  private readonly logger = new Logger(BootstrapService.name);
 
   private smObservable: Observable<boolean>;
   private mdObservable: Observable<boolean>;
diff --git a/frontend/src/app/util/util-module/util.service.ts b/frontend/src/app/util/util-module/util.service.ts
index 5ff7f1e..b217c70 100644
--- a/frontend/src/app/util/util-module/util.service.ts
+++ b/frontend/src/app/util/util-module/util.service.ts
@@ -18,7 +18,7 @@ import { DownloadDialogComponent } from './download-dialog/download-dialog.compo
   providedIn: 'any',
 })
 export class UtilService {
-  private readonly logger = new Logger('UtilService');
+  private readonly logger = new Logger(UtilService.name);
 
   constructor(
     private readonly snackBar: MatSnackBar,