diff --git a/README.md b/README.md
index 5d822803..9e27aebc 100644
--- a/README.md
+++ b/README.md
@@ -32,9 +32,9 @@ You may need to add the repository URL into your `composer.json` via the `reposi
 ```php
 <?php
 use SilverStripe\CMS\Model\SiteTree;
-use SilverStripe\Link\DBLink;
-use SilverStripe\Link\Link;
-use SilverStripe\Link\LinkField;
+use SilverStripe\LinkField\DBLink;
+use SilverStripe\LinkField\Link;
+use SilverStripe\LinkField\LinkField;
 
 class Page extends SiteTree
 {
diff --git a/_config/config.yml b/_config/config.yml
index 4de82235..2875c0b8 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -4,16 +4,16 @@ Name: linkfield
 
 SilverStripe\Admin\LeftAndMain:
   extensions:
-    - SilverStripe\Link\Extensions\LeftAndMain
+    - SilverStripe\LinkField\Extensions\LeftAndMain
 
 SilverStripe\Admin\ModalController:
   extensions:
-    - SilverStripe\Link\Extensions\ModalController
+    - SilverStripe\LinkField\Extensions\ModalController
 
 SilverStripe\Forms\TreeDropdownField:
   extensions:
-    - SilverStripe\Link\Extensions\AjaxField
+    - SilverStripe\LinkField\Extensions\AjaxField
 
 SilverStripe\CMS\Forms\AnchorSelectorField:
   extensions:
-    - SilverStripe\Link\Extensions\AjaxField
+    - SilverStripe\LinkField\Extensions\AjaxField
diff --git a/_config/graphql.yml b/_config/graphql.yml
index ce700c62..a6114cc5 100644
--- a/_config/graphql.yml
+++ b/_config/graphql.yml
@@ -5,9 +5,9 @@ SilverStripe\GraphQL\Manager:
   schemas:
     admin:
       types:
-        LinkType: SilverStripe\Link\GraphQL\LinkTypeType
-        LinkDescription: SilverStripe\Link\GraphQL\LinkDescriptionType
+        LinkType: SilverStripe\LinkField\GraphQL\LinkTypeType
+        LinkDescription: SilverStripe\LinkField\GraphQL\LinkDescriptionType
 
       queries:
-        readLinkTypes: SilverStripe\Link\GraphQL\LinkTypeQuery
-        readLinkDescription: SilverStripe\Link\GraphQL\LinkDescriptionQuery
+        readLinkTypes: SilverStripe\LinkField\GraphQL\LinkTypeQuery
+        readLinkDescription: SilverStripe\LinkField\GraphQL\LinkDescriptionQuery
diff --git a/_config/types.yml b/_config/types.yml
index ea32716c..f8941cbd 100644
--- a/_config/types.yml
+++ b/_config/types.yml
@@ -2,17 +2,17 @@
 Name: linkfield-types
 ---
 
-SilverStripe\Link\Type\Registry:
+SilverStripe\LinkField\Type\Registry:
   types:
     cms:
-      classname: SilverStripe\Link\Models\SiteTreeLink
+      classname: SilverStripe\LinkField\Models\SiteTreeLink
       enabled: true
     external:
-      classname: SilverStripe\Link\Models\ExternalLink
+      classname: SilverStripe\LinkField\Models\ExternalLink
       enabled: true
     file:
-      classname: SilverStripe\Link\Models\FileLink
+      classname: SilverStripe\LinkField\Models\FileLink
       enabled: true
     email:
-      classname: SilverStripe\Link\Models\EmailLink
+      classname: SilverStripe\LinkField\Models\EmailLink
       enabled: true
diff --git a/src/Extensions/AjaxField.php b/src/Extensions/AjaxField.php
index 03b453f2..057c194d 100644
--- a/src/Extensions/AjaxField.php
+++ b/src/Extensions/AjaxField.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Link\Extensions;
+namespace SilverStripe\LinkField\Extensions;
 
 use SilverStripe\Core\Extension;
 use SilverStripe\Forms\FormField;
diff --git a/src/Extensions/LeftAndMain.php b/src/Extensions/LeftAndMain.php
index ce604b28..d1173a3d 100644
--- a/src/Extensions/LeftAndMain.php
+++ b/src/Extensions/LeftAndMain.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace SilverStripe\Link\Extensions;
+namespace SilverStripe\LinkField\Extensions;
 
 use SilverStripe\Core\Extension;
-use SilverStripe\Link\Type\Registry;
+use SilverStripe\LinkField\Type\Registry;
 
 /**
  * Register a new Form Schema in LeftAndMain.
diff --git a/src/Extensions/ModalController.php b/src/Extensions/ModalController.php
index 53bdca10..b91e9c03 100644
--- a/src/Extensions/ModalController.php
+++ b/src/Extensions/ModalController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace SilverStripe\Link\Extensions;
+namespace SilverStripe\LinkField\Extensions;
 
 use InvalidArgumentException;
 use SilverStripe\Admin\ModalController as OwnerController;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Extension;
 use SilverStripe\Forms\Form;
-use SilverStripe\Link\Form\FormFactory;
-use SilverStripe\Link\Type\Registry;
+use SilverStripe\LinkField\Form\FormFactory;
+use SilverStripe\LinkField\Type\Registry;
 
 /**
  * Extensions to apply to ModalController so it knows how to handle the DynamicLink action.
diff --git a/src/Form/FormFactory.php b/src/Form/FormFactory.php
index 8ceac8fb..2279da2e 100644
--- a/src/Form/FormFactory.php
+++ b/src/Form/FormFactory.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace SilverStripe\Link\Form;
+namespace SilverStripe\LinkField\Form;
 
 use LogicException;
 use SilverStripe\Admin\Forms\LinkFormFactory;
 use SilverStripe\Forms\HiddenField;
-use SilverStripe\Link\Type\Type;
+use SilverStripe\LinkField\Type\Type;
 
 /**
  * Create Form schema for the LinkField based on a key provided by the request.
diff --git a/src/Form/JsonField.php b/src/Form/JsonField.php
index 0a7a36a6..9f7257c9 100644
--- a/src/Form/JsonField.php
+++ b/src/Form/JsonField.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Form;
+namespace SilverStripe\LinkField\Form;
 
 use InvalidArgumentException;
 use SilverStripe\Forms\FormField;
diff --git a/src/Form/LinkField.php b/src/Form/LinkField.php
index 77377d70..bdf7e9de 100644
--- a/src/Form/LinkField.php
+++ b/src/Form/LinkField.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Form;
+namespace SilverStripe\LinkField\Form;
 
 /**
  * Allows CMS users to edit a Link object.
diff --git a/src/GraphQL/LinkDescriptionQuery.php b/src/GraphQL/LinkDescriptionQuery.php
index 7759c628..20865091 100644
--- a/src/GraphQL/LinkDescriptionQuery.php
+++ b/src/GraphQL/LinkDescriptionQuery.php
@@ -1,10 +1,10 @@
 <?php
-namespace SilverStripe\Link\GraphQL;
+namespace SilverStripe\LinkField\GraphQL;
 
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type as GraphqlType;
 use SilverStripe\GraphQL\QueryCreator;
-use SilverStripe\Link\Type\Registry;
+use SilverStripe\LinkField\Type\Registry;
 
 /**
  * GraphQL Query to generate a Link Description for a provided JSON string representing the Link Data.
diff --git a/src/GraphQL/LinkDescriptionType.php b/src/GraphQL/LinkDescriptionType.php
index 3dcb8f90..d90cf47c 100644
--- a/src/GraphQL/LinkDescriptionType.php
+++ b/src/GraphQL/LinkDescriptionType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Link\GraphQL;
+namespace SilverStripe\LinkField\GraphQL;
 
 use GraphQL\Type\Definition\Type as GraphqlType;
 use SilverStripe\GraphQL\TypeCreator as GraphqlTypeCreator;
diff --git a/src/GraphQL/LinkTypeQuery.php b/src/GraphQL/LinkTypeQuery.php
index c9616fc2..7b6a35d4 100644
--- a/src/GraphQL/LinkTypeQuery.php
+++ b/src/GraphQL/LinkTypeQuery.php
@@ -1,11 +1,11 @@
 <?php
-namespace SilverStripe\Link\GraphQL;
+namespace SilverStripe\LinkField\GraphQL;
 
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type as GraphqlType;
 use SilverStripe\GraphQL\QueryCreator;
-use SilverStripe\Link\Type\Registry;
-use SilverStripe\Link\Type\Type;
+use SilverStripe\LinkField\Type\Registry;
+use SilverStripe\LinkField\Type\Type;
 
 /**
  * GraphQL Query to retrieve the list of possible LinkTypes.
diff --git a/src/GraphQL/LinkTypeType.php b/src/GraphQL/LinkTypeType.php
index 3dcf5fca..a57fe92e 100644
--- a/src/GraphQL/LinkTypeType.php
+++ b/src/GraphQL/LinkTypeType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Link\GraphQL;
+namespace SilverStripe\LinkField\GraphQL;
 
 use GraphQL\Type\Definition\Type as GraphqlType;
 use SilverStripe\GraphQL\TypeCreator as GraphqlTypeCreator;
diff --git a/src/JsonData.php b/src/JsonData.php
index bf57284d..3d42e7e4 100644
--- a/src/JsonData.php
+++ b/src/JsonData.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
+namespace SilverStripe\LinkField;
 
 use JsonSerializable;
 
diff --git a/src/Models/EmailLink.php b/src/Models/EmailLink.php
index 4368c5e5..d5fd21a8 100644
--- a/src/Models/EmailLink.php
+++ b/src/Models/EmailLink.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Models;
+namespace SilverStripe\LinkField\Models;
 
 use SilverStripe\Forms\EmailField;
 
@@ -12,7 +12,7 @@
 class EmailLink extends Link
 {
 
-    private static $table_name = 'Link_EmailLink';
+    private static $table_name = 'LinkField_EmailLink';
 
     private static $db = [
         'Email' => 'Varchar(255)'
diff --git a/src/Models/ExternalLink.php b/src/Models/ExternalLink.php
index a30ea4a5..be9b778b 100644
--- a/src/Models/ExternalLink.php
+++ b/src/Models/ExternalLink.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Models;
+namespace SilverStripe\LinkField\Models;
 
 /**
  * An link to an external URL.
@@ -10,7 +10,7 @@
 class ExternalLink extends Link
 {
 
-    private static $table_name = 'Link_ExternalLink';
+    private static $table_name = 'LinkField_ExternalLink';
 
     private static $db = [
         'ExternalUrl' => 'Varchar'
diff --git a/src/Models/FileLink.php b/src/Models/FileLink.php
index f24a28bf..f4e741ee 100644
--- a/src/Models/FileLink.php
+++ b/src/Models/FileLink.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Models;
+namespace SilverStripe\LinkField\Models;
 
 use SilverStripe\Assets\File;
 use SilverStripe\i18n\i18n;
-use SilverStripe\Link\Type\Type;
+use SilverStripe\LinkField\Type\Type;
 
 /**
  * A link to a File track in asset-admin
@@ -15,7 +15,7 @@
 class FileLink extends Link
 {
 
-    private static $table_name = 'Link_FileLink';
+    private static $table_name = 'LinkField_FileLink';
 
     private static $has_one = [
         'File' => File::class
diff --git a/src/Models/Link.php b/src/Models/Link.php
index bd8547fd..16c4020d 100644
--- a/src/Models/Link.php
+++ b/src/Models/Link.php
@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Models;
+namespace SilverStripe\LinkField\Models;
 
 use InvalidArgumentException;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\FieldList;
-use SilverStripe\Link\JsonData;
-use SilverStripe\Link\Type\Registry;
-use SilverStripe\Link\Type\Type;
+use SilverStripe\LinkField\JsonData;
+use SilverStripe\LinkField\Type\Registry;
+use SilverStripe\LinkField\Type\Type;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\View\Requirements;
@@ -21,7 +21,7 @@
 class Link extends DataObject implements JsonData, Type
 {
 
-    private static $table_name = 'Link';
+    private static $table_name = 'LinkField_Link';
 
     private static $db = [
         'Title' => 'Varchar',
diff --git a/src/Models/SiteTreeLink.php b/src/Models/SiteTreeLink.php
index 844da716..3aa278e5 100644
--- a/src/Models/SiteTreeLink.php
+++ b/src/Models/SiteTreeLink.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Models;
+namespace SilverStripe\LinkField\Models;
 
 use SilverStripe\CMS\Forms\AnchorSelectorField;
 use SilverStripe\CMS\Model\SiteTree;
@@ -16,7 +16,7 @@
 class SiteTreeLink extends Link
 {
 
-    private static $table_name = 'Link_SiteTreeLink';
+    private static $table_name = 'LinkField_SiteTreeLink';
 
     private static $db = [
         'Anchor' => 'Varchar'
diff --git a/src/ORM/DBJson.php b/src/ORM/DBJson.php
index b9c889e0..17ed7325 100644
--- a/src/ORM/DBJson.php
+++ b/src/ORM/DBJson.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Link\ORM;
+namespace SilverStripe\LinkField\ORM;
 
 use SilverStripe\Core\Config\Config;
 use SilverStripe\ORM\DB;
diff --git a/src/ORM/DBLink.php b/src/ORM/DBLink.php
index 8dd590b5..d715b9a6 100644
--- a/src/ORM/DBLink.php
+++ b/src/ORM/DBLink.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SilverStripe\Link\ORM;
+namespace SilverStripe\LinkField\ORM;
 
-use SilverStripe\Link\Type\Registry;
+use SilverStripe\LinkField\Type\Registry;
 use SilverStripe\ORM\FieldType\DBHTMLText;
-use SilverStripe\Link\Form\LinkField;
+use SilverStripe\LinkField\Form\LinkField;
 
 /**
  * Represent Link object stored as a JSON string
diff --git a/src/Type/Registry.php b/src/Type/Registry.php
index 964aa68d..7486b5bd 100644
--- a/src/Type/Registry.php
+++ b/src/Type/Registry.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Link\Type;
+namespace SilverStripe\LinkField\Type;
 
 use InvalidArgumentException;
 use SilverStripe\Core\Config\Configurable;
diff --git a/src/Type/Type.php b/src/Type/Type.php
index 7411f89c..1d0cb428 100644
--- a/src/Type/Type.php
+++ b/src/Type/Type.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace SilverStripe\Link\Type;
+namespace SilverStripe\LinkField\Type;
 
 use SilverStripe\Forms\FieldList;
-use SilverStripe\Link\JsonData;
+use SilverStripe\LinkField\JsonData;
 
 /**
  * Define a link type that can be edited in Link Field
diff --git a/tests/php/LinkModelTest.php b/tests/php/Models/LinkTest.php
similarity index 84%
rename from tests/php/LinkModelTest.php
rename to tests/php/Models/LinkTest.php
index bb475f15..90aaabac 100644
--- a/tests/php/LinkModelTest.php
+++ b/tests/php/Models/LinkTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace SilverStripe\Link\Tests;
+namespace SilverStripe\LinkField\Tests\Models;
 
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Link\Models\Link;
-use SilverStripe\Link\Models\SiteTreeLink;
+use SilverStripe\LinkField\Models\Link;
+use SilverStripe\LinkField\Models\SiteTreeLink;
 use SilverStripe\ORM\ValidationException;
 
-class LinkModelTest extends SapphireTest
+class LinkTest extends SapphireTest
 {
     /**
      * @var string
      */
-    protected static $fixture_file = 'LinkModelTest.yml';
+    protected static $fixture_file = 'LinkTest.yml';
 
     public function testLinkModel(): void
     {
diff --git a/tests/php/LinkModelTest.yml b/tests/php/Models/LinkTest.yml
similarity index 60%
rename from tests/php/LinkModelTest.yml
rename to tests/php/Models/LinkTest.yml
index c0dd5c46..92e0f883 100644
--- a/tests/php/LinkModelTest.yml
+++ b/tests/php/Models/LinkTest.yml
@@ -1,8 +1,8 @@
-SilverStripe\Link\Models\Link:
+SilverStripe\LinkField\Models\Link:
   link-1:
     Title: Link1
 
-SilverStripe\Link\Models\SiteTreeLink:
+SilverStripe\LinkField\Models\SiteTreeLink:
   page-link-1:
     Title: PageLink1