diff --git a/src/modules/config/controllers/config-grpc.controller.ts b/src/modules/config/controllers/config-grpc.controller.ts
index 79b9454..d2c5edf 100644
--- a/src/modules/config/controllers/config-grpc.controller.ts
+++ b/src/modules/config/controllers/config-grpc.controller.ts
@@ -1,12 +1,12 @@
 import { Controller } from '@nestjs/common';
 
 import type { getConfigResponse } from '../../../../src/modules/grpc/gen/ts/kraken';
-import { KrakenConfigServiceControllerMethods } from '../../../../src/modules/grpc/gen/ts/kraken';
+import { ConfigControllerMethods } from '../../../../src/modules/grpc/gen/ts/kraken';
 import { ConfigService } from '../config.service';
 
 @Controller()
-@KrakenConfigServiceControllerMethods()
-export class ConfigGrpcController {
+@ConfigControllerMethods()
+export class ConfigGrpcController implements ConfigGrpcController {
   constructor(private readonly configService: ConfigService) {}
 
   async getConfig(): Promise<getConfigResponse> {
diff --git a/src/modules/grpc/gen/ts/kraken.ts b/src/modules/grpc/gen/ts/kraken.ts
index 0f14103..d136db6 100644
--- a/src/modules/grpc/gen/ts/kraken.ts
+++ b/src/modules/grpc/gen/ts/kraken.ts
@@ -98,88 +98,88 @@ export const KRAKEN_PACKAGE_NAME = "kraken";
 
 /** Service definition */
 
-export interface KrakenServiceRegistryServiceClient {
+export interface ServiceRegistryClient {
   registerService(request: registerServiceRequest, metadata?: Metadata): Observable<registerServiceResponse>;
 }
 
 /** Service definition */
 
-export interface KrakenServiceRegistryServiceController {
+export interface ServiceRegistryController {
   registerService(
     request: registerServiceRequest,
     metadata?: Metadata,
   ): Promise<registerServiceResponse> | Observable<registerServiceResponse> | registerServiceResponse;
 }
 
-export function KrakenServiceRegistryServiceControllerMethods() {
+export function ServiceRegistryControllerMethods() {
   return function (constructor: Function) {
     const grpcMethods: string[] = ["registerService"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcMethod("KrakenServiceRegistryService", method)(constructor.prototype[method], method, descriptor);
+      GrpcMethod("ServiceRegistry", method)(constructor.prototype[method], method, descriptor);
     }
     const grpcStreamMethods: string[] = [];
     for (const method of grpcStreamMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcStreamMethod("KrakenServiceRegistryService", method)(constructor.prototype[method], method, descriptor);
+      GrpcStreamMethod("ServiceRegistry", method)(constructor.prototype[method], method, descriptor);
     }
   };
 }
 
-export const KRAKEN_SERVICE_REGISTRY_SERVICE_NAME = "KrakenServiceRegistryService";
+export const SERVICE_REGISTRY_SERVICE_NAME = "ServiceRegistry";
 
-export interface KrakenConfigServiceClient {
+export interface ConfigClient {
   getConfig(request: EmptyRequest, metadata?: Metadata): Observable<getConfigResponse>;
 }
 
-export interface KrakenConfigServiceController {
+export interface ConfigController {
   getConfig(
     request: EmptyRequest,
     metadata?: Metadata,
   ): Promise<getConfigResponse> | Observable<getConfigResponse> | getConfigResponse;
 }
 
-export function KrakenConfigServiceControllerMethods() {
+export function ConfigControllerMethods() {
   return function (constructor: Function) {
     const grpcMethods: string[] = ["getConfig"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcMethod("KrakenConfigService", method)(constructor.prototype[method], method, descriptor);
+      GrpcMethod("Config", method)(constructor.prototype[method], method, descriptor);
     }
     const grpcStreamMethods: string[] = [];
     for (const method of grpcStreamMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcStreamMethod("KrakenConfigService", method)(constructor.prototype[method], method, descriptor);
+      GrpcStreamMethod("Config", method)(constructor.prototype[method], method, descriptor);
     }
   };
 }
 
-export const KRAKEN_CONFIG_SERVICE_NAME = "KrakenConfigService";
+export const CONFIG_SERVICE_NAME = "Config";
 
-export interface KrakenLogServiceClient {
+export interface LogClient {
   addLog(request: addLogRequest, metadata?: Metadata): Observable<addLogResponse>;
 }
 
-export interface KrakenLogServiceController {
+export interface LogController {
   addLog(
     request: addLogRequest,
     metadata?: Metadata,
   ): Promise<addLogResponse> | Observable<addLogResponse> | addLogResponse;
 }
 
-export function KrakenLogServiceControllerMethods() {
+export function LogControllerMethods() {
   return function (constructor: Function) {
     const grpcMethods: string[] = ["addLog"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcMethod("KrakenLogService", method)(constructor.prototype[method], method, descriptor);
+      GrpcMethod("Log", method)(constructor.prototype[method], method, descriptor);
     }
     const grpcStreamMethods: string[] = [];
     for (const method of grpcStreamMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcStreamMethod("KrakenLogService", method)(constructor.prototype[method], method, descriptor);
+      GrpcStreamMethod("Log", method)(constructor.prototype[method], method, descriptor);
     }
   };
 }
 
-export const KRAKEN_LOG_SERVICE_NAME = "KrakenLogService";
+export const LOG_SERVICE_NAME = "Log";
diff --git a/src/modules/log/controllers/log-grpc.controller.ts b/src/modules/log/controllers/log-grpc.controller.ts
index 6eacec2..3fd92da 100644
--- a/src/modules/log/controllers/log-grpc.controller.ts
+++ b/src/modules/log/controllers/log-grpc.controller.ts
@@ -3,13 +3,13 @@ import { Controller } from '@nestjs/common';
 
 import ServiceRegistryService from '../../../../src/modules/service-registry/services/service-registry.service';
 import { ApiConfigService } from '../../../shared/services/api-config.service';
-import type { addLogRequest, addLogResponse, KrakenLogServiceController } from '../../grpc/gen/ts/kraken';
-import { KrakenLogServiceControllerMethods } from '../../grpc/gen/ts/kraken';
+import type { addLogRequest, addLogResponse, LogController } from '../../grpc/gen/ts/kraken';
+import { LogControllerMethods } from '../../grpc/gen/ts/kraken';
 import { LogService } from '../log.service';
 
 @Controller()
-@KrakenLogServiceControllerMethods()
-export class LogGrpcController implements KrakenLogServiceController {
+@LogControllerMethods()
+export class LogGrpcController implements LogController {
   constructor(
     private readonly logService: LogService,
     private readonly apiConfig: ApiConfigService,
diff --git a/src/modules/service-registry/controllers/service-registry-grpc.controller.ts b/src/modules/service-registry/controllers/service-registry-grpc.controller.ts
index 8d94078..5b6ffda 100644
--- a/src/modules/service-registry/controllers/service-registry-grpc.controller.ts
+++ b/src/modules/service-registry/controllers/service-registry-grpc.controller.ts
@@ -4,13 +4,13 @@ import { Controller } from '@nestjs/common';
 
 import { ApiConfigService } from '../../../../src/shared/services/api-config.service';
 import type { registerServiceRequest, registerServiceResponse } from '../../grpc/gen/ts/kraken';
-import { KrakenServiceRegistryServiceControllerMethods, ServiceTypeEnum } from '../../grpc/gen/ts/kraken';
+import { ServiceRegistryControllerMethods, ServiceTypeEnum } from '../../grpc/gen/ts/kraken';
 import { ServiceType } from '../enums/service-types.enum';
 import ServiceRegistryService from '../services/service-registry.service';
 
 @Controller()
-@KrakenServiceRegistryServiceControllerMethods()
-export class ServiceRegistryGrpcController {
+@ServiceRegistryControllerMethods()
+export class ServiceRegistryGrpcController implements ServiceRegistryGrpcController {
   constructor(
     private readonly serviceRegistryService: ServiceRegistryService,
     private readonly apiConfig: ApiConfigService,