diff --git a/packages/orm/angel_orm_test/lib/src/models/book.g.dart b/packages/orm/angel_orm_test/lib/src/models/book.g.dart
index 94996bf8..b27b3b0d 100644
--- a/packages/orm/angel_orm_test/lib/src/models/book.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/book.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel_orm3.generator.models.book;
+part of 'book.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/car.g.dart b/packages/orm/angel_orm_test/lib/src/models/car.g.dart
index 14c19c2b..f73ab211 100644
--- a/packages/orm/angel_orm_test/lib/src/models/car.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/car.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel_orm3.generator.models.car;
+part of 'car.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/leg.g.dart b/packages/orm/angel_orm_test/lib/src/models/leg.g.dart
index 183c9523..60b84dbd 100644
--- a/packages/orm/angel_orm_test/lib/src/models/leg.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/leg.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel3_orm_generator.test.models.leg;
+part of 'leg.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/order.g.dart b/packages/orm/angel_orm_test/lib/src/models/order.g.dart
index aaa7fdce..9aa92be3 100644
--- a/packages/orm/angel_orm_test/lib/src/models/order.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/order.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel3_orm_generator.test.models.order;
+part of 'order.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/person.g.dart b/packages/orm/angel_orm_test/lib/src/models/person.g.dart
index 2da16de2..c68ad130 100644
--- a/packages/orm/angel_orm_test/lib/src/models/person.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/person.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel_orm3.generator.models.person;
+part of 'person.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart b/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart
index c04a25d6..b07ea5f8 100644
--- a/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel3_orm_generator.test.models.person_order;
+part of 'person_order.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/quotation.g.dart b/packages/orm/angel_orm_test/lib/src/models/quotation.g.dart
index 6a1c9346..c35ff888 100644
--- a/packages/orm/angel_orm_test/lib/src/models/quotation.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/quotation.g.dart
@@ -173,7 +173,7 @@ class QuotationQueryValues extends MapQueryValues {
 // **************************************************************************
 
 @generatedSerializable
-class Quotation extends _Quotation {
+class Quotation implements _Quotation {
   Quotation({
     this.id,
     this.name,
diff --git a/packages/orm/angel_orm_test/lib/src/models/tree.g.dart b/packages/orm/angel_orm_test/lib/src/models/tree.g.dart
index ac97a8ae..c8db339e 100644
--- a/packages/orm/angel_orm_test/lib/src/models/tree.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/tree.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel3_orm_generator.test.models.tree;
+part of 'tree.dart';
 
 // **************************************************************************
 // MigrationGenerator
diff --git a/packages/orm/angel_orm_test/lib/src/models/user.g.dart b/packages/orm/angel_orm_test/lib/src/models/user.g.dart
index b6bff054..19143cdc 100644
--- a/packages/orm/angel_orm_test/lib/src/models/user.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/user.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of angel3_orm_generator.test.models.user;
+part of 'user.dart';
 
 // **************************************************************************
 // MigrationGenerator