diff --git a/src/index.ts b/src/index.ts
index f3d2611a..19118359 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,7 +4,7 @@ import { getOpenApiSpec } from './utils/getOpenApiSpec';
 import { getOpenApiVersion, OpenApiVersion } from './utils/getOpenApiVersion';
 import { isString } from './utils/isString';
 import { postProcessClient } from './utils/postProcessClient';
-import { registerHandlebarsTemplates } from './utils/registerHandlebarsTemplates';
+import { registerHandlebarTemplates } from './utils/registerHandlebarTemplates';
 import { writeClient } from './utils/writeClient';
 
 export enum HttpClient {
@@ -56,7 +56,7 @@ export async function generate({
     // handlebar templates for the given language
     const openApi = isString(input) ? await getOpenApiSpec(input) : input;
     const openApiVersion = getOpenApiVersion(openApi);
-    const templates = registerHandlebarsTemplates();
+    const templates = registerHandlebarTemplates();
 
     switch (openApiVersion) {
         case OpenApiVersion.V2: {
diff --git a/src/utils/registerHandlebarsTemplates.ts b/src/utils/registerHandlebarTemplates.ts
similarity index 98%
rename from src/utils/registerHandlebarsTemplates.ts
rename to src/utils/registerHandlebarTemplates.ts
index f8dc03c8..edad5842 100644
--- a/src/utils/registerHandlebarsTemplates.ts
+++ b/src/utils/registerHandlebarTemplates.ts
@@ -41,7 +41,7 @@ export interface Templates {
  * Read all the Handlebar templates that we need and return on wrapper object
  * so we can easily access the templates in out generator / write functions.
  */
-export function registerHandlebarsTemplates(): Templates {
+export function registerHandlebarTemplates(): Templates {
     registerHandlebarHelpers();
 
     const templates: Templates = {
diff --git a/src/utils/writeClient.spec.ts b/src/utils/writeClient.spec.ts
index 7992f5a8..f9cc76f8 100644
--- a/src/utils/writeClient.spec.ts
+++ b/src/utils/writeClient.spec.ts
@@ -1,7 +1,7 @@
 import { Client } from '../client/interfaces/Client';
 import { HttpClient } from '../index';
 import { mkdir, rmdir, writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClient } from './writeClient';
 
 jest.mock('./fileSystem');
diff --git a/src/utils/writeClient.ts b/src/utils/writeClient.ts
index d2f18077..4484950f 100644
--- a/src/utils/writeClient.ts
+++ b/src/utils/writeClient.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Client } from '../client/interfaces/Client';
 import { HttpClient } from '../index';
 import { copyFile, mkdir, rmdir } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClientIndex } from './writeClientIndex';
 import { writeClientModels } from './writeClientModels';
 import { writeClientSchemas } from './writeClientSchemas';
diff --git a/src/utils/writeClientIndex.spec.ts b/src/utils/writeClientIndex.spec.ts
index 86dcd884..ab63c608 100644
--- a/src/utils/writeClientIndex.spec.ts
+++ b/src/utils/writeClientIndex.spec.ts
@@ -1,6 +1,6 @@
 import { Client } from '../client/interfaces/Client';
 import { writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClientIndex } from './writeClientIndex';
 
 jest.mock('./fileSystem');
diff --git a/src/utils/writeClientIndex.ts b/src/utils/writeClientIndex.ts
index 919556ca..c29988f7 100644
--- a/src/utils/writeClientIndex.ts
+++ b/src/utils/writeClientIndex.ts
@@ -4,7 +4,7 @@ import { Client } from '../client/interfaces/Client';
 import { writeFile } from './fileSystem';
 import { getModelNames } from './getModelNames';
 import { getServiceNames } from './getServiceNames';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 
 /**
  * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
diff --git a/src/utils/writeClientModels.spec.ts b/src/utils/writeClientModels.spec.ts
index 028dfb00..5379d8d9 100644
--- a/src/utils/writeClientModels.spec.ts
+++ b/src/utils/writeClientModels.spec.ts
@@ -1,6 +1,6 @@
 import { Model } from '../client/interfaces/Model';
 import { writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClientModels } from './writeClientModels';
 
 jest.mock('./fileSystem');
diff --git a/src/utils/writeClientModels.ts b/src/utils/writeClientModels.ts
index 34e2ab8d..49697e60 100644
--- a/src/utils/writeClientModels.ts
+++ b/src/utils/writeClientModels.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Model } from '../client/interfaces/Model';
 import { writeFile } from './fileSystem';
 import { format } from './format';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 
 /**
  * Generate Models using the Handlebar template and write to disk.
diff --git a/src/utils/writeClientSchemas.spec.ts b/src/utils/writeClientSchemas.spec.ts
index 9707bf76..3adb0673 100644
--- a/src/utils/writeClientSchemas.spec.ts
+++ b/src/utils/writeClientSchemas.spec.ts
@@ -1,6 +1,6 @@
 import { Model } from '../client/interfaces/Model';
 import { writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClientSchemas } from './writeClientSchemas';
 
 jest.mock('./fileSystem');
diff --git a/src/utils/writeClientSchemas.ts b/src/utils/writeClientSchemas.ts
index 8515781f..2a63fefc 100644
--- a/src/utils/writeClientSchemas.ts
+++ b/src/utils/writeClientSchemas.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Model } from '../client/interfaces/Model';
 import { writeFile } from './fileSystem';
 import { format } from './format';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 
 /**
  * Generate Schemas using the Handlebar template and write to disk.
diff --git a/src/utils/writeClientServices.spec.ts b/src/utils/writeClientServices.spec.ts
index beb30838..b13564c8 100644
--- a/src/utils/writeClientServices.spec.ts
+++ b/src/utils/writeClientServices.spec.ts
@@ -1,6 +1,6 @@
 import { Service } from '../client/interfaces/Service';
 import { writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClientServices } from './writeClientServices';
 
 jest.mock('./fileSystem');
diff --git a/src/utils/writeClientServices.ts b/src/utils/writeClientServices.ts
index ea27f6b3..ccf5753a 100644
--- a/src/utils/writeClientServices.ts
+++ b/src/utils/writeClientServices.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Service } from '../client/interfaces/Service';
 import { writeFile } from './fileSystem';
 import { format } from './format';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 
 /**
  * Generate Services using the Handlebar template and write to disk.
diff --git a/src/utils/writeClientSettings.spec.ts b/src/utils/writeClientSettings.spec.ts
index b263a142..fb094b9e 100644
--- a/src/utils/writeClientSettings.spec.ts
+++ b/src/utils/writeClientSettings.spec.ts
@@ -1,7 +1,7 @@
 import { Client } from '../client/interfaces/Client';
 import { HttpClient } from '../index';
 import { writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 import { writeClientSettings } from './writeClientSettings';
 
 jest.mock('./fileSystem');
diff --git a/src/utils/writeClientSettings.ts b/src/utils/writeClientSettings.ts
index 6224fa58..08928973 100644
--- a/src/utils/writeClientSettings.ts
+++ b/src/utils/writeClientSettings.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { Client } from '../client/interfaces/Client';
 import { HttpClient } from '../index';
 import { writeFile } from './fileSystem';
-import { Templates } from './registerHandlebarsTemplates';
+import { Templates } from './registerHandlebarTemplates';
 
 /**
  * Generate OpenAPI configuration file "OpenAPI.ts"