diff --git a/addons/api/addon/models/fragment-host-set.js b/addons/api/addon/models/fragment-host-source.js
similarity index 83%
rename from addons/api/addon/models/fragment-host-set.js
rename to addons/api/addon/models/fragment-host-source.js
index e0f3a1e1c..66532f7d4 100644
--- a/addons/api/addon/models/fragment-host-set.js
+++ b/addons/api/addon/models/fragment-host-source.js
@@ -1,7 +1,7 @@
 import Fragment from 'ember-data-model-fragments/fragment';
 import { attr } from '@ember-data/model';
 
-export default class FragmentHostSetModel extends Fragment {
+export default class FragmentHostSourceModel extends Fragment {
   // =attributes
 
   @attr('string', {
diff --git a/addons/api/addon/models/target.js b/addons/api/addon/models/target.js
index d60596465..829455a88 100644
--- a/addons/api/addon/models/target.js
+++ b/addons/api/addon/models/target.js
@@ -12,9 +12,9 @@ export default class TargetModel extends GeneratedTargetModel {
   @fragment('fragment-target-attributes', { defaultValue: {} }) attributes;
 
   /**
-   * @type {[FragmentHostSetModel]}
+   * @type {[FragmentHostSourceModel]}
    */
-  @fragmentArray('fragment-host-set', {
+  @fragmentArray('fragment-host-source', {
     readOnly: true,
     emptyArrayIfMissing: true,
   })
diff --git a/addons/api/addon/serializers/fragment-auth-method-attributes-account-claim-map.js b/addons/api/addon/serializers/fragment-auth-method-attributes-account-claim-map.js
index 5c5b4789e..611f6aa13 100644
--- a/addons/api/addon/serializers/fragment-auth-method-attributes-account-claim-map.js
+++ b/addons/api/addon/serializers/fragment-auth-method-attributes-account-claim-map.js
@@ -1,6 +1,6 @@
 import JSONSerializer from '@ember-data/serializer/json';
 
-export default class FragmentHostSetSerializer extends JSONSerializer {
+export default class FragmentHostSourceSerializer extends JSONSerializer {
   // =methods
 
   /**
diff --git a/addons/api/addon/serializers/fragment-host-set.js b/addons/api/addon/serializers/fragment-host-source.js
similarity index 84%
rename from addons/api/addon/serializers/fragment-host-set.js
rename to addons/api/addon/serializers/fragment-host-source.js
index 564c7ec9b..01da7ad84 100644
--- a/addons/api/addon/serializers/fragment-host-set.js
+++ b/addons/api/addon/serializers/fragment-host-source.js
@@ -1,6 +1,6 @@
 import JSONSerializer from '@ember-data/serializer/json';
 
-export default class FragmentHostSetSerializer extends JSONSerializer {
+export default class FragmentHostSourceSerializer extends JSONSerializer {
   // =methods
 
   /**
diff --git a/addons/api/app/models/fragment-host-set.js b/addons/api/app/models/fragment-host-set.js
deleted file mode 100644
index bd1726680..000000000
--- a/addons/api/app/models/fragment-host-set.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/models/fragment-host-set';
diff --git a/addons/api/app/models/fragment-host-source.js b/addons/api/app/models/fragment-host-source.js
new file mode 100644
index 000000000..20b7480cc
--- /dev/null
+++ b/addons/api/app/models/fragment-host-source.js
@@ -0,0 +1 @@
+export { default } from 'api/models/fragment-host-source';
diff --git a/addons/api/app/serializers/fragment-host-set.js b/addons/api/app/serializers/fragment-host-set.js
deleted file mode 100644
index 62d638912..000000000
--- a/addons/api/app/serializers/fragment-host-set.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/fragment-host-set';
diff --git a/addons/api/app/serializers/fragment-host-source.js b/addons/api/app/serializers/fragment-host-source.js
new file mode 100644
index 000000000..6e5a68c75
--- /dev/null
+++ b/addons/api/app/serializers/fragment-host-source.js
@@ -0,0 +1 @@
+export { default } from 'api/serializers/fragment-host-source';
diff --git a/addons/api/tests/unit/models/fragment-host-set-test.js b/addons/api/tests/unit/models/fragment-host-source-test.js
similarity index 63%
rename from addons/api/tests/unit/models/fragment-host-set-test.js
rename to addons/api/tests/unit/models/fragment-host-source-test.js
index 3031c94f5..69cde9319 100644
--- a/addons/api/tests/unit/models/fragment-host-set-test.js
+++ b/addons/api/tests/unit/models/fragment-host-source-test.js
@@ -1,12 +1,12 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Model | fragment host set', function (hooks) {
+module('Unit | Model | fragment host source', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
     let store = this.owner.lookup('service:store');
-    let model = store.createRecord('fragment-host-set', {});
+    let model = store.createRecord('fragment-host-source', {});
     assert.ok(model);
   });
 });
diff --git a/addons/api/tests/unit/serializers/fragment-host-set-test.js b/addons/api/tests/unit/serializers/fragment-host-source-test.js
similarity index 62%
rename from addons/api/tests/unit/serializers/fragment-host-set-test.js
rename to addons/api/tests/unit/serializers/fragment-host-source-test.js
index 61285678d..6631288b2 100644
--- a/addons/api/tests/unit/serializers/fragment-host-set-test.js
+++ b/addons/api/tests/unit/serializers/fragment-host-source-test.js
@@ -1,15 +1,15 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import FragmentHostSet from 'api/models/fragment-host-set';
+import FragmentHostSource from 'api/models/fragment-host-source';
 
-module('Unit | Serializer | fragment host set', function (hooks) {
+module('Unit | Serializer | fragment host source', function (hooks) {
   setupTest(hooks);
 
   test('it normalizes `id` into `host_set_id`', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('fragment-host-set');
-    const normalized = serializer.normalize(FragmentHostSet, {
+    const serializer = store.serializerFor('fragment-host-source');
+    const normalized = serializer.normalize(FragmentHostSource, {
       id: '2',
       host_catalog_id: '1',
     });
@@ -21,7 +21,7 @@ module('Unit | Serializer | fragment host set', function (hooks) {
         },
         id: null,
         relationships: {},
-        type: 'fragment-host-set',
+        type: 'fragment-host-source',
       },
     });
   });