diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 7caea27fb9..a5c98daf70 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -38,16 +38,16 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze; Dart 2.17.0; PKGS: angular, angular_ast, angular_compiler; `dart analyze`"
+    name: "analyze; Dart 2.17.0; PKGS: ngast, ngcompiler, ngdart; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular-angular_ast-angular_compiler;commands:analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast-ngcompiler-ngdart;commands:analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular-angular_ast-angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast-ngcompiler-ngdart
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -56,46 +56,46 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_pub_upgrade
-        name: angular; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart pub upgrade
-      - name: angular; dart analyze
-        if: "always() && steps.angular_pub_upgrade.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart analyze
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: angular_ast; dart analyze
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: ngast; dart analyze
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart analyze
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: angular_compiler; dart analyze
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: ngcompiler; dart analyze
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart analyze
+      - id: ngdart_pub_upgrade
+        name: ngdart; dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart pub upgrade
+      - name: ngdart; dart analyze
+        if: "always() && steps.ngdart_pub_upgrade.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart analyze
     needs:
       - job_001
   job_003:
-    name: "analyze; Dart 2.17.0; PKGS: angular, angular_ast, angular_compiler; `dart format --output=none --set-exit-if-changed .`"
+    name: "analyze; Dart 2.17.0; PKGS: ngast, ngcompiler, ngdart; `dart format --output=none --set-exit-if-changed .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular-angular_ast-angular_compiler;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast-ngcompiler-ngdart;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular-angular_ast-angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast-ngcompiler-ngdart
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -104,46 +104,46 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_pub_upgrade
-        name: angular; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart pub upgrade
-      - name: "angular; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_pub_upgrade.conclusion == 'success'"
-        working-directory: ngdart
-        run: "dart format --output=none --set-exit-if-changed ."
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: "dart format --output=none --set-exit-if-changed ."
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: "dart format --output=none --set-exit-if-changed ."
+      - id: ngdart_pub_upgrade
+        name: ngdart; dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart pub upgrade
+      - name: "ngdart; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngdart_pub_upgrade.conclusion == 'success'"
+        working-directory: ngdart
+        run: "dart format --output=none --set-exit-if-changed ."
     needs:
       - job_001
   job_004:
-    name: "analyze; Dart dev; PKGS: angular, angular_ast, angular_compiler; `dart analyze`"
+    name: "analyze; Dart dev; PKGS: ngast, ngcompiler, ngdart; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular-angular_ast-angular_compiler;commands:analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast-ngcompiler-ngdart;commands:analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular-angular_ast-angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast-ngcompiler-ngdart
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -152,46 +152,46 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_pub_upgrade
-        name: angular; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart pub upgrade
-      - name: angular; dart analyze
-        if: "always() && steps.angular_pub_upgrade.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart analyze
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: angular_ast; dart analyze
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: ngast; dart analyze
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart analyze
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: angular_compiler; dart analyze
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: ngcompiler; dart analyze
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart analyze
+      - id: ngdart_pub_upgrade
+        name: ngdart; dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart pub upgrade
+      - name: ngdart; dart analyze
+        if: "always() && steps.ngdart_pub_upgrade.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart analyze
     needs:
       - job_001
   job_005:
-    name: "analyze; Dart dev; PKGS: angular, angular_ast, angular_compiler; `dart format --output=none --set-exit-if-changed .`"
+    name: "analyze; Dart dev; PKGS: ngast, ngcompiler, ngdart; `dart format --output=none --set-exit-if-changed .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular-angular_ast-angular_compiler;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast-ngcompiler-ngdart;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular-angular_ast-angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast-ngcompiler-ngdart
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -200,46 +200,46 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_pub_upgrade
-        name: angular; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart pub upgrade
-      - name: "angular; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_pub_upgrade.conclusion == 'success'"
-        working-directory: ngdart
-        run: "dart format --output=none --set-exit-if-changed ."
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: "dart format --output=none --set-exit-if-changed ."
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: "dart format --output=none --set-exit-if-changed ."
+      - id: ngdart_pub_upgrade
+        name: ngdart; dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart pub upgrade
+      - name: "ngdart; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngdart_pub_upgrade.conclusion == 'success'"
+        working-directory: ngdart
+        run: "dart format --output=none --set-exit-if-changed ."
     needs:
       - job_001
   job_006:
-    name: "analyze; Dart stable; PKGS: angular, angular_ast, angular_compiler; `dart analyze`"
+    name: "analyze; Dart stable; PKGS: ngast, ngcompiler, ngdart; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular-angular_ast-angular_compiler;commands:analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast-ngcompiler-ngdart;commands:analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular-angular_ast-angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast-ngcompiler-ngdart
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -248,46 +248,46 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_pub_upgrade
-        name: angular; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart pub upgrade
-      - name: angular; dart analyze
-        if: "always() && steps.angular_pub_upgrade.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart analyze
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: angular_ast; dart analyze
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: ngast; dart analyze
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart analyze
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: angular_compiler; dart analyze
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: ngcompiler; dart analyze
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart analyze
+      - id: ngdart_pub_upgrade
+        name: ngdart; dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart pub upgrade
+      - name: ngdart; dart analyze
+        if: "always() && steps.ngdart_pub_upgrade.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart analyze
     needs:
       - job_001
   job_007:
-    name: "analyze; Dart stable; PKGS: angular, angular_ast, angular_compiler; `dart format --output=none --set-exit-if-changed .`"
+    name: "analyze; Dart stable; PKGS: ngast, ngcompiler, ngdart; `dart format --output=none --set-exit-if-changed .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular-angular_ast-angular_compiler;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast-ngcompiler-ngdart;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular-angular_ast-angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast-ngcompiler-ngdart
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -296,33 +296,33 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_pub_upgrade
-        name: angular; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: ngdart
-        run: dart pub upgrade
-      - name: "angular; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_pub_upgrade.conclusion == 'success'"
-        working-directory: ngdart
-        run: "dart format --output=none --set-exit-if-changed ."
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: "dart format --output=none --set-exit-if-changed ."
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: "dart format --output=none --set-exit-if-changed ."
+      - id: ngdart_pub_upgrade
+        name: ngdart; dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: ngdart
+        run: dart pub upgrade
+      - name: "ngdart; dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.ngdart_pub_upgrade.conclusion == 'success'"
+        working-directory: ngdart
+        run: "dart format --output=none --set-exit-if-changed ."
     needs:
       - job_001
   job_008:
@@ -362,16 +362,16 @@ jobs:
       - job_006
       - job_007
   job_009:
-    name: "build; Dart 2.17.0; PKG: angular_ast; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart 2.17.0; PKG: ngast; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_ast;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_ast
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -380,13 +380,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -398,16 +398,16 @@ jobs:
       - job_006
       - job_007
   job_010:
-    name: "build; Dart 2.17.0; PKG: angular_compiler; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart 2.17.0; PKG: ngcompiler; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_compiler;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngcompiler;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngcompiler
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -416,13 +416,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -434,16 +434,16 @@ jobs:
       - job_006
       - job_007
   job_011:
-    name: "build; Dart 2.17.0; PKG: angular_forms; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart 2.17.0; PKG: ngforms; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_forms;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngforms;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_forms
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngforms
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -452,13 +452,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_forms_pub_upgrade
-        name: angular_forms; dart pub upgrade
+      - id: ngforms_pub_upgrade
+        name: ngforms; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngforms
         run: dart pub upgrade
-      - name: "angular_forms; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_forms_pub_upgrade.conclusion == 'success'"
+      - name: "ngforms; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngforms_pub_upgrade.conclusion == 'success'"
         working-directory: ngforms
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -470,16 +470,16 @@ jobs:
       - job_006
       - job_007
   job_012:
-    name: "build; Dart 2.17.0; PKG: angular_router; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart 2.17.0; PKG: ngrouter; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_router;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngrouter;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_router
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngrouter
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -488,13 +488,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_router_pub_upgrade
-        name: angular_router; dart pub upgrade
+      - id: ngrouter_pub_upgrade
+        name: ngrouter; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngrouter
         run: dart pub upgrade
-      - name: "angular_router; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_router_pub_upgrade.conclusion == 'success'"
+      - name: "ngrouter; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngrouter_pub_upgrade.conclusion == 'success'"
         working-directory: ngrouter
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -506,16 +506,16 @@ jobs:
       - job_006
       - job_007
   job_013:
-    name: "build; Dart 2.17.0; PKG: angular_test; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart 2.17.0; PKG: ngtest; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_test;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngtest;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_test
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -524,13 +524,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_test_pub_upgrade
-        name: angular_test; dart pub upgrade
+      - id: ngtest_pub_upgrade
+        name: ngtest; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngtest
         run: dart pub upgrade
-      - name: "angular_test; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_test_pub_upgrade.conclusion == 'success'"
+      - name: "ngtest; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngtest_pub_upgrade.conclusion == 'success'"
         working-directory: ngtest
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -578,16 +578,16 @@ jobs:
       - job_006
       - job_007
   job_015:
-    name: "build; Dart dev; PKG: angular_ast; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart dev; PKG: ngast; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_ast;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_ast
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -596,13 +596,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -614,16 +614,16 @@ jobs:
       - job_006
       - job_007
   job_016:
-    name: "build; Dart dev; PKG: angular_compiler; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart dev; PKG: ngcompiler; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_compiler;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngcompiler;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngcompiler
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -632,13 +632,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -650,16 +650,16 @@ jobs:
       - job_006
       - job_007
   job_017:
-    name: "build; Dart dev; PKG: angular_forms; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart dev; PKG: ngforms; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_forms;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngforms;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_forms
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngforms
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -668,13 +668,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_forms_pub_upgrade
-        name: angular_forms; dart pub upgrade
+      - id: ngforms_pub_upgrade
+        name: ngforms; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngforms
         run: dart pub upgrade
-      - name: "angular_forms; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_forms_pub_upgrade.conclusion == 'success'"
+      - name: "ngforms; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngforms_pub_upgrade.conclusion == 'success'"
         working-directory: ngforms
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -686,16 +686,16 @@ jobs:
       - job_006
       - job_007
   job_018:
-    name: "build; Dart dev; PKG: angular_router; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart dev; PKG: ngrouter; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_router;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngrouter;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_router
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngrouter
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -704,13 +704,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_router_pub_upgrade
-        name: angular_router; dart pub upgrade
+      - id: ngrouter_pub_upgrade
+        name: ngrouter; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngrouter
         run: dart pub upgrade
-      - name: "angular_router; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_router_pub_upgrade.conclusion == 'success'"
+      - name: "ngrouter; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngrouter_pub_upgrade.conclusion == 'success'"
         working-directory: ngrouter
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -722,16 +722,16 @@ jobs:
       - job_006
       - job_007
   job_019:
-    name: "build; Dart dev; PKG: angular_test; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart dev; PKG: ngtest; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_test;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngtest;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_test
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -740,13 +740,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_test_pub_upgrade
-        name: angular_test; dart pub upgrade
+      - id: ngtest_pub_upgrade
+        name: ngtest; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngtest
         run: dart pub upgrade
-      - name: "angular_test; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_test_pub_upgrade.conclusion == 'success'"
+      - name: "ngtest; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngtest_pub_upgrade.conclusion == 'success'"
         working-directory: ngtest
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -794,16 +794,16 @@ jobs:
       - job_006
       - job_007
   job_021:
-    name: "build; Dart stable; PKG: angular_ast; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart stable; PKG: ngast; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_ast;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_ast
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -812,13 +812,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -830,16 +830,16 @@ jobs:
       - job_006
       - job_007
   job_022:
-    name: "build; Dart stable; PKG: angular_compiler; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart stable; PKG: ngcompiler; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_compiler;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngcompiler;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngcompiler
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -848,13 +848,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -866,16 +866,16 @@ jobs:
       - job_006
       - job_007
   job_023:
-    name: "build; Dart stable; PKG: angular_forms; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart stable; PKG: ngforms; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_forms;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngforms;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_forms
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngforms
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -884,13 +884,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_forms_pub_upgrade
-        name: angular_forms; dart pub upgrade
+      - id: ngforms_pub_upgrade
+        name: ngforms; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngforms
         run: dart pub upgrade
-      - name: "angular_forms; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_forms_pub_upgrade.conclusion == 'success'"
+      - name: "ngforms; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngforms_pub_upgrade.conclusion == 'success'"
         working-directory: ngforms
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -902,16 +902,16 @@ jobs:
       - job_006
       - job_007
   job_024:
-    name: "build; Dart stable; PKG: angular_router; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart stable; PKG: ngrouter; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_router;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngrouter;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_router
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngrouter
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -920,13 +920,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_router_pub_upgrade
-        name: angular_router; dart pub upgrade
+      - id: ngrouter_pub_upgrade
+        name: ngrouter; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngrouter
         run: dart pub upgrade
-      - name: "angular_router; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_router_pub_upgrade.conclusion == 'success'"
+      - name: "ngrouter; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngrouter_pub_upgrade.conclusion == 'success'"
         working-directory: ngrouter
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -938,16 +938,16 @@ jobs:
       - job_006
       - job_007
   job_025:
-    name: "build; Dart stable; PKG: angular_test; `dart run build_runner build --fail-on-severe`"
+    name: "build; Dart stable; PKG: ngtest; `dart run build_runner build --fail-on-severe`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_test;commands:command_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngtest;commands:command_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_test
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -956,13 +956,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_test_pub_upgrade
-        name: angular_test; dart pub upgrade
+      - id: ngtest_pub_upgrade
+        name: ngtest; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngtest
         run: dart pub upgrade
-      - name: "angular_test; dart run build_runner build --fail-on-severe"
-        if: "always() && steps.angular_test_pub_upgrade.conclusion == 'success'"
+      - name: "ngtest; dart run build_runner build --fail-on-severe"
+        if: "always() && steps.ngtest_pub_upgrade.conclusion == 'success'"
         working-directory: ngtest
         run: dart run build_runner build --fail-on-severe
     needs:
@@ -1082,16 +1082,16 @@ jobs:
       - job_024
       - job_025
   job_028:
-    name: "unit_test; Dart 2.17.0; PKG: angular_ast; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart 2.17.0; PKG: ngast; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_ast;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_ast
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngast
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1100,13 +1100,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1136,16 +1136,16 @@ jobs:
       - job_024
       - job_025
   job_029:
-    name: "unit_test; Dart 2.17.0; PKG: angular_compiler; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart 2.17.0; PKG: ngcompiler; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_compiler;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngcompiler;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngcompiler
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1154,13 +1154,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1190,16 +1190,16 @@ jobs:
       - job_024
       - job_025
   job_030:
-    name: "unit_test; Dart 2.17.0; PKG: angular_forms; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart 2.17.0; PKG: ngforms; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_forms;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngforms;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_forms
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngforms
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1208,13 +1208,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_forms_pub_upgrade
-        name: angular_forms; dart pub upgrade
+      - id: ngforms_pub_upgrade
+        name: ngforms; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngforms
         run: dart pub upgrade
-      - name: "angular_forms; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_forms_pub_upgrade.conclusion == 'success'"
+      - name: "ngforms; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngforms_pub_upgrade.conclusion == 'success'"
         working-directory: ngforms
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1244,16 +1244,16 @@ jobs:
       - job_024
       - job_025
   job_031:
-    name: "unit_test; Dart 2.17.0; PKG: angular_router; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart 2.17.0; PKG: ngrouter; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_router;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngrouter;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_router
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngrouter
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1262,13 +1262,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_router_pub_upgrade
-        name: angular_router; dart pub upgrade
+      - id: ngrouter_pub_upgrade
+        name: ngrouter; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngrouter
         run: dart pub upgrade
-      - name: "angular_router; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_router_pub_upgrade.conclusion == 'success'"
+      - name: "ngrouter; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngrouter_pub_upgrade.conclusion == 'success'"
         working-directory: ngrouter
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1298,16 +1298,16 @@ jobs:
       - job_024
       - job_025
   job_032:
-    name: "unit_test; Dart 2.17.0; PKG: angular_test; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart 2.17.0; PKG: ngtest; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_test;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngtest;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:angular_test
+            os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1316,13 +1316,13 @@ jobs:
           sdk: "2.17.0"
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_test_pub_upgrade
-        name: angular_test; dart pub upgrade
+      - id: ngtest_pub_upgrade
+        name: ngtest; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngtest
         run: dart pub upgrade
-      - name: "angular_test; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_test_pub_upgrade.conclusion == 'success'"
+      - name: "ngtest; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngtest_pub_upgrade.conclusion == 'success'"
         working-directory: ngtest
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1460,16 +1460,16 @@ jobs:
       - job_024
       - job_025
   job_035:
-    name: "unit_test; Dart dev; PKG: angular_ast; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart dev; PKG: ngast; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_ast;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_ast
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1478,13 +1478,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1514,16 +1514,16 @@ jobs:
       - job_024
       - job_025
   job_036:
-    name: "unit_test; Dart dev; PKG: angular_compiler; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart dev; PKG: ngcompiler; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_compiler;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngcompiler;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngcompiler
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1532,13 +1532,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1568,16 +1568,16 @@ jobs:
       - job_024
       - job_025
   job_037:
-    name: "unit_test; Dart dev; PKG: angular_forms; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart dev; PKG: ngforms; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_forms;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngforms;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_forms
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngforms
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1586,13 +1586,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_forms_pub_upgrade
-        name: angular_forms; dart pub upgrade
+      - id: ngforms_pub_upgrade
+        name: ngforms; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngforms
         run: dart pub upgrade
-      - name: "angular_forms; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_forms_pub_upgrade.conclusion == 'success'"
+      - name: "ngforms; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngforms_pub_upgrade.conclusion == 'success'"
         working-directory: ngforms
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1622,16 +1622,16 @@ jobs:
       - job_024
       - job_025
   job_038:
-    name: "unit_test; Dart dev; PKG: angular_router; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart dev; PKG: ngrouter; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_router;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngrouter;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_router
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngrouter
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1640,13 +1640,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_router_pub_upgrade
-        name: angular_router; dart pub upgrade
+      - id: ngrouter_pub_upgrade
+        name: ngrouter; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngrouter
         run: dart pub upgrade
-      - name: "angular_router; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_router_pub_upgrade.conclusion == 'success'"
+      - name: "ngrouter; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngrouter_pub_upgrade.conclusion == 'success'"
         working-directory: ngrouter
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1676,16 +1676,16 @@ jobs:
       - job_024
       - job_025
   job_039:
-    name: "unit_test; Dart dev; PKG: angular_test; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart dev; PKG: ngtest; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_test;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngtest;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:angular_test
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1694,13 +1694,13 @@ jobs:
           sdk: dev
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_test_pub_upgrade
-        name: angular_test; dart pub upgrade
+      - id: ngtest_pub_upgrade
+        name: ngtest; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngtest
         run: dart pub upgrade
-      - name: "angular_test; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_test_pub_upgrade.conclusion == 'success'"
+      - name: "ngtest; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngtest_pub_upgrade.conclusion == 'success'"
         working-directory: ngtest
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1838,16 +1838,16 @@ jobs:
       - job_024
       - job_025
   job_042:
-    name: "unit_test; Dart stable; PKG: angular_ast; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart stable; PKG: ngast; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_ast;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_ast
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngast
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1856,13 +1856,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_ast_pub_upgrade
-        name: angular_ast; dart pub upgrade
+      - id: ngast_pub_upgrade
+        name: ngast; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngast
         run: dart pub upgrade
-      - name: "angular_ast; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_ast_pub_upgrade.conclusion == 'success'"
+      - name: "ngast; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngast_pub_upgrade.conclusion == 'success'"
         working-directory: ngast
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1892,16 +1892,16 @@ jobs:
       - job_024
       - job_025
   job_043:
-    name: "unit_test; Dart stable; PKG: angular_compiler; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart stable; PKG: ngcompiler; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_compiler;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngcompiler;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_compiler
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngcompiler
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1910,13 +1910,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_compiler_pub_upgrade
-        name: angular_compiler; dart pub upgrade
+      - id: ngcompiler_pub_upgrade
+        name: ngcompiler; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart pub upgrade
-      - name: "angular_compiler; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_compiler_pub_upgrade.conclusion == 'success'"
+      - name: "ngcompiler; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngcompiler_pub_upgrade.conclusion == 'success'"
         working-directory: ngcompiler
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -1946,16 +1946,16 @@ jobs:
       - job_024
       - job_025
   job_044:
-    name: "unit_test; Dart stable; PKG: angular_forms; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart stable; PKG: ngforms; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_forms;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngforms;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_forms
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngforms
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -1964,13 +1964,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_forms_pub_upgrade
-        name: angular_forms; dart pub upgrade
+      - id: ngforms_pub_upgrade
+        name: ngforms; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngforms
         run: dart pub upgrade
-      - name: "angular_forms; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_forms_pub_upgrade.conclusion == 'success'"
+      - name: "ngforms; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngforms_pub_upgrade.conclusion == 'success'"
         working-directory: ngforms
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -2000,16 +2000,16 @@ jobs:
       - job_024
       - job_025
   job_045:
-    name: "unit_test; Dart stable; PKG: angular_router; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart stable; PKG: ngrouter; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_router;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngrouter;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_router
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngrouter
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -2018,13 +2018,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_router_pub_upgrade
-        name: angular_router; dart pub upgrade
+      - id: ngrouter_pub_upgrade
+        name: ngrouter; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngrouter
         run: dart pub upgrade
-      - name: "angular_router; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_router_pub_upgrade.conclusion == 'success'"
+      - name: "ngrouter; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngrouter_pub_upgrade.conclusion == 'success'"
         working-directory: ngrouter
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs:
@@ -2054,16 +2054,16 @@ jobs:
       - job_024
       - job_025
   job_046:
-    name: "unit_test; Dart stable; PKG: angular_test; `dart run build_runner test --fail-on-severe -- -P ci`"
+    name: "unit_test; Dart stable; PKG: ngtest; `dart run build_runner test --fail-on-severe -- -P ci`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v3
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_test;commands:command_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngtest;commands:command_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:angular_test
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -2072,13 +2072,13 @@ jobs:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
-      - id: angular_test_pub_upgrade
-        name: angular_test; dart pub upgrade
+      - id: ngtest_pub_upgrade
+        name: ngtest; dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: ngtest
         run: dart pub upgrade
-      - name: "angular_test; dart run build_runner test --fail-on-severe -- -P ci"
-        if: "always() && steps.angular_test_pub_upgrade.conclusion == 'success'"
+      - name: "ngtest; dart run build_runner test --fail-on-severe -- -P ci"
+        if: "always() && steps.ngtest_pub_upgrade.conclusion == 'success'"
         working-directory: ngtest
         run: dart run build_runner test --fail-on-severe -- -P ci
     needs: