diff --git a/templates/api.repository.impl.mustache b/templates/api.repository.impl.mustache
index 7f025b8..f02fbaa 100644
--- a/templates/api.repository.impl.mustache
+++ b/templates/api.repository.impl.mustache
@@ -33,7 +33,7 @@ export class {{classname}}RepositoryImpl extends MRepository implements {{classn
       params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
     }{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}})
       .pipe(
-        map((response) => response.{{#vendorExtensions}}{{x-response-property}}{{/vendorExtensions}}{{^vendorExtensions}}items{{/vendorExtensions}}.map({{{returnBaseType}}}Mapper))
+        map((response) => response.{{#vendorExtensions}}{{x-response-property}}{{/vendorExtensions}}{{^vendorExtensions}}items{{/vendorExtensions}}.map({{{returnBaseTypeVarName}}}Mapper))
       );
     {{/isListContainer}}
     {{^isListContainer}}
@@ -42,7 +42,7 @@ export class {{classname}}RepositoryImpl extends MRepository implements {{classn
       params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
     }{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}})
       .pipe(
-        map({{{returnType}}}Mapper)
+        map({{{returnTypeVarName}}}Mapper)
       );
     {{/returnType}}
     {{^returnType}}
diff --git a/templates/use-cases.provider.mustache b/templates/use-cases.provider.mustache
index 19ed974..58a4f0b 100644
--- a/templates/use-cases.provider.mustache
+++ b/templates/use-cases.provider.mustache
@@ -3,8 +3,8 @@
 {{#operations}}
 import { EnvironmentProviders, makeEnvironmentProviders } from '@angular/core';
 
-import { {{constantName}}_USE_CASES } from '@/domain/use-cases/{{classFilename}}/{{classFilename}}.use-cases.contract';
-import { {{classname}}UseCasesImpl } from '@/domain/use-cases/{{classFilename}}/{{classFilename}}.use-cases.impl';
+import { {{constantName}}_USE_CASES } from '@/domain/use-cases/{{classFilename}}.use-cases.contract';
+import { {{classname}}UseCasesImpl } from '@/domain/use-cases/{{classFilename}}.use-cases.impl';
 
 /**
  * {{classname}} Use Cases Provider