diff --git a/README.md b/README.md
index 751f212..3e7ed2f 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,6 @@ This is an ORM starter application for [Angel3 framework](https://angel3-framewo
 
 2. Modify the code and watch the changes applied to the application
 
-
 3. Insert a message into DB:
 
     ```bash
diff --git a/bin/dev.dart b/bin/dev.dart
index d845458..1d695f2 100644
--- a/bin/dev.dart
+++ b/bin/dev.dart
@@ -11,7 +11,7 @@ void main() async {
   hierarchicalLoggingEnabled = true;
 
   var hot = HotReloader(() async {
-    var logger = Logger.detached('[Angel3]')
+    var logger = Logger.detached('Angel3')
       ..level = Level.ALL
       ..onRecord.listen(prettyLog);
     var app = Angel(logger: logger, reflector: MirrorsReflector());
diff --git a/bin/prod.dart b/bin/prod.dart
index cb647ce..4c861af 100644
--- a/bin/prod.dart
+++ b/bin/prod.dart
@@ -17,7 +17,7 @@ import 'package:angel3_production/angel3_production.dart';
 // so use it if possible.
 //
 // However, the following alternatives exist:
-// * Generation via `package:angel_container_generator`
+// * Generation via `package:angel3_container_generator`
 // * Creating an instance of `StaticReflector`
 // * Manually implementing the `Reflector` interface (cumbersome; not recommended)
 //
@@ -26,5 +26,4 @@ import 'package:angel3_production/angel3_production.dart';
 //
 // https://gitter.im/angel_dart/discussion
 void main(List<String> args) =>
-    Runner('[Angel3]', configureServer, reflector: MirrorsReflector())
-        .run(args);
+    Runner('Angel3', configureServer, reflector: MirrorsReflector()).run(args);
diff --git a/pubspec.yaml b/pubspec.yaml
index 8b55243..46c9338 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ version: 1.0.0
 description: An ORM starter application for Angel3 framework
 publish_to: none
 environment:
-  sdk: '>=2.15.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 dependencies:
   angel3_auth: ^6.0.0
   angel3_configuration: ^6.0.0
@@ -27,132 +27,5 @@ dev_dependencies:
   angel3_test: ^6.0.0
   build_runner: ^2.0.3
   io: ^1.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
-  angel3_container:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/container/angel_container
-  angel3_framework:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/framework
-  angel3_http_exception:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/http_exception
-  angel3_model:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/model
-  angel3_route:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/route
-  angel3_mock_request:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/mock_request
-  angel3_auth:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/auth
-  angel3_client:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/client
-  angel3_websocket:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/websocket
-  angel3_validate:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/validate
-  angel3_configuration:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/configuration
-  angel3_test:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/test
-  jael3:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/jael/jael
-  angel3_jael:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/jael/angel_jael
-  jael3_preprocessor:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/jael/jael_preprocessor
-  angel3_serialize:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/serialize/angel_serialize
-  angel3_serialize_generator:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/serialize/angel_serialize_generator
-  angel3_hot:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/hot
-  angel3_static:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/static
-  angel3_production:
-     path: ../belatuk/packages/production
-#    git: 
-#     url: https://github.com/dukefirehawk/angel.git
-#     ref: release/6.0.0
-#     path: packages/production
-  angel3_orm:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/orm/angel_orm
-  angel3_orm_generator:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/orm/angel_orm_generator
-  angel3_orm_postgres:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/orm/angel_orm_postgres
-  angel3_migration:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/orm/angel_migration
-  angel3_migration_runner:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: release/6.0.0
-      path: packages/orm/angel_migration_runner