diff --git a/packages/jael/jael/CHANGELOG.md b/packages/jael/jael/CHANGELOG.md
index 938057bb..9f064517 100644
--- a/packages/jael/jael/CHANGELOG.md
+++ b/packages/jael/jael/CHANGELOG.md
@@ -1,6 +1,5 @@
 # 4.0.0
 * Migrated to support Dart SDK 2.12.x NNBD
-* Renamed jael to jael3
 
 # 3.0.0
 * Migrated to work with Dart SDK 2.12.x Non NNBD
diff --git a/packages/jael/jael/README.md b/packages/jael/jael/README.md
index 9e5d3a94..a384e75f 100644
--- a/packages/jael/jael/README.md
+++ b/packages/jael/jael/README.md
@@ -3,7 +3,7 @@
 [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
 [![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion)
 
-[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael3/LICENSE)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael/LICENSE)
 
 A simple server-side HTML templating engine for Dart.
 
@@ -18,7 +18,7 @@ dependencies:
 ```
 
 # API
-The core `jael` package exports classes for parsing Jael templates,
+The core `jael3` package exports classes for parsing Jael templates,
 an AST library, and a `Renderer` class that generates HTML on-the-fly.
 
 ```dart
diff --git a/packages/jael/jael/bin/jaelfmt.dart b/packages/jael/jael/bin/jaelfmt.dart
index 3b89acb5..e34970c2 100644
--- a/packages/jael/jael/bin/jaelfmt.dart
+++ b/packages/jael/jael/bin/jaelfmt.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:args/args.dart';
-import 'package:jael/jael.dart';
+import 'package:jael3/jael3.dart';
 
 var argParser = ArgParser()
   ..addOption('line-length',
@@ -29,7 +29,7 @@ var argParser = ArgParser()
       help: 'Overwrite input files with formatted output.',
       negatable: false);
 
-main(List<String> args) async {
+void main(List<String> args) async {
   try {
     var argResults = argParser.parse(args);
     if (argResults['help'] as bool) {
@@ -41,7 +41,7 @@ main(List<String> args) async {
     if (argResults.rest.isEmpty) {
       var text = await stdin.transform(utf8.decoder).join();
       var result =
-          await format(argResults['stdin-name'] as String?, text, argResults);
+          format(argResults['stdin-name'] as String?, text, argResults);
       if (result != null) print(result);
     } else {
       for (var arg in argResults.rest) {
diff --git a/packages/jael/jael/example/main.dart b/packages/jael/jael/example/main.dart
index 4f4e4762..3d2af33c 100644
--- a/packages/jael/jael/example/main.dart
+++ b/packages/jael/jael/example/main.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 import 'package:charcode/charcode.dart';
-import 'package:code_buffer/code_buffer.dart';
-import 'package:jael/jael.dart' as jael;
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_code_buffer/angel3_code_buffer.dart';
+import 'package:jael3/jael3.dart' as jael;
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 
-main() {
+void main() {
   while (true) {
     var buf = StringBuffer();
     int ch;
diff --git a/packages/jael/jael/lib/jael.dart b/packages/jael/jael/lib/jael3.dart
similarity index 100%
rename from packages/jael/jael/lib/jael.dart
rename to packages/jael/jael/lib/jael3.dart
diff --git a/packages/jael/jael/lib/src/ast/call.dart b/packages/jael/jael/lib/src/ast/call.dart
index 04d905be..fd0f21c5 100644
--- a/packages/jael/jael/lib/src/ast/call.dart
+++ b/packages/jael/jael/lib/src/ast/call.dart
@@ -1,5 +1,5 @@
 import 'package:source_span/source_span.dart';
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'ast_node.dart';
 import 'expression.dart';
 import 'identifier.dart';
diff --git a/packages/jael/jael/lib/src/ast/expression.dart b/packages/jael/jael/lib/src/ast/expression.dart
index db20fee8..56dd2b55 100644
--- a/packages/jael/jael/lib/src/ast/expression.dart
+++ b/packages/jael/jael/lib/src/ast/expression.dart
@@ -1,5 +1,5 @@
 import 'package:source_span/source_span.dart';
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'ast_node.dart';
 import 'token.dart';
 
diff --git a/packages/jael/jael/lib/src/ast/identifier.dart b/packages/jael/jael/lib/src/ast/identifier.dart
index d23023e2..2d190cd5 100644
--- a/packages/jael/jael/lib/src/ast/identifier.dart
+++ b/packages/jael/jael/lib/src/ast/identifier.dart
@@ -1,5 +1,5 @@
 import 'package:source_span/source_span.dart';
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'expression.dart';
 import 'token.dart';
 
diff --git a/packages/jael/jael/lib/src/ast/member.dart b/packages/jael/jael/lib/src/ast/member.dart
index 1b0ebf72..4c9241f4 100644
--- a/packages/jael/jael/lib/src/ast/member.dart
+++ b/packages/jael/jael/lib/src/ast/member.dart
@@ -1,6 +1,6 @@
 import 'dart:mirrors';
 import 'package:source_span/source_span.dart';
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'expression.dart';
 import 'identifier.dart';
 import 'token.dart';
diff --git a/packages/jael/jael/lib/src/ast/string.dart b/packages/jael/jael/lib/src/ast/string.dart
index a01c28a4..608164f0 100644
--- a/packages/jael/jael/lib/src/ast/string.dart
+++ b/packages/jael/jael/lib/src/ast/string.dart
@@ -1,6 +1,6 @@
 import 'package:charcode/charcode.dart';
 import 'package:source_span/source_span.dart';
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import '../ast/ast.dart';
 import 'expression.dart';
 import 'token.dart';
diff --git a/packages/jael/jael/lib/src/renderer.dart b/packages/jael/jael/lib/src/renderer.dart
index 3474ac3f..4c79eb80 100644
--- a/packages/jael/jael/lib/src/renderer.dart
+++ b/packages/jael/jael/lib/src/renderer.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
-import 'package:code_buffer/code_buffer.dart';
+import 'package:angel3_code_buffer/angel3_code_buffer.dart';
 import 'package:collection/collection.dart' show IterableExtension;
-import 'package:source_span/source_span.dart';
-import 'package:symbol_table/symbol_table.dart';
+//import 'package:source_span/source_span.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'ast/ast.dart';
 import 'text/parser.dart';
 import 'text/scanner.dart';
diff --git a/packages/jael/jael/pubspec.yaml b/packages/jael/jael/pubspec.yaml
index 9345f3a8..4637a914 100644
--- a/packages/jael/jael/pubspec.yaml
+++ b/packages/jael/jael/pubspec.yaml
@@ -1,7 +1,7 @@
 name: jael3
 version: 4.0.0
 description:  A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid.
-homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael3
+homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael
 environment:
   sdk: '>=2.12.0 <3.0.0'
 dependencies:
@@ -11,7 +11,8 @@ dependencies:
   angel3_symbol_table: ^2.0.0
   source_span: ^1.0.0
   string_scanner: ^1.0.0
-  collection: ^1.15.0  
+  collection: ^1.15.0
+  matcher: ^0.12.10 
 dev_dependencies:
   pedantic: ^1.11.0
   test: ^1.17.4
diff --git a/packages/jael/jael/test/render/custom_element_test.dart b/packages/jael/jael/test/render/custom_element_test.dart
index 489d506b..812b562c 100644
--- a/packages/jael/jael/test/render/custom_element_test.dart
+++ b/packages/jael/jael/test/render/custom_element_test.dart
@@ -1,7 +1,7 @@
 import 'dart:math';
-import 'package:code_buffer/code_buffer.dart';
-import 'package:jael/jael.dart' as jael;
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_code_buffer/angel3_code_buffer.dart';
+import 'package:jael3/jael3.dart' as jael;
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/jael/jael/test/render/dsx_test.dart b/packages/jael/jael/test/render/dsx_test.dart
index d018855f..fb1368db 100644
--- a/packages/jael/jael/test/render/dsx_test.dart
+++ b/packages/jael/jael/test/render/dsx_test.dart
@@ -1,5 +1,5 @@
-import 'package:jael/jael.dart';
-import 'package:symbol_table/symbol_table.dart';
+import 'package:jael3/jael3.dart';
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/jael/jael/test/render/render_test.dart b/packages/jael/jael/test/render/render_test.dart
index 79521bf3..c4fc8f93 100644
--- a/packages/jael/jael/test/render/render_test.dart
+++ b/packages/jael/jael/test/render/render_test.dart
@@ -1,6 +1,6 @@
-import 'package:code_buffer/code_buffer.dart';
-import 'package:jael/jael.dart' as jael;
-import 'package:symbol_table/symbol_table.dart';
+import 'package:angel3_code_buffer/angel3_code_buffer.dart';
+import 'package:jael3/jael3.dart' as jael;
+import 'package:angel3_symbol_table/angel3_symbol_table.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/jael/jael/test/text/common.dart b/packages/jael/jael/test/text/common.dart
index 7e5fc68e..8f457eae 100644
--- a/packages/jael/jael/test/text/common.dart
+++ b/packages/jael/jael/test/text/common.dart
@@ -1,5 +1,5 @@
 import 'package:matcher/matcher.dart';
-import 'package:jael/src/ast/token.dart';
+import 'package:jael3/src/ast/token.dart';
 
 Matcher isToken(TokenType type, [String? text]) => _IsToken(type, text);
 
diff --git a/packages/jael/jael/test/text/scan_test.dart b/packages/jael/jael/test/text/scan_test.dart
index 9541838b..65eea145 100644
--- a/packages/jael/jael/test/text/scan_test.dart
+++ b/packages/jael/jael/test/text/scan_test.dart
@@ -1,5 +1,5 @@
-import 'package:jael/src/ast/token.dart';
-import 'package:jael/src/text/scanner.dart';
+import 'package:jael3/src/ast/token.dart';
+import 'package:jael3/src/text/scanner.dart';
 import 'package:test/test.dart';
 import 'common.dart';