diff --git a/database/factories/BookmarkFactory.php b/database/factories/BookmarkFactory.php
index db879299..f81cfe57 100644
--- a/database/factories/BookmarkFactory.php
+++ b/database/factories/BookmarkFactory.php
@@ -1,8 +1,9 @@
 <?php
 
+use App\Models\Bookmark;
 use Faker\Generator as Faker;
 
-$factory->define(App\Bookmark::class, function (Faker $faker) {
+$factory->define(Bookmark::class, function (Faker $faker) {
     return [
         'url' => $faker->url,
         'name' => $faker->sentence,
diff --git a/database/factories/LikeFactory.php b/database/factories/LikeFactory.php
index ad3e9551..8a3e6d9d 100644
--- a/database/factories/LikeFactory.php
+++ b/database/factories/LikeFactory.php
@@ -1,8 +1,9 @@
 <?php
 
+use App\Models\Like;
 use Faker\Generator as Faker;
 
-$factory->define(App\Like::class, function (Faker $faker) {
+$factory->define(Like::class, function (Faker $faker) {
     return [
         'url' => $faker->url,
         'author_name' => $faker->name,
diff --git a/database/factories/NoteFactory.php b/database/factories/NoteFactory.php
index 8fec01c7..aaf4a694 100644
--- a/database/factories/NoteFactory.php
+++ b/database/factories/NoteFactory.php
@@ -1,8 +1,9 @@
 <?php
 
+use App\Models\Note;
 use Faker\Generator as Faker;
 
-$factory->define(App\Note::class, function (Faker $faker) {
+$factory->define(Note::class, function (Faker $faker) {
     return [
         'note' => $faker->paragraph,
     ];
diff --git a/database/factories/TagFactory.php b/database/factories/TagFactory.php
index 7f60a05a..c41b78fa 100644
--- a/database/factories/TagFactory.php
+++ b/database/factories/TagFactory.php
@@ -1,8 +1,9 @@
 <?php
 
+use App\Models\Tag;
 use Faker\Generator as Faker;
 
-$factory->define(App\Tag::class, function (Faker $faker) {
+$factory->define(Tag::class, function (Faker $faker) {
     return [
         'tag' => $faker->word,
     ];
diff --git a/database/seeds/ArticlesTableSeeder.php b/database/seeds/ArticlesTableSeeder.php
index c951d128..01cebfd0 100644
--- a/database/seeds/ArticlesTableSeeder.php
+++ b/database/seeds/ArticlesTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Article;
+use App\Models\Article;
 use Illuminate\Database\Seeder;
 
 class ArticlesTableSeeder extends Seeder
diff --git a/database/seeds/BookmarksTableSeeder.php b/database/seeds/BookmarksTableSeeder.php
index 04910cfc..c8e129e0 100644
--- a/database/seeds/BookmarksTableSeeder.php
+++ b/database/seeds/BookmarksTableSeeder.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\{Bookmark, Tag};
 use Illuminate\Database\Seeder;
 
 class BookmarksTableSeeder extends Seeder
@@ -11,8 +12,8 @@ class BookmarksTableSeeder extends Seeder
      */
     public function run()
     {
-        factory(App\Bookmark::class, 10)->create()->each(function ($bookmark) {
-            $bookmark->tags()->save(factory(App\Tag::class)->make());
+        factory(Bookmark::class, 10)->create()->each(function ($bookmark) {
+            $bookmark->tags()->save(factory(Tag::class)->make());
         });
     }
 }
diff --git a/database/seeds/ContactsTableSeeder.php b/database/seeds/ContactsTableSeeder.php
index 1d7f3244..2708d912 100644
--- a/database/seeds/ContactsTableSeeder.php
+++ b/database/seeds/ContactsTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Contact;
+use App\Models\Contact;
 use Illuminate\Database\Seeder;
 
 class ContactsTableSeeder extends Seeder
diff --git a/database/seeds/LikesTableSeeder.php b/database/seeds/LikesTableSeeder.php
index fed15569..c8a14ea9 100644
--- a/database/seeds/LikesTableSeeder.php
+++ b/database/seeds/LikesTableSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Models\Like;
+use Faker\Generator;
 use Illuminate\Database\Seeder;
 
 class LikesTableSeeder extends Seeder
@@ -11,13 +13,13 @@ class LikesTableSeeder extends Seeder
      */
     public function run()
     {
-        factory(App\Like::class, 10)->create();
+        factory(Like::class, 10)->create();
 
-        $faker = new \Faker\Generator();
+        $faker = new Generator();
         $faker->addProvider(new \Faker\Provider\en_US\Person($faker));
         $faker->addProvider(new \Faker\Provider\Lorem($faker));
         $faker->addProvider(new \Faker\Provider\Internet($faker));
-        App\Like::create([
+        Like::create([
             'url' => $faker->url,
             'author_url' => $faker->url,
             'author_name' => $faker->name,
diff --git a/database/seeds/NotesTableSeeder.php b/database/seeds/NotesTableSeeder.php
index ba478935..8b9aeb7c 100644
--- a/database/seeds/NotesTableSeeder.php
+++ b/database/seeds/NotesTableSeeder.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Seeder;
+use App\Models\{Media, Note, Place};
 
 class NotesTableSeeder extends Seeder
 {
@@ -11,31 +12,31 @@ class NotesTableSeeder extends Seeder
      */
     public function run()
     {
-        factory(App\Note::class, 10)->create();
+        factory(Note::class, 10)->create();
         sleep(1);
-        $noteTwitterReply = App\Note::create([
+        $noteTwitterReply = Note::create([
             'note' => 'What does this even mean?',
             'in_reply_to' => 'https://twitter.com/realDonaldTrump/status/933662564587855877',
         ]);
         sleep(1);
-        $noteWithPlace = App\Note::create([
+        $noteWithPlace = Note::create([
             'note' => 'Having a #beer at the local. 🍺',
         ]);
         $noteWithPlace->tweet_id = '123456789';
-        $place = App\Place::find(1);
+        $place = Place::find(1);
         $noteWithPlace->place()->associate($place);
         $noteWithPlace->save();
         sleep(1);
-        $noteWithContact = App\Note::create([
+        $noteWithContact = Note::create([
             'note' => 'Hi @tantek'
         ]);
         sleep(1);
-        $noteWithContactPlusPic = App\Note::create([
+        $noteWithContactPlusPic = Note::create([
             'note' => 'Hi @aaron',
             'client_id' => 'https://jbl5.dev/notes/new'
         ]);
         sleep(1);
-        $noteWithoutContact = App\Note::create([
+        $noteWithoutContact = Note::create([
             'note' => 'Hi @bob',
             'client_id' => 'https://quill.p3k.io'
         ]);
@@ -46,31 +47,31 @@ class NotesTableSeeder extends Seeder
             mkdir(public_path() . '/assets/profile-images/aaronparecki.com', 0755);
             copy(base_path() . '/tests/aaron.png', public_path() . '/assets/profile-images/aaronparecki.com/image');
         }
-        $noteWithCoords = App\Note::create([
+        $noteWithCoords = Note::create([
             'note' => 'Note from a town',
         ]);
         $noteWithCoords->location = '53.499,-2.379';
         $noteWithCoords->save();
         sleep(1);
-        $noteWithCoords2 = App\Note::create([
+        $noteWithCoords2 = Note::create([
             'note' => 'Note from a city',
         ]);
         $noteWithCoords2->location = '53.9026894,-2.42250444118781';
         $noteWithCoords2->save();
         sleep(1);
-        $noteWithCoords3 = App\Note::create([
+        $noteWithCoords3 = Note::create([
             'note' => 'Note from a county',
         ]);
         $noteWithCoords3->location = '57.5066357,-5.0038367';
         $noteWithCoords3->save();
         sleep(1);
-        $noteWithCoords4 = App\Note::create([
+        $noteWithCoords4 = Note::create([
             'note' => 'Note from a country',
         ]);
         $noteWithCoords4->location = '63.000147,-136.002502';
         $noteWithCoords4->save();
         sleep(1);
-        $noteSyndicated = App\Note::create([
+        $noteSyndicated = Note::create([
             'note' => 'This note has all the syndication targets',
         ]);
         $noteSyndicated->tweet_id = '123456';
@@ -79,26 +80,26 @@ class NotesTableSeeder extends Seeder
         $noteSyndicated->instagram_url = 'https://www.instagram.com/p/aWsEd123Jh';
         $noteSyndicated->save();
         sleep(1);
-        $noteWithTextLinkandEmoji = App\Note::create([
+        $noteWithTextLinkandEmoji = Note::create([
             'note' => 'I love https://duckduckgo.com 💕' // theres a two-heart emoji at the end of this
         ]);
         sleep(1);
-        $media = new App\Media();
+        $media = new Media();
         $media->path = 'media/f1bc8faa-1a8f-45b8-a9b1-57282fa73f87.jpg';
         $media->type = 'image';
         $media->image_widths = '3648';
         $media->save();
-        $noteWithImage = App\Note::create([
+        $noteWithImage = Note::create([
             'note' => 'A lovely waterfall',
         ]);
         $noteWithImage->media()->save($media);
         sleep(1);
-        $noteFromInstagram = App\Note::create([
+        $noteFromInstagram = Note::create([
             'note' => 'Lovely #wedding #weddingfavour',
         ]);
         $noteFromInstagram->instagram_url = 'https://www.instagram.com/p/Bbo22MHhE_0';
         $noteFromInstagram->save();
-        $mediaInstagram = new App\Media();
+        $mediaInstagram = new Media();
         $mediaInstagram->path = 'https://scontent-lhr3-1.cdninstagram.com/t51.2885-15/e35/23734479_149605352435937_400133507076063232_n.jpg';
         $mediaInstagram->type = 'image';
         $mediaInstagram->save();
diff --git a/database/seeds/PlacesTableSeeder.php b/database/seeds/PlacesTableSeeder.php
index 4b787536..f5af2096 100644
--- a/database/seeds/PlacesTableSeeder.php
+++ b/database/seeds/PlacesTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Place;
+use App\Models\Place;
 use Illuminate\Database\Seeder;
 use Phaza\LaravelPostgis\Geometries\Point;
 
diff --git a/database/seeds/WebMentionsTableSeeder.php b/database/seeds/WebMentionsTableSeeder.php
index 72935206..7e56dd96 100644
--- a/database/seeds/WebMentionsTableSeeder.php
+++ b/database/seeds/WebMentionsTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\WebMention;
+use App\Models\WebMention;
 use Illuminate\Database\Seeder;
 
 class WebMentionsTableSeeder extends Seeder
@@ -16,7 +16,7 @@ class WebMentionsTableSeeder extends Seeder
             'source' => 'https://aaronpk.localhost/reply/1',
             'target' => config('app.url') . '/notes/E',
             'commentable_id' => '14',
-            'commentable_type' => 'App\Note',
+            'commentable_type' => 'App\Models\Note',
             'type' => 'in-reply-to',
             'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://aaronpk.localhost/reply/1"], "name": ["Hi too"], "author": [{"type": ["h-card"], "value": "Aaron Parecki", "properties": {"url": ["https://aaronpk.localhost"], "name": ["Aaron Parecki"], "photo": ["https://aaronparecki.com/images/profile.jpg"]}}], "content": [{"html": "Hi too", "value": "Hi too"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["https://aaronpk.loclahost/reply/1", "' . config('app.url') .'/notes/E"]}}]}'
         ]);
@@ -24,7 +24,7 @@ class WebMentionsTableSeeder extends Seeder
             'source' => 'http://tantek.com/',
             'target' => config('app.url') . '/notes/D',
             'commentable_id' => '13',
-            'commentable_type' => 'App\Note',
+            'commentable_type' => 'App\Models\Note',
             'type' => 'in-reply-to',
             'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["http://tantek.com/"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["http://tantek.com/"], "name": ["Tantek Celik"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["' . config('app.url') . '/notes/D"]}}]}'
         ]);