diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
similarity index 100%
rename from packages/core/test/bundling/hello_world_r2/BUILD.bazel
rename to packages/core/test/bundling/hello_world/BUILD.bazel
diff --git a/packages/core/test/bundling/hello_world_r2/index.html b/packages/core/test/bundling/hello_world/index.html
similarity index 100%
rename from packages/core/test/bundling/hello_world_r2/index.html
rename to packages/core/test/bundling/hello_world/index.html
diff --git a/packages/core/test/bundling/hello_world_r2/index.ts b/packages/core/test/bundling/hello_world/index.ts
similarity index 100%
rename from packages/core/test/bundling/hello_world_r2/index.ts
rename to packages/core/test/bundling/hello_world/index.ts
diff --git a/packages/core/test/bundling/hello_world_r2/treeshaking_spec.ts b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
similarity index 99%
rename from packages/core/test/bundling/hello_world_r2/treeshaking_spec.ts
rename to packages/core/test/bundling/hello_world/treeshaking_spec.ts
index f8e4fed3097..793c88482e5 100644
--- a/packages/core/test/bundling/hello_world_r2/treeshaking_spec.ts
+++ b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
@@ -11,7 +11,7 @@ import '@angular/compiler';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const PACKAGE = 'angular/packages/core/test/bundling/hello_world_r2';
+const PACKAGE = 'angular/packages/core/test/bundling/hello_world';
 
 describe('treeshaking with uglify', () => {
   let content: string;
diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
similarity index 97%
rename from packages/core/test/bundling/todo_r2/BUILD.bazel
rename to packages/core/test/bundling/todo/BUILD.bazel
index 990cac234f7..7f3d35537d2 100644
--- a/packages/core/test/bundling/todo_r2/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -68,7 +68,7 @@ genrule(
 
 ts_devserver(
     name = "devserver",
-    entry_module = "@angular/core/test/bundling/todo_r2",
+    entry_module = "@angular/core/test/bundling/todo",
     scripts = [
         "//tools/rxjs:rxjs_umd_modules",
     ],
diff --git a/packages/core/test/bundling/todo_r2/base.css b/packages/core/test/bundling/todo/base.css
similarity index 100%
rename from packages/core/test/bundling/todo_r2/base.css
rename to packages/core/test/bundling/todo/base.css
diff --git a/packages/core/test/bundling/todo_r2/index.html b/packages/core/test/bundling/todo/index.html
similarity index 100%
rename from packages/core/test/bundling/todo_r2/index.html
rename to packages/core/test/bundling/todo/index.html
diff --git a/packages/core/test/bundling/todo_r2/index.ts b/packages/core/test/bundling/todo/index.ts
similarity index 100%
rename from packages/core/test/bundling/todo_r2/index.ts
rename to packages/core/test/bundling/todo/index.ts
diff --git a/packages/core/test/bundling/todo_r2/todo.css b/packages/core/test/bundling/todo/todo.css
similarity index 100%
rename from packages/core/test/bundling/todo_r2/todo.css
rename to packages/core/test/bundling/todo/todo.css
diff --git a/packages/core/test/bundling/todo_r2/todo_e2e_spec.ts b/packages/core/test/bundling/todo/todo_e2e_spec.ts
similarity index 96%
rename from packages/core/test/bundling/todo_r2/todo_e2e_spec.ts
rename to packages/core/test/bundling/todo/todo_e2e_spec.ts
index fde580becb2..bba954e5c02 100644
--- a/packages/core/test/bundling/todo_r2/todo_e2e_spec.ts
+++ b/packages/core/test/bundling/todo/todo_e2e_spec.ts
@@ -11,7 +11,7 @@ import '@angular/compiler';
 import {withBody} from '@angular/private/testing';
 import * as path from 'path';
 
-const PACKAGE = 'angular/packages/core/test/bundling/todo_r2';
+const PACKAGE = 'angular/packages/core/test/bundling/todo';
 const BUNDLES = ['bundle.js', 'bundle.debug.min.js', 'bundle.min.js'];
 
 describe('functional test for todo', () => {