diff --git a/samples/client/others/typescript/builds/enum-single-value/.openapi-generator/FILES b/samples/client/others/typescript/builds/enum-single-value/.openapi-generator/FILES
index 832d1d1b6d4..f586694f5f6 100644
--- a/samples/client/others/typescript/builds/enum-single-value/.openapi-generator/FILES
+++ b/samples/client/others/typescript/builds/enum-single-value/.openapi-generator/FILES
@@ -11,8 +11,8 @@ http/isomorphic-fetch.ts
 index.ts
 middleware.ts
 models/ObjectSerializer.ts
-models/SingleValueEnum30.ts
-models/SingleValueEnum31.ts
+models/SomeObject.ts
+models/WithNullableType.ts
 models/all.ts
 package.json
 rxjsStub.ts
diff --git a/samples/client/others/typescript/builds/enum-single-value/models/ObjectSerializer.ts b/samples/client/others/typescript/builds/enum-single-value/models/ObjectSerializer.ts
index 15b6c13639d..d44f397943e 100644
--- a/samples/client/others/typescript/builds/enum-single-value/models/ObjectSerializer.ts
+++ b/samples/client/others/typescript/builds/enum-single-value/models/ObjectSerializer.ts
@@ -1,8 +1,8 @@
-export * from '../models/SingleValueEnum30';
-export * from '../models/SingleValueEnum31';
+export * from '../models/SomeObject';
+export * from '../models/WithNullableType';
 
-import { SingleValueEnum30, SingleValueEnum30TypeEnum   } from '../models/SingleValueEnum30';
-import { SingleValueEnum31, SingleValueEnum31TypeEnum   } from '../models/SingleValueEnum31';
+import { SomeObject } from '../models/SomeObject';
+import { WithNullableType } from '../models/WithNullableType';
 
 /* tslint:disable:no-unused-variable */
 let primitives = [
@@ -17,13 +17,11 @@ let primitives = [
                  ];
 
 let enumsMap: Set<string> = new Set<string>([
-    "SingleValueEnum30TypeEnum",
-    "SingleValueEnum31TypeEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {
-    "SingleValueEnum30": SingleValueEnum30,
-    "SingleValueEnum31": SingleValueEnum31,
+    "SomeObject": SomeObject,
+    "WithNullableType": WithNullableType,
 }
 
 type MimeTypeDescriptor = {
diff --git a/samples/client/others/typescript/builds/enum-single-value/models/all.ts b/samples/client/others/typescript/builds/enum-single-value/models/all.ts
index dc9e55201d8..ed435990d1a 100644
--- a/samples/client/others/typescript/builds/enum-single-value/models/all.ts
+++ b/samples/client/others/typescript/builds/enum-single-value/models/all.ts
@@ -1,2 +1,2 @@
-export * from '../models/SingleValueEnum30'
-export * from '../models/SingleValueEnum31'
+export * from '../models/SomeObject'
+export * from '../models/WithNullableType'
diff --git a/samples/client/others/typescript/builds/enum-single-value/types/ObjectParamAPI.ts b/samples/client/others/typescript/builds/enum-single-value/types/ObjectParamAPI.ts
index 766e01f3710..5daa1b27ef4 100644
--- a/samples/client/others/typescript/builds/enum-single-value/types/ObjectParamAPI.ts
+++ b/samples/client/others/typescript/builds/enum-single-value/types/ObjectParamAPI.ts
@@ -2,5 +2,5 @@ import { ResponseContext, RequestContext, HttpFile, HttpInfo } from '../http/htt
 import { Configuration, ConfigurationOptions } from '../configuration'
 import type { Middleware } from '../middleware';
 
-import { SingleValueEnum30 } from '../models/SingleValueEnum30';
-import { SingleValueEnum31 } from '../models/SingleValueEnum31';
+import { SomeObject } from '../models/SomeObject';
+import { WithNullableType } from '../models/WithNullableType';
diff --git a/samples/client/others/typescript/builds/enum-single-value/types/ObservableAPI.ts b/samples/client/others/typescript/builds/enum-single-value/types/ObservableAPI.ts
index 37167e1b30f..ddca5054778 100644
--- a/samples/client/others/typescript/builds/enum-single-value/types/ObservableAPI.ts
+++ b/samples/client/others/typescript/builds/enum-single-value/types/ObservableAPI.ts
@@ -3,5 +3,5 @@ import { Configuration, ConfigurationOptions } from '../configuration'
 import type { Middleware } from '../middleware';
 import { Observable, of, from } from '../rxjsStub';
 import {mergeMap, map} from  '../rxjsStub';
-import { SingleValueEnum30 } from '../models/SingleValueEnum30';
-import { SingleValueEnum31 } from '../models/SingleValueEnum31';
+import { SomeObject } from '../models/SomeObject';
+import { WithNullableType } from '../models/WithNullableType';
diff --git a/samples/client/others/typescript/builds/enum-single-value/types/PromiseAPI.ts b/samples/client/others/typescript/builds/enum-single-value/types/PromiseAPI.ts
index 55b1d0e53e2..d536e2b2790 100644
--- a/samples/client/others/typescript/builds/enum-single-value/types/PromiseAPI.ts
+++ b/samples/client/others/typescript/builds/enum-single-value/types/PromiseAPI.ts
@@ -2,5 +2,5 @@ import { ResponseContext, RequestContext, HttpFile, HttpInfo } from '../http/htt
 import { Configuration, ConfigurationOptions, PromiseConfigurationOptions } from '../configuration'
 import { PromiseMiddleware, Middleware, PromiseMiddlewareWrapper } from '../middleware';
 
-import { SingleValueEnum30 } from '../models/SingleValueEnum30';
-import { SingleValueEnum31 } from '../models/SingleValueEnum31';
+import { SomeObject } from '../models/SomeObject';
+import { WithNullableType } from '../models/WithNullableType';