diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index c5d9d66b0..b2adc3a02 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -106,7 +106,7 @@ jobs:
           cd $DRUPAL_DIR
           composer config repositories.local path "$GITHUB_WORKSPACE/build_dir"
           composer config minimum-stability dev
-          composer require "islandora/islandora:dev-github-testing as dev-2.x"
+          composer require "drupal/islandora:dev-github-testing as dev-2.x"
 
       - name: Install modules
         run: |
diff --git a/composer.json b/composer.json
index cb95bbc6e..fc757ac98 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "islandora/islandora",
+  "name": "drupal/islandora",
   "description": "Core Islandora module",
   "type": "drupal-module",
   "keywords": ["Drupal", "Islandora"],
@@ -7,6 +7,9 @@
   "support": {
     "issues": "https://github.com/Islandora/documentation/issues"
   },
+  "replace": {
+    "islandora/islandora": "self.version"
+  },
   "repositories": [
     {
       "type": "composer",
@@ -20,6 +23,7 @@
     "drupal/file_replace": "^1.1",
     "drupal/filehash": "^2",
     "drupal/flysystem" : "^2.0@alpha",
+    "drupal/jsonld": "^2 || ^3",
     "drupal/jwt": "^1.1 || ^2",
     "drupal/migrate_plus" : "^5.1 || ^6",
     "drupal/migrate_source_csv" : "^3.4",
@@ -28,7 +32,6 @@
     "drupal/token" : "^1.3",
     "islandora/chullo": "^2.0",
     "islandora/fedora-entity-mapper": "^1.0",
-    "islandora/jsonld": "^2 || ^3",
     "stomp-php/stomp-php": "4.* || ^5"
   },
   "require-dev": {