diff --git a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
index f6c76830ee..59592afbb6 100644
--- a/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world_r2/bundle.golden_symbols.json
@@ -396,7 +396,7 @@
     "name": "CSS_STRIPPABLE_COMMENT_REGEXP"
   },
   {
-    "name": "CUSTOM_ELEMENTS_SCHEMA"
+    "name": "CUSTOM_ELEMENTS_SCHEMA$1"
   },
   {
     "name": "CastExpr"
@@ -614,14 +614,14 @@
   {
     "name": "EMPTY$1"
   },
+  {
+    "name": "EMPTY_ARRAY"
+  },
   {
     "name": "EMPTY_ARRAY$1"
   },
   {
-    "name": "EMPTY_ARRAY$2"
-  },
-  {
-    "name": "EMPTY_ARRAY$5"
+    "name": "EMPTY_ARRAY$4"
   },
   {
     "name": "EMPTY_CONTEXT"
@@ -1134,7 +1134,7 @@
     "name": "NO_CHANGE"
   },
   {
-    "name": "NO_ERRORS_SCHEMA"
+    "name": "NO_ERRORS_SCHEMA$1"
   },
   {
     "name": "NO_NEW_LINE"
@@ -1770,7 +1770,7 @@
     "name": "URL_WITH_SCHEMA_REGEXP"
   },
   {
-    "name": "USE_VALUE$2"
+    "name": "USE_VALUE"
   },
   {
     "name": "UnsubscriptionError"
@@ -1785,7 +1785,7 @@
     "name": "VERSION"
   },
   {
-    "name": "VERSION$2"
+    "name": "VERSION$1"
   },
   {
     "name": "VIEWS"
@@ -1800,7 +1800,7 @@
     "name": "VariableAst"
   },
   {
-    "name": "Version$1"
+    "name": "Version"
   },
   {
     "name": "ViewAction"
@@ -2151,7 +2151,7 @@
     "name": "__read"
   },
   {
-    "name": "__self$1"
+    "name": "__self"
   },
   {
     "name": "__spread"
@@ -2163,7 +2163,7 @@
     "name": "__values"
   },
   {
-    "name": "__window$1"
+    "name": "__window"
   },
   {
     "name": "_addDebugContext"
@@ -2283,7 +2283,7 @@
     "name": "_getViewQueries"
   },
   {
-    "name": "_global$1"
+    "name": "_global"
   },
   {
     "name": "_isClosingComment"
@@ -2862,7 +2862,7 @@
     "name": "createOptional"
   },
   {
-    "name": "createOutput"
+    "name": "createOutput$1"
   },
   {
     "name": "createOutputContext"
@@ -3273,7 +3273,7 @@
     "name": "fk"
   },
   {
-    "name": "flatten"
+    "name": "flatten$2"
   },
   {
     "name": "flatten$3"
@@ -3654,7 +3654,7 @@
     "name": "instantiateRootComponent"
   },
   {
-    "name": "interpolate$1"
+    "name": "interpolate"
   },
   {
     "name": "interpretStatements"
@@ -4020,10 +4020,10 @@
     "name": "nodeValue"
   },
   {
-    "name": "noop$2"
+    "name": "noop$1"
   },
   {
-    "name": "noop$3"
+    "name": "noop$2"
   },
   {
     "name": "noopScope"
@@ -4041,7 +4041,7 @@
     "name": "normalizeNgContentSelect"
   },
   {
-    "name": "not"
+    "name": "not$1"
   },
   {
     "name": "nullSafeIsEquivalent"