diff --git a/LICENSE b/LICENSE
index 52a1469a..ee2937dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 angel-dart
+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/README.md b/README.md
index 5215561a..27836726 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 [![The Angel Framework](https://angel-dart.github.io/assets/images/logo.png)](https://angel-dart.dev)
 
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/angel_dart/discussion)
-[![Pub](https://img.shields.io/pub/v/angel_framework.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![Pub](https://img.shields.io/pub/v/angel_framework.svg)](https://pub.dartlang.org/packages/angel3_framework)
 [![Build status](https://travis-ci.org/angel-dart/framework.svg?branch=master)](https://travis-ci.org/angel-dart/framework)
 ![License](https://img.shields.io/github/license/angel-dart/framework.svg)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/LICENSE)
+
 
 **A polished, production-ready backend framework in Dart.**
 
diff --git a/packages/code_buffer/README.md b/packages/code_buffer/README.md
index 440a675c..c82e6453 100644
--- a/packages/code_buffer/README.md
+++ b/packages/code_buffer/README.md
@@ -2,7 +2,7 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_code_buffer)
 [![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/code_buffer)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/code_buffer/LICENSE)
 
 An advanced StringBuffer geared toward generating code, and source maps.
 
diff --git a/packages/combinator/README.md b/packages/combinator/README.md
index cc4fc58c..045d84ab 100644
--- a/packages/combinator/README.md
+++ b/packages/combinator/README.md
@@ -2,7 +2,7 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_combinator)
 [![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/combinator)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/combinator/LICENSE)
 
 Packrat parser combinators that support static typing, generics, file spans, memoization, and more.
 
diff --git a/packages/container/angel_container/README.md b/packages/container/angel_container/README.md
index c06ab7f4..80a5362e 100644
--- a/packages/container/angel_container/README.md
+++ b/packages/container/angel_container/README.md
@@ -2,7 +2,7 @@
 [![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)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/container/angel_container/LICENSE)
 
 A better IoC container for Angel, ultimately allowing Angel to be used without dart:mirrors.
 
diff --git a/packages/framework/README.md b/packages/framework/README.md
index 7aecfc36..4d6fcc0f 100644
--- a/packages/framework/README.md
+++ b/packages/framework/README.md
@@ -1,16 +1,17 @@
-# angel_framework
+# angel3_framework
+[![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_framework)
+[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
 
-[![Pub](https://img.shields.io/pub/v/angel_framework.svg)](https://pub.dartlang.org/packages/angel_framework)
-[![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/framework/LICENSE)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
 
-This is the core of the [Angel](https://github.com/angel-dart/angel) framework.
+This is the core of the [Angel](https://github.com/dukefirehawk/angel/tree/angel3) framework.
 To build real-world applications, please see the [homepage](https://angel-dart.dev).
 
 ```dart
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 
 main() async {
     var app = Angel(reflector: MirrorsReflector());
diff --git a/packages/framework/example/controller.dart b/packages/framework/example/controller.dart
index 872f8051..d4de54d6 100644
--- a/packages/framework/example/controller.dart
+++ b/packages/framework/example/controller.dart
@@ -1,9 +1,9 @@
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   // Logging set up/boilerplate
   Logger.root.onRecord.listen(print);
 
diff --git a/packages/framework/example/handle_error.dart b/packages/framework/example/handle_error.dart
index 8e32af63..89da3fbc 100644
--- a/packages/framework/example/handle_error.dart
+++ b/packages/framework/example/handle_error.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   var app = Angel(reflector: MirrorsReflector())
     ..logger = (Logger('angel')
       ..onRecord.listen((rec) {
diff --git a/packages/framework/example/hostname.dart b/packages/framework/example/hostname.dart
index 54271951..9f0a9a47 100644
--- a/packages/framework/example/hostname.dart
+++ b/packages/framework/example/hostname.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:logging/logging.dart';
 
 Future<void> apiConfigurer(Angel app) async {
@@ -14,7 +14,7 @@ Future<void> frontendConfigurer(Angel app) async {
   app.fallback((req, res) => '(usually an index page would be shown here.)');
 }
 
-main() async {
+void main() async {
   // Logging set up/boilerplate
   hierarchicalLoggingEnabled = true;
   //Logger.root.onRecord.listen(prettyLog);
diff --git a/packages/framework/example/http2/body_parsing.dart b/packages/framework/example/http2/body_parsing.dart
index 72718d5c..92bb9a25 100644
--- a/packages/framework/example/http2/body_parsing.dart
+++ b/packages/framework/example/http2/body_parsing.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:angel_framework/http2.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_framework/http2.dart';
 import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   var app = Angel();
   app.logger = Logger('angel')
     ..onRecord.listen((rec) {
diff --git a/packages/framework/example/http2/main.dart b/packages/framework/example/http2/main.dart
index 11ed2f63..d0a93e36 100644
--- a/packages/framework/example/http2/main.dart
+++ b/packages/framework/example/http2/main.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:angel_framework/http2.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_framework/http2.dart';
 import 'package:logging/logging.dart';
 import 'common.dart';
 
-main() async {
+void main() async {
   var app = Angel()
     ..encoders.addAll({
       'gzip': gzip.encoder,
diff --git a/packages/framework/example/http2/server_push.dart b/packages/framework/example/http2/server_push.dart
index 9dcd1a66..e73c862d 100644
--- a/packages/framework/example/http2/server_push.dart
+++ b/packages/framework/example/http2/server_push.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:angel_framework/http2.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_framework/http2.dart';
 import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   var app = Angel();
   app.logger = Logger('angel')
     ..onRecord.listen((rec) {
diff --git a/packages/framework/example/json.dart b/packages/framework/example/json.dart
index 5d499523..4a820273 100644
--- a/packages/framework/example/json.dart
+++ b/packages/framework/example/json.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 
-main() async {
+void main() async {
   int x = 0;
   var c = Completer();
   var exit = ReceivePort();
diff --git a/packages/framework/example/main.dart b/packages/framework/example/main.dart
index 502687af..a2a382ef 100644
--- a/packages/framework/example/main.dart
+++ b/packages/framework/example/main.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   // Logging set up/boilerplate
   //Logger.root.onRecord.listen(prettyLog);
 
diff --git a/packages/framework/example/map_service.dart b/packages/framework/example/map_service.dart
index 4650dd09..60ea66c8 100644
--- a/packages/framework/example/map_service.dart
+++ b/packages/framework/example/map_service.dart
@@ -1,9 +1,9 @@
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   // Logging set up/boilerplate
   Logger.root.onRecord.listen(print);
 
diff --git a/packages/framework/example/status.dart b/packages/framework/example/status.dart
index a434dd90..70fe35c0 100644
--- a/packages/framework/example/status.dart
+++ b/packages/framework/example/status.dart
@@ -1,7 +1,7 @@
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 
-main() async {
+void main() async {
   var app = Angel();
   var http = AngelHttp(app);
 
diff --git a/packages/framework/example/view.dart b/packages/framework/example/view.dart
index 809a6cf6..8502c4b6 100644
--- a/packages/framework/example/view.dart
+++ b/packages/framework/example/view.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 
-main() async {
+void main() async {
   var app = Angel(reflector: MirrorsReflector());
 
   app.viewGenerator = (name, [data]) async =>
diff --git a/packages/framework/lib/angel3_framework.dart b/packages/framework/lib/angel3_framework.dart
new file mode 100644
index 00000000..529046cb
--- /dev/null
+++ b/packages/framework/lib/angel3_framework.dart
@@ -0,0 +1,7 @@
+/// An easily-extensible web server framework in Dart.
+library angel3_framework;
+
+export 'package:angel3_http_exception/angel3_http_exception.dart';
+export 'package:angel3_model/angel3_model.dart';
+export 'package:angel3_route/angel3_route.dart';
+export 'src/core/core.dart';
diff --git a/packages/framework/lib/angel_framework.dart b/packages/framework/lib/angel_framework.dart
deleted file mode 100644
index 60a495e6..00000000
--- a/packages/framework/lib/angel_framework.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-/// An easily-extensible web server framework in Dart.
-library angel_framework;
-
-export 'package:angel_http_exception/angel_http_exception.dart';
-export 'package:angel_model/angel_model.dart';
-export 'package:angel_route/angel_route.dart';
-export 'src/core/core.dart';
diff --git a/packages/framework/lib/src/core/controller.dart b/packages/framework/lib/src/core/controller.dart
index e129e5a9..b35033ab 100644
--- a/packages/framework/lib/src/core/controller.dart
+++ b/packages/framework/lib/src/core/controller.dart
@@ -1,8 +1,8 @@
 library angel_framework.http.controller;
 
 import 'dart:async';
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_route/angel_route.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_route/angel3_route.dart';
 import 'package:meta/meta.dart';
 import 'package:recase/recase.dart';
 import '../core/core.dart';
diff --git a/packages/framework/lib/src/core/driver.dart b/packages/framework/lib/src/core/driver.dart
index efa2e958..2ebd6836 100644
--- a/packages/framework/lib/src/core/driver.dart
+++ b/packages/framework/lib/src/core/driver.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io' show stderr, Cookie;
-import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:angel_route/angel_route.dart';
-import 'package:combinator/combinator.dart';
+import 'package:angel3_http_exception/angel3_http_exception.dart';
+import 'package:angel3_route/angel3_route.dart';
+import 'package:angel3_combinator/angel3_combinator.dart';
 import 'package:logging/logging.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:tuple/tuple.dart';
diff --git a/packages/framework/lib/src/core/hostname_router.dart b/packages/framework/lib/src/core/hostname_router.dart
index 16b28290..09c4615e 100644
--- a/packages/framework/lib/src/core/hostname_router.dart
+++ b/packages/framework/lib/src/core/hostname_router.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_route/angel_route.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_route/angel3_route.dart';
 import 'package:logging/logging.dart';
 import 'env.dart';
 import 'hostname_parser.dart';
diff --git a/packages/framework/lib/src/core/map_service.dart b/packages/framework/lib/src/core/map_service.dart
index 79303306..36994079 100644
--- a/packages/framework/lib/src/core/map_service.dart
+++ b/packages/framework/lib/src/core/map_service.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:angel_http_exception/angel_http_exception.dart';
+import 'package:angel3_http_exception/angel3_http_exception.dart';
 
 import 'service.dart';
 
diff --git a/packages/framework/lib/src/core/metadata.dart b/packages/framework/lib/src/core/metadata.dart
index 5df2de39..f2ee7b04 100644
--- a/packages/framework/lib/src/core/metadata.dart
+++ b/packages/framework/lib/src/core/metadata.dart
@@ -1,6 +1,6 @@
 library angel_framework.http.metadata;
 
-import 'package:angel_http_exception/angel_http_exception.dart';
+import 'package:angel3_http_exception/angel3_http_exception.dart';
 
 import 'hooked_service.dart' show HookedServiceEventListener;
 import 'request_context.dart';
diff --git a/packages/framework/lib/src/core/request_context.dart b/packages/framework/lib/src/core/request_context.dart
index 6ad8dc67..07c8831c 100644
--- a/packages/framework/lib/src/core/request_context.dart
+++ b/packages/framework/lib/src/core/request_context.dart
@@ -11,7 +11,7 @@ import 'dart:io'
         HttpSession,
         InternetAddress;
 
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:http_server/http_server.dart';
 import 'package:meta/meta.dart';
diff --git a/packages/framework/lib/src/core/response_context.dart b/packages/framework/lib/src/core/response_context.dart
index c993def9..8c504d28 100644
--- a/packages/framework/lib/src/core/response_context.dart
+++ b/packages/framework/lib/src/core/response_context.dart
@@ -6,7 +6,7 @@ import 'dart:convert' as c show json;
 import 'dart:io' show BytesBuilder, Cookie;
 import 'dart:typed_data';
 
-import 'package:angel_route/angel_route.dart';
+import 'package:angel3_route/angel3_route.dart';
 import 'package:file/file.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
diff --git a/packages/framework/lib/src/core/routable.dart b/packages/framework/lib/src/core/routable.dart
index a0f93e65..e7e88f71 100644
--- a/packages/framework/lib/src/core/routable.dart
+++ b/packages/framework/lib/src/core/routable.dart
@@ -2,8 +2,8 @@ library angel_framework.http.routable;
 
 import 'dart:async';
 
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_route/angel_route.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_route/angel3_route.dart';
 
 import '../util.dart';
 import 'hooked_service.dart';
diff --git a/packages/framework/lib/src/core/server.dart b/packages/framework/lib/src/core/server.dart
index ac328cc4..e8ce4bbc 100644
--- a/packages/framework/lib/src/core/server.dart
+++ b/packages/framework/lib/src/core/server.dart
@@ -3,10 +3,10 @@ library angel_framework.http.server;
 import 'dart:async';
 import 'dart:collection' show HashMap;
 import 'dart:convert';
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:angel_route/angel_route.dart';
-import 'package:combinator/combinator.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_http_exception/angel3_http_exception.dart';
+import 'package:angel3_route/angel3_route.dart';
+import 'package:angel3_combinator/angel3_combinator.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
 import 'package:mime/mime.dart';
diff --git a/packages/framework/lib/src/core/service.dart b/packages/framework/lib/src/core/service.dart
index 0c72ccef..b38a336a 100644
--- a/packages/framework/lib/src/core/service.dart
+++ b/packages/framework/lib/src/core/service.dart
@@ -1,8 +1,8 @@
 library angel_framework.http.service;
 
 import 'dart:async';
-import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:merge_map/merge_map.dart';
+import 'package:angel3_http_exception/angel3_http_exception.dart';
+import 'package:angel3_merge_map/angel3_merge_map.dart';
 import 'package:quiver/core.dart';
 import '../util.dart';
 import 'anonymous_service.dart';
diff --git a/packages/framework/lib/src/http/angel_http.dart b/packages/framework/lib/src/http/angel_http.dart
index 8e59e6ba..3561aa30 100644
--- a/packages/framework/lib/src/http/angel_http.dart
+++ b/packages/framework/lib/src/http/angel_http.dart
@@ -8,7 +8,7 @@ import 'dart:io'
         HttpServer,
         Platform,
         SecurityContext;
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import '../core/core.dart';
 import 'http_request_context.dart';
 import 'http_response_context.dart';
diff --git a/packages/framework/lib/src/http/http_request_context.dart b/packages/framework/lib/src/http/http_request_context.dart
index 6ee7a8da..20bf47d1 100644
--- a/packages/framework/lib/src/http/http_request_context.dart
+++ b/packages/framework/lib/src/http/http_request_context.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 import 'package:http_parser/http_parser.dart';
 
 import '../core/core.dart';
diff --git a/packages/framework/lib/src/http2/angel_http2.dart b/packages/framework/lib/src/http2/angel_http2.dart
index f8965b6a..6bf15b66 100644
--- a/packages/framework/lib/src/http2/angel_http2.dart
+++ b/packages/framework/lib/src/http2/angel_http2.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart' hide Header;
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart' hide Header;
+import 'package:angel3_framework/http.dart';
 import 'package:http2/transport.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'http2_request_context.dart';
 import 'http2_response_context.dart';
 import 'package:uuid/uuid.dart';
diff --git a/packages/framework/lib/src/http2/http2_request_context.dart b/packages/framework/lib/src/http2/http2_request_context.dart
index 6aab4771..18bb1a59 100644
--- a/packages/framework/lib/src/http2/http2_request_context.dart
+++ b/packages/framework/lib/src/http2/http2_request_context.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_container/src/container.dart';
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_container/src/container.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:http2/transport.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:uuid/uuid.dart';
 
 final RegExp _comma = RegExp(r',\s*');
diff --git a/packages/framework/lib/src/http2/http2_response_context.dart b/packages/framework/lib/src/http2/http2_response_context.dart
index 45d755ec..ecc18dde 100644
--- a/packages/framework/lib/src/http2/http2_response_context.dart
+++ b/packages/framework/lib/src/http2/http2_response_context.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart' hide Header;
+import 'package:angel3_framework/angel3_framework.dart' hide Header;
 import 'package:http2/transport.dart';
 import 'http2_request_context.dart';
 
diff --git a/packages/framework/lib/src/util.dart b/packages/framework/lib/src/util.dart
index 99ba9db5..17e68d63 100644
--- a/packages/framework/lib/src/util.dart
+++ b/packages/framework/lib/src/util.dart
@@ -1,4 +1,4 @@
-import 'package:angel_container/angel_container.dart';
+import 'package:angel3_container/angel3_container.dart';
 
 final RegExp straySlashes = RegExp(r'(^/+)|(/+$)');
 
diff --git a/packages/framework/performance/hello/main.dart b/packages/framework/performance/hello/main.dart
index 52358e9a..8f8e559f 100644
--- a/packages/framework/performance/hello/main.dart
+++ b/packages/framework/performance/hello/main.dart
@@ -1,10 +1,10 @@
 /// A basic server that prints "Hello, world!"
 library performance.hello;
 
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 
-main() async {
+void main() async {
   var app = Angel();
   var http = AngelHttp.custom(app, startShared, useZone: false);
 
diff --git a/packages/framework/pubspec.yaml b/packages/framework/pubspec.yaml
index 89d7aa87..edf10d09 100644
--- a/packages/framework/pubspec.yaml
+++ b/packages/framework/pubspec.yaml
@@ -1,59 +1,28 @@
-name: angel_framework
+name: angel3_framework
 version: 4.0.0
 description: A high-powered HTTP server with dependency injection, routing and much more.
-homepage: https://github.com/dukefirehawk/angel
-publish_to: none
+homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/framework
 environment:
   sdk: '>=2.12.0 <3.0.0'
 dependencies:
-  angel_container:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/container/angel_container
-  angel_http_exception:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/http_exception
-  angel_model:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/model
-  angel_route:
-#    path: ../route
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/route
+  angel3_container: ^3.0.0
+  angel3_http_exception: ^3.0.0
+  angel3_model: ^3.0.0
+  angel3_route: ^5.0.0
+  angel3_combinator: ^2.0.0
+  angel3_merge_map: ^2.0.0
+  angel3_mock_request: ^2.0.0
   charcode: ^1.2.0
-  combinator:
-#    path: ../combinator
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/combinator
   file: ^6.1.0
   http_parser: ^4.0.0
   http_server: ^1.0.0
   http2: ^2.0.0
   logging: ^1.0.0
   matcher: ^0.12.10
-  merge_map:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/merge_map
   meta: ^1.3.0
   mime: ^1.0.0
-  mock_request:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x_nnbd
-      path: packages/mock_request
   path: ^1.8.0
-  quiver: ^3.0.0
+  quiver: ^3.0.1
   recase: ^4.0.0
   stack_trace: ^1.10.0
   string_scanner: ^1.1.0
@@ -63,5 +32,5 @@ dependencies:
 dev_dependencies:
   http: ^0.13.1
   io: ^1.0.0
-  test: ^1.17.3
+  test: ^1.17.4
 
diff --git a/packages/framework/test/404_hole_test.dart b/packages/framework/test/404_hole_test.dart
index fe61e456..cb7c7630 100644
--- a/packages/framework/test/404_hole_test.dart
+++ b/packages/framework/test/404_hole_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:charcode/ascii.dart';
 import 'package:http/io_client.dart' as http;
 import 'package:logging/logging.dart';
diff --git a/packages/framework/test/accepts_test.dart b/packages/framework/test/accepts_test.dart
index 37dd5554..122a3306 100644
--- a/packages/framework/test/accepts_test.dart
+++ b/packages/framework/test/accepts_test.dart
@@ -1,14 +1,14 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 final Uri ENDPOINT = Uri.parse('http://example.com/accept');
 
-main() {
+void main() {
   test('no content type', () async {
     var req = await acceptContentTypes();
     expect(req.acceptsAll, isFalse);
diff --git a/packages/framework/test/all.dart b/packages/framework/test/all.dart
index 5f517bbb..feb13b10 100644
--- a/packages/framework/test/all.dart
+++ b/packages/framework/test/all.dart
@@ -30,7 +30,7 @@ import 'view_generator_test.dart' as view_generator;
 import 'package:test/test.dart';
 
 /// For running with coverage
-main() {
+void main() {
   print(cyan.wrap('Running tests on ${Platform.version}'));
   group('404_hole', hole404.main);
   group('accepts', accepts.main);
diff --git a/packages/framework/test/anonymous_service_test.dart b/packages/framework/test/anonymous_service_test.dart
index 033de0a4..2deb3541 100644
--- a/packages/framework/test/anonymous_service_test.dart
+++ b/packages/framework/test/anonymous_service_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:test/test.dart';
 
 main() {
diff --git a/packages/framework/test/body_test.dart b/packages/framework/test/body_test.dart
index e316a4c5..40241baa 100644
--- a/packages/framework/test/body_test.dart
+++ b/packages/framework/test/body_test.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/framework/test/common.dart b/packages/framework/test/common.dart
index bc394426..b0de66b4 100644
--- a/packages/framework/test/common.dart
+++ b/packages/framework/test/common.dart
@@ -1,6 +1,6 @@
 library angel_framework.test.common;
 
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:matcher/matcher.dart';
 
 class Todo extends Model {
diff --git a/packages/framework/test/controller_test.dart b/packages/framework/test/controller_test.dart
index 23402a7b..ae4383de 100644
--- a/packages/framework/test/controller_test.dart
+++ b/packages/framework/test/controller_test.dart
@@ -2,11 +2,11 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:http/http.dart' as http;
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 import 'common.dart';
diff --git a/packages/framework/test/detach_test.dart b/packages/framework/test/detach_test.dart
index cddde978..8b869f76 100644
--- a/packages/framework/test/detach_test.dart
+++ b/packages/framework/test/detach_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/framework/test/di_test.dart b/packages/framework/test/di_test.dart
index c8c12e44..ec6123a5 100644
--- a/packages/framework/test/di_test.dart
+++ b/packages/framework/test/di_test.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_container/angel_container.dart';
-import 'package:angel_framework/http.dart';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_container/angel3_container.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:http/http.dart' as http;
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 import 'common.dart';
@@ -14,7 +14,7 @@ import 'common.dart';
 final String TEXT = "make your bed";
 final String OVER = "never";
 
-main() {
+void main() {
   late Angel app;
   late http.Client client;
   late HttpServer server;
diff --git a/packages/framework/test/encoders_buffer_test.dart b/packages/framework/test/encoders_buffer_test.dart
index 7f83e38a..407b7771 100644
--- a/packages/framework/test/encoders_buffer_test.dart
+++ b/packages/framework/test/encoders_buffer_test.dart
@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'dart:io' show BytesBuilder;
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 Future<List<int>> getBody(MockHttpResponse rs) async {
@@ -16,7 +16,7 @@ Future<List<int>> getBody(MockHttpResponse rs) async {
   return bb.takeBytes();
 }
 
-main() {
+void main() {
   late Angel app;
 
   setUp(() {
diff --git a/packages/framework/test/env_test.dart b/packages/framework/test/env_test.dart
index c528e1c9..c03ad797 100644
--- a/packages/framework/test/env_test.dart
+++ b/packages/framework/test/env_test.dart
@@ -1,5 +1,5 @@
 import 'dart:io';
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/framework/test/exception_test.dart b/packages/framework/test/exception_test.dart
index ec08b3ef..27340023 100644
--- a/packages/framework/test/exception_test.dart
+++ b/packages/framework/test/exception_test.dart
@@ -1,9 +1,9 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'dart:convert';
 import 'package:matcher/matcher.dart';
 import 'package:test/test.dart';
 
-main() {
+void main() {
   test('named constructors', () {
     expect(
         AngelHttpException.badRequest(), isException(400, '400 Bad Request'));
diff --git a/packages/framework/test/extension_test.dart b/packages/framework/test/extension_test.dart
index e061dc4e..a67dd113 100644
--- a/packages/framework/test/extension_test.dart
+++ b/packages/framework/test/extension_test.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 final Uri ENDPOINT = Uri.parse('http://example.com');
 
-main() {
+void main() {
   test('single extension', () async {
     var req = await makeRequest('foo.js');
     expect(req.extension, '.js');
diff --git a/packages/framework/test/find_one_test.dart b/packages/framework/test/find_one_test.dart
index 2e23d421..4bdb3bcd 100644
--- a/packages/framework/test/find_one_test.dart
+++ b/packages/framework/test/find_one_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 
diff --git a/packages/framework/test/general_test.dart b/packages/framework/test/general_test.dart
index b21c02c7..27e0262c 100644
--- a/packages/framework/test/general_test.dart
+++ b/packages/framework/test/general_test.dart
@@ -1,12 +1,12 @@
 import 'dart:io';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
-main() {
+void main() {
   late Angel app;
   late http.Client client;
   late HttpServer server;
diff --git a/packages/framework/test/hm.dart b/packages/framework/test/hm.dart
index a7c08db5..24802979 100644
--- a/packages/framework/test/hm.dart
+++ b/packages/framework/test/hm.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'package:io/ansi.dart';
 import 'all.dart' as hm;
 
-main() async {
+void main() async {
   var zone = Zone.current.fork(
     specification: ZoneSpecification(print: (self, parent, zone, line) {
       if (line == 'null') {
diff --git a/packages/framework/test/hooked_test.dart b/packages/framework/test/hooked_test.dart
index 635fb9cc..c4fda73a 100644
--- a/packages/framework/test/hooked_test.dart
+++ b/packages/framework/test/hooked_test.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 import 'common.dart';
 
-main() {
+void main() {
   Map headers = <String, String>{
     'Accept': 'application/json',
     'Content-Type': 'application/json'
diff --git a/packages/framework/test/http2/adapter_test.dart b/packages/framework/test/http2/adapter_test.dart
index d0436ff8..a212fbb4 100644
--- a/packages/framework/test/http2/adapter_test.dart
+++ b/packages/framework/test/http2/adapter_test.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart' hide Header;
-import 'package:angel_framework/http2.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart' hide Header;
+import 'package:angel3_framework/http2.dart';
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:http/src/multipart_file.dart' as http;
 import 'package:http/src/multipart_request.dart' as http;
diff --git a/packages/framework/test/jsonp_test.dart b/packages/framework/test/jsonp_test.dart
index 1517619c..a38b5a66 100644
--- a/packages/framework/test/jsonp_test.dart
+++ b/packages/framework/test/jsonp_test.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:http_parser/http_parser.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/framework/test/parameter_meta_test.dart b/packages/framework/test/parameter_meta_test.dart
index 162acb70..db87d606 100644
--- a/packages/framework/test/parameter_meta_test.dart
+++ b/packages/framework/test/parameter_meta_test.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 
 import 'package:test/test.dart';
 
diff --git a/packages/framework/test/parse_id_test.dart b/packages/framework/test/parse_id_test.dart
index 45582e8e..f44a01e1 100644
--- a/packages/framework/test/parse_id_test.dart
+++ b/packages/framework/test/parse_id_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/framework/test/precontained_test.dart b/packages/framework/test/precontained_test.dart
index 6c4abbe8..86664265 100644
--- a/packages/framework/test/precontained_test.dart
+++ b/packages/framework/test/precontained_test.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 
 import 'package:test/test.dart';
 
-main() {
+void main() {
   test('preinjects functions', () async {
     var app = Angel(reflector: MirrorsReflector())
       ..configuration['foo'] = 'bar'
diff --git a/packages/framework/test/primitives_test.dart b/packages/framework/test/primitives_test.dart
index 0e14bdc8..1b872920 100644
--- a/packages/framework/test/primitives_test.dart
+++ b/packages/framework/test/primitives_test.dart
@@ -1,14 +1,14 @@
 import 'dart:convert';
 import 'dart:io' show stderr;
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 
 import 'package:test/test.dart';
 
-main() {
+void main() {
   late Angel app;
   late AngelHttp http;
 
diff --git a/packages/framework/test/repeat_request_test.dart b/packages/framework/test/repeat_request_test.dart
index 5a60f80e..9d1e8fd9 100644
--- a/packages/framework/test/repeat_request_test.dart
+++ b/packages/framework/test/repeat_request_test.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 import 'package:test/test.dart';
 
-main() {
+void main() {
   MockHttpRequest mk(int id) {
     return MockHttpRequest('GET', Uri.parse('/test/$id'))..close();
   }
diff --git a/packages/framework/test/req_shutdown_test.dart b/packages/framework/test/req_shutdown_test.dart
index 9ea178ec..d4a00627 100644
--- a/packages/framework/test/req_shutdown_test.dart
+++ b/packages/framework/test/req_shutdown_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:http/io_client.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:test/test.dart';
diff --git a/packages/framework/test/routing_test.dart b/packages/framework/test/routing_test.dart
index 7db682d0..ff91cd7c 100644
--- a/packages/framework/test/routing_test.dart
+++ b/packages/framework/test/routing_test.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:io/ansi.dart';
 import 'package:logging/logging.dart';
diff --git a/packages/framework/test/serialize_test.dart b/packages/framework/test/serialize_test.dart
index d15ea31c..3f4dfca0 100644
--- a/packages/framework/test/serialize_test.dart
+++ b/packages/framework/test/serialize_test.dart
@@ -1,13 +1,13 @@
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:http_parser/http_parser.dart';
 import 'package:test/test.dart';
 
-main() {
+void main() {
   late Angel app;
   late http.Client client;
   late HttpServer server;
diff --git a/packages/framework/test/server_test.dart b/packages/framework/test/server_test.dart
index 2f4e5c5e..190a999f 100644
--- a/packages/framework/test/server_test.dart
+++ b/packages/framework/test/server_test.dart
@@ -2,18 +2,18 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:matcher/matcher.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 
 import 'package:test/test.dart';
 
 final Uri $foo = Uri.parse('http://localhost:3000/foo');
 
 /// Additional tests to improve coverage of server.dart
-main() {
+void main() {
   group('scoping', () {
     var parent = Angel(reflector: MirrorsReflector())..configuration['two'] = 2;
     var child = Angel(reflector: MirrorsReflector());
diff --git a/packages/framework/test/service_map_test.dart b/packages/framework/test/service_map_test.dart
index 4ca9d1c5..eaac4353 100644
--- a/packages/framework/test/service_map_test.dart
+++ b/packages/framework/test/service_map_test.dart
@@ -1,4 +1,4 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/framework/test/services_test.dart b/packages/framework/test/services_test.dart
index f3e97498..7f154abb 100644
--- a/packages/framework/test/services_test.dart
+++ b/packages/framework/test/services_test.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:stack_trace/stack_trace.dart';
@@ -13,7 +13,7 @@ class Todo extends Model {
   String? over;
 }
 
-main() {
+void main() {
   Map headers = <String, String>{
     'Accept': 'application/json',
     'Content-Type': 'application/json'
diff --git a/packages/framework/test/streaming_test.dart b/packages/framework/test/streaming_test.dart
index 0face158..84dae17f 100644
--- a/packages/framework/test/streaming_test.dart
+++ b/packages/framework/test/streaming_test.dart
@@ -3,11 +3,11 @@ import 'dart:convert';
 import 'dart:io' show stderr;
 import 'dart:io';
 
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/http.dart';
+import 'package:angel3_container/mirrors.dart';
+import 'package:angel3_framework/angel3_framework.dart';
+import 'package:angel3_framework/http.dart';
 import 'package:logging/logging.dart';
-import 'package:mock_request/mock_request.dart';
+import 'package:angel3_mock_request/angel3_mock_request.dart';
 
 import 'package:test/test.dart';
 
diff --git a/packages/framework/test/view_generator_test.dart b/packages/framework/test/view_generator_test.dart
index c25d2755..05fa9e0c 100644
--- a/packages/framework/test/view_generator_test.dart
+++ b/packages/framework/test/view_generator_test.dart
@@ -1,7 +1,7 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel3_framework/angel3_framework.dart';
 import 'package:test/test.dart';
 
-main() {
+void main() {
   test('default view generator', () async {
     var app = Angel();
     var view = await app.viewGenerator!('foo', {'bar': 'baz'});
diff --git a/packages/merge_map/README.md b/packages/merge_map/README.md
index ee3ff402..83e8798a 100644
--- a/packages/merge_map/README.md
+++ b/packages/merge_map/README.md
@@ -2,7 +2,7 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_merge_map)
 [![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/merge_map)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/merge_map/LICENSE)
 
 Combine multiple Maps into one. Equivalent to
 [Object.assign](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
diff --git a/packages/mock_request/README.md b/packages/mock_request/README.md
index d15cf1d8..f8e2caf3 100644
--- a/packages/mock_request/README.md
+++ b/packages/mock_request/README.md
@@ -2,14 +2,14 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_mock_request)
 [![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/mock_request)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/mock_request/LICENSE)
 
 Manufacture dart:io HttpRequests, HttpResponses, HttpHeaders, etc.
 This makes it possible to test server-side Dart applications without
 having to ever bind to a port.
 
 This package was originally designed to testing
-[Angel](https://github.com/dukefirehawk/angel)
+[Angel](https://github.com/dukefirehawk/angel/tree/angel3)
 applications smoother, but works with any Dart-based server. :)
 
 # Usage
diff --git a/packages/model/README.md b/packages/model/README.md
index 44bde2e5..b412e58f 100644
--- a/packages/model/README.md
+++ b/packages/model/README.md
@@ -2,7 +2,7 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_model)
 [![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/model)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/model/LICENSE)
 
 Angel's basic data model class, no longer with the added weight of the whole framework.
 
diff --git a/packages/pretty_logging/README.md b/packages/pretty_logging/README.md
index 6e4e1895..cd247312 100644
--- a/packages/pretty_logging/README.md
+++ b/packages/pretty_logging/README.md
@@ -2,7 +2,7 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_pretty_logging)
 [![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/pretty_logging)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/pretty_logging/LICENSE)
 
 Standalone helper for colorful logging output, using pkg:io AnsiCode.
 
diff --git a/packages/route/README.md b/packages/route/README.md
index c9364e08..933be61d 100644
--- a/packages/route/README.md
+++ b/packages/route/README.md
@@ -2,7 +2,7 @@
 [![version](https://img.shields.io/badge/pub-v2.12.4-brightgreen)](https://pub.dartlang.org/packages/angel3_route)
 [![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/route)
+[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/route/LICENSE)
 
 
 A powerful, isomorphic routing library for Dart.