diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptFetchClientCodegen.java
index edde98f3e8d..c0a2b9f7c12 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptFetchClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptFetchClientCodegen.java
@@ -38,7 +38,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
         supportingFiles.add(new SupportingFile("package.json.mustache", "", "package.json"));
-        supportingFiles.add(new SupportingFile("typings.json.mustache", "", "typings.json"));
         supportingFiles.add(new SupportingFile("tsconfig.json.mustache", "", "tsconfig.json"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
 
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
index f1aa9e6c4bd..1c0106ec043 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
@@ -41,7 +41,7 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
      * {{{description}}}
      */
 {{/description}}
-    "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    "{{baseName}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
 }
 
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/gitignore b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/gitignore
index 35e2fb2b02e..1ce70fb9321 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/gitignore
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/gitignore
@@ -1,3 +1,2 @@
 wwwroot/*.js
 node_modules
-typings
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
index d885089fc9c..ed7e16f3c00 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
@@ -6,14 +6,16 @@
   "browser": "./dist/api.js",
   "typings": "./dist/api.d.ts",
   "dependencies": {
-    {{^supportsES6}}"core-js": "^2.4.0",
-    {{/supportsES6}}"isomorphic-fetch": "^2.2.1"
+    "@types/node": "6.0.46",
+    "@types/isomorphic-fetch": "0.0.31",{{^supportsES6}}
+    "@types/core-js": "0.9.34",
+    "core-js": "2.4.1",{{/supportsES6}}
+    "isomorphic-fetch": "2.2.1"
   },
   "scripts" : {
-    "prepublish" : "typings install && tsc"
+    "prepublish" : "tsc"
   },
   "devDependencies": {
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "typescript": "^2.0.7"
   }
 }
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/tsconfig.json.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/tsconfig.json.mustache
index 25f414e9840..08e2e596dbe 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/tsconfig.json.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/tsconfig.json.mustache
@@ -9,9 +9,6 @@
   },
   "exclude": [
     "dist",
-    "node_modules",
-    "typings/browser",
-    "typings/main",
-    "typings/main.d.ts"
+    "node_modules"
   ]
 }
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache
deleted file mode 100644
index e5bd78f06fe..00000000000
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": false,
-  "dependencies": {},
-  "globalDependencies": { {{^supportsES6}}
-    "core-js": "registry:dt/core-js#0.0.0+20160317120654",{{/supportsES6}}
-    "node": "registry:dt/node#4.0.0+20160423143914",
-    "isomorphic-fetch": "registry:dt/isomorphic-fetch#0.0.0+20160505171433"
-  }
-}