diff --git a/packages/container/angel_container/.gitignore b/packages/container/angel_container/.gitignore
index 7bf00e82..24d68312 100644
--- a/packages/container/angel_container/.gitignore
+++ b/packages/container/angel_container/.gitignore
@@ -1,13 +1,71 @@
-# See https://www.dartlang.org/guides/libraries/private-files
+# See https://www.dartlang.org/tools/private-files.html
 
 # Files and directories created by pub
-.dart_tool/
+.dart_tool
 .packages
 .pub/
 build/
+
 # If you're building an application, you may want to check-in your pubspec.lock
 pubspec.lock
 
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.
 doc/api/
+
+### Dart template
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+
+# SDK 1.20 and later (no longer creates packages directories)
+
+# Older SDK versions
+# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
+.project
+.buildlog
+**/packages/
+
+
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
+*.dart.js
+*.part.js
+*.js.deps
+*.js.map
+*.info.json
+
+# Directory created by dartdoc
+
+# Don't commit pubspec lock file
+# (Library packages only! Remove pattern if developing an application package)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+
+## VsCode
+.vscode/
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+.idea/
+/out/
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
diff --git a/packages/container/angel_container/AUTHORS.md b/packages/container/angel_container/AUTHORS.md
index 2a973de6..ac95ab58 100644
--- a/packages/container/angel_container/AUTHORS.md
+++ b/packages/container/angel_container/AUTHORS.md
@@ -1,2 +1,12 @@
-Tobe O <thosakwe@gmail.com>
-Thomas Hii <thomashii@dukefirehawk.com>
\ No newline at end of file
+Primary Authors
+===============
+
+* __[Thomas Hii](dukefirehawk.apps@gmail.com)__
+
+    Thomas is the current maintainer of the code base. He has refactored and migrated the 
+    code base to support NNBD.
+
+* __[Tobe O](thosakwe@gmail.com)__
+
+    Tobe has written much of the original code prior to NNBD migration. He has moved on and
+    is no longer involved with the project.
diff --git a/packages/container/angel_container/LICENSE b/packages/container/angel_container/LICENSE
index f8e6088a..b593ac86 100644
--- a/packages/container/angel_container/LICENSE
+++ b/packages/container/angel_container/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 The Angel Framework
+Copyright (c) 2021 dukefirehawk.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/container/angel_container/README.md b/packages/container/angel_container/README.md
index 11f96719..c06ab7f4 100644
--- a/packages/container/angel_container/README.md
+++ b/packages/container/angel_container/README.md
@@ -1,2 +1,11 @@
-# container
+# angel3_container
+[![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_container)
+[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
+
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/container/angel_container)
+
 A better IoC container for Angel, ultimately allowing Angel to be used without dart:mirrors.
+
+```dart
+import 'package:angel3_container/angel3_container.dart';
+```
\ No newline at end of file
diff --git a/packages/container/angel_container/example/main.dart b/packages/container/angel_container/example/main.dart
index 4dd22142..6676d35e 100644
--- a/packages/container/angel_container/example/main.dart
+++ b/packages/container/angel_container/example/main.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_container/mirrors.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_container/mirrors.dart';
 
 Future<void> main() async {
   // Create a container instance.
diff --git a/packages/container/angel_container/example/throwing.dart b/packages/container/angel_container/example/throwing.dart
index f6032417..836bc78c 100644
--- a/packages/container/angel_container/example/throwing.dart
+++ b/packages/container/angel_container/example/throwing.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 
 void main() {
   var reflector = const ThrowingReflector();
diff --git a/packages/container/angel_container/lib/angel_container.dart b/packages/container/angel_container/lib/angel3_container.dart
similarity index 87%
rename from packages/container/angel_container/lib/angel_container.dart
rename to packages/container/angel_container/lib/angel3_container.dart
index e47500f6..18bce0fe 100644
--- a/packages/container/angel_container/lib/angel_container.dart
+++ b/packages/container/angel_container/lib/angel3_container.dart
@@ -1,4 +1,4 @@
-library angel_container;
+library angel3_container;
 
 export 'src/container.dart';
 export 'src/empty/empty.dart';
diff --git a/packages/container/angel_container/lib/src/empty/empty.dart b/packages/container/angel_container/lib/src/empty/empty.dart
index de78c2e1..0cb08cd7 100644
--- a/packages/container/angel_container/lib/src/empty/empty.dart
+++ b/packages/container/angel_container/lib/src/empty/empty.dart
@@ -1,4 +1,4 @@
-import '../../angel_container.dart';
+import '../../angel3_container.dart';
 
 final Map<Symbol, String?> _symbolNames = <Symbol, String?>{};
 
diff --git a/packages/container/angel_container/pubspec.yaml b/packages/container/angel_container/pubspec.yaml
index 9f743c1d..41f24e79 100644
--- a/packages/container/angel_container/pubspec.yaml
+++ b/packages/container/angel_container/pubspec.yaml
@@ -1,12 +1,12 @@
-name: angel_container
+name: angel3_container
 version: 3.0.0
 description: A hierarchical DI container, and pluggable backends for reflection.
-homepage: https://github.com/dukefirehawk/angel
+homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/container/angel_container
 environment:
   sdk: '>=2.12.0 <3.0.0'
 dependencies:
   collection: ^1.15.0
-  quiver: ^3.0.0
+  quiver: ^3.0.1
 dev_dependencies:
   pedantic: ^1.11.0
-  test: ^1.16.8
\ No newline at end of file
+  test: ^1.17.4
\ No newline at end of file
diff --git a/packages/container/angel_container/test/common.dart b/packages/container/angel_container/test/common.dart
index c070a594..0afa75f5 100644
--- a/packages/container/angel_container/test/common.dart
+++ b/packages/container/angel_container/test/common.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:test/test.dart';
 
 void returnVoidFromAFunction(int x) {}
diff --git a/packages/container/angel_container/test/empty_reflector_test.dart b/packages/container/angel_container/test/empty_reflector_test.dart
index 593ef0f4..6ada3d63 100644
--- a/packages/container/angel_container/test/empty_reflector_test.dart
+++ b/packages/container/angel_container/test/empty_reflector_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/container/angel_container/test/has_test.dart b/packages/container/angel_container/test/has_test.dart
index 762e56a0..c0d726a9 100644
--- a/packages/container/angel_container/test/has_test.dart
+++ b/packages/container/angel_container/test/has_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/container/angel_container/test/lazy_test.dart b/packages/container/angel_container/test/lazy_test.dart
index c5260702..56631343 100644
--- a/packages/container/angel_container/test/lazy_test.dart
+++ b/packages/container/angel_container/test/lazy_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/container/angel_container/test/mirrors_test.dart b/packages/container/angel_container/test/mirrors_test.dart
index e5f29b9c..86a5fd8e 100644
--- a/packages/container/angel_container/test/mirrors_test.dart
+++ b/packages/container/angel_container/test/mirrors_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_container/mirrors.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_container/mirrors.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 
diff --git a/packages/container/angel_container/test/named_test.dart b/packages/container/angel_container/test/named_test.dart
index d6d46711..a80d388b 100644
--- a/packages/container/angel_container/test/named_test.dart
+++ b/packages/container/angel_container/test/named_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/container/angel_container/test/throwing_reflector_test.dart b/packages/container/angel_container/test/throwing_reflector_test.dart
index 3125f709..e41e0814 100644
--- a/packages/container/angel_container/test/throwing_reflector_test.dart
+++ b/packages/container/angel_container/test/throwing_reflector_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:test/test.dart';
 
 void main() {