diff --git a/tools/gulp-tasks/public-api.js b/tools/gulp-tasks/public-api.js
index e4f2fa41ff..6d14f929f2 100644
--- a/tools/gulp-tasks/public-api.js
+++ b/tools/gulp-tasks/public-api.js
@@ -1,22 +1,22 @@
 const entrypoints = [
-  'dist/packages-dist/core/index.d.ts', 'dist/packages-dist/core/testing.d.ts',
-  'dist/packages-dist/common/index.d.ts', 'dist/packages-dist/common/testing.d.ts',
+  'dist/packages-dist/core/core.d.ts', 'dist/packages-dist/core/testing.d.ts',
+  'dist/packages-dist/common/common.d.ts', 'dist/packages-dist/common/testing.d.ts',
   'dist/packages-dist/common/http.d.ts', 'dist/packages-dist/common/http/testing.d.ts',
   // The API surface of the compiler is currently unstable - all of the important APIs are exposed
   // via @angular/core, @angular/platform-browser or @angular/platform-browser-dynamic instead.
   //'dist/packages-dist/compiler/index.d.ts',
   //'dist/packages-dist/compiler/testing.d.ts',
-  'dist/packages-dist/upgrade/index.d.ts', 'dist/packages-dist/upgrade/static.d.ts',
-  'dist/packages-dist/platform-browser/index.d.ts',
+  'dist/packages-dist/upgrade/upgrade.d.ts', 'dist/packages-dist/upgrade/static.d.ts',
+  'dist/packages-dist/platform-browser/platform-browser.d.ts',
   'dist/packages-dist/platform-browser/testing.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/index.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/platform-browser-dynamic.d.ts',
   'dist/packages-dist/platform-browser-dynamic/testing.d.ts',
-  'dist/packages-dist/platform-webworker/index.d.ts',
-  'dist/packages-dist/platform-webworker-dynamic/index.d.ts',
-  'dist/packages-dist/platform-server/index.d.ts',
-  'dist/packages-dist/platform-server/testing.d.ts', 'dist/packages-dist/http/index.d.ts',
-  'dist/packages-dist/http/testing.d.ts', 'dist/packages-dist/forms/index.d.ts',
-  'dist/packages-dist/router/index.d.ts', 'dist/packages-dist/animations/index.d.ts',
+  'dist/packages-dist/platform-webworker/platform-webworker.d.ts',
+  'dist/packages-dist/platform-webworker-dynamic/platform-webworker-dynamic.d.ts',
+  'dist/packages-dist/platform-server/platform-server.d.ts',
+  'dist/packages-dist/platform-server/testing.d.ts', 'dist/packages-dist/http/http.d.ts',
+  'dist/packages-dist/http/testing.d.ts', 'dist/packages-dist/forms/forms.d.ts',
+  'dist/packages-dist/router/router.d.ts', 'dist/packages-dist/animations/animations.d.ts',
   'dist/packages-dist/animations/browser.d.ts',
   'dist/packages-dist/animations/browser/testing.d.ts',
   'dist/packages-dist/platform-browser/animations.d.ts'
diff --git a/tools/public_api_guard/animations/index.d.ts b/tools/public_api_guard/animations/animations.d.ts
similarity index 100%
rename from tools/public_api_guard/animations/index.d.ts
rename to tools/public_api_guard/animations/animations.d.ts
diff --git a/tools/public_api_guard/common/index.d.ts b/tools/public_api_guard/common/common.d.ts
similarity index 100%
rename from tools/public_api_guard/common/index.d.ts
rename to tools/public_api_guard/common/common.d.ts
diff --git a/tools/public_api_guard/compiler/index.d.ts b/tools/public_api_guard/compiler/compiler.d.ts
similarity index 100%
rename from tools/public_api_guard/compiler/index.d.ts
rename to tools/public_api_guard/compiler/compiler.d.ts
diff --git a/tools/public_api_guard/core/index.d.ts b/tools/public_api_guard/core/core.d.ts
similarity index 100%
rename from tools/public_api_guard/core/index.d.ts
rename to tools/public_api_guard/core/core.d.ts
diff --git a/tools/public_api_guard/forms/index.d.ts b/tools/public_api_guard/forms/forms.d.ts
similarity index 100%
rename from tools/public_api_guard/forms/index.d.ts
rename to tools/public_api_guard/forms/forms.d.ts
diff --git a/tools/public_api_guard/http/index.d.ts b/tools/public_api_guard/http/http.d.ts
similarity index 100%
rename from tools/public_api_guard/http/index.d.ts
rename to tools/public_api_guard/http/http.d.ts
diff --git a/tools/public_api_guard/platform-browser-dynamic/index.d.ts b/tools/public_api_guard/platform-browser-dynamic/platform-browser-dynamic.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser-dynamic/index.d.ts
rename to tools/public_api_guard/platform-browser-dynamic/platform-browser-dynamic.d.ts
diff --git a/tools/public_api_guard/platform-browser/index.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser/index.d.ts
rename to tools/public_api_guard/platform-browser/platform-browser.d.ts
diff --git a/tools/public_api_guard/platform-server/index.d.ts b/tools/public_api_guard/platform-server/platform-server.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-server/index.d.ts
rename to tools/public_api_guard/platform-server/platform-server.d.ts
diff --git a/tools/public_api_guard/platform-webworker-dynamic/index.d.ts b/tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-webworker-dynamic/index.d.ts
rename to tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts
diff --git a/tools/public_api_guard/platform-webworker/index.d.ts b/tools/public_api_guard/platform-webworker/platform-webworker.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-webworker/index.d.ts
rename to tools/public_api_guard/platform-webworker/platform-webworker.d.ts
diff --git a/tools/public_api_guard/router/index.d.ts b/tools/public_api_guard/router/router.d.ts
similarity index 100%
rename from tools/public_api_guard/router/index.d.ts
rename to tools/public_api_guard/router/router.d.ts
diff --git a/tools/public_api_guard/upgrade/index.d.ts b/tools/public_api_guard/upgrade/upgrade.d.ts
similarity index 100%
rename from tools/public_api_guard/upgrade/index.d.ts
rename to tools/public_api_guard/upgrade/upgrade.d.ts