diff --git a/addons/api/addon/generated/models/managed-groups.js b/addons/api/addon/generated/models/managed-group.js
similarity index 100%
rename from addons/api/addon/generated/models/managed-groups.js
rename to addons/api/addon/generated/models/managed-group.js
diff --git a/addons/api/addon/models/fragment-managed-groups-attributes.js b/addons/api/addon/models/fragment-managed-group-attributes.js
similarity index 76%
rename from addons/api/addon/models/fragment-managed-groups-attributes.js
rename to addons/api/addon/models/fragment-managed-group-attributes.js
index 1c80275a5..a4d0583ff 100644
--- a/addons/api/addon/models/fragment-managed-groups-attributes.js
+++ b/addons/api/addon/models/fragment-managed-group-attributes.js
@@ -1,7 +1,7 @@
 import Fragment from 'ember-data-model-fragments/fragment';
 import { attr } from '@ember-data/model';
 
-export default class FragmentManagedGroupsAttributesModel extends Fragment {
+export default class FragmentManagedGroupAttributesModel extends Fragment {
   // =attributes (OIDC)
 
   @attr('string', {
diff --git a/addons/api/addon/models/managed-groups.js b/addons/api/addon/models/managed-group.js
similarity index 63%
rename from addons/api/addon/models/managed-groups.js
rename to addons/api/addon/models/managed-group.js
index 7dbfe75e2..8a72a15b9 100644
--- a/addons/api/addon/models/managed-groups.js
+++ b/addons/api/addon/models/managed-group.js
@@ -1,12 +1,12 @@
-import GeneratedManagedGroupModel from '../generated/models/managed-groups';
+import GeneratedManagedGroupModel from '../generated/models/managed-group';
 import { attr } from '@ember-data/model';
 import { fragment } from 'ember-data-model-fragments/attributes';
 
-export default class ManagedGroupsModel extends GeneratedManagedGroupModel {
+export default class ManagedGroupModel extends GeneratedManagedGroupModel {
   // =error attributes
   @attr('string', { readOnly: true }) filter;
 
   // =attributes
-  @fragment('fragment-managed-groups-attributes', { defaultValue: {} })
+  @fragment('fragment-managed-group-attributes', { defaultValue: {} })
   attributes;
 }
diff --git a/addons/api/addon/serializers/fragment-managed-groups-attributes.js b/addons/api/addon/serializers/fragment-managed-group-attributes.js
similarity index 87%
rename from addons/api/addon/serializers/fragment-managed-groups-attributes.js
rename to addons/api/addon/serializers/fragment-managed-group-attributes.js
index e2c750454..c250ec4df 100644
--- a/addons/api/addon/serializers/fragment-managed-groups-attributes.js
+++ b/addons/api/addon/serializers/fragment-managed-group-attributes.js
@@ -1,6 +1,6 @@
 import JSONSerializer from '@ember-data/serializer/json';
 
-export default class FragmentManagedGroupsAttributesSerializer extends JSONSerializer {
+export default class FragmentManagedGroupAttributesSerializer extends JSONSerializer {
   /**
    * If an attribute is annotated as readOnly in the model, don't serialize it.
    * Otherwise delegate to default attribute serializer.
diff --git a/addons/api/addon/serializers/managed-group.js b/addons/api/addon/serializers/managed-group.js
new file mode 100644
index 000000000..cb03236af
--- /dev/null
+++ b/addons/api/addon/serializers/managed-group.js
@@ -0,0 +1,3 @@
+import ApplicationSerializer from './application';
+
+export default class ManagedGroupSerializer extends ApplicationSerializer {}
diff --git a/addons/api/addon/serializers/managed-groups.js b/addons/api/addon/serializers/managed-groups.js
deleted file mode 100644
index 215d52935..000000000
--- a/addons/api/addon/serializers/managed-groups.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import ApplicationSerializer from './application';
-
-export default class ManagedGroupsSerializer extends ApplicationSerializer {}
diff --git a/addons/api/app/models/fragment-managed-group-attributes.js b/addons/api/app/models/fragment-managed-group-attributes.js
new file mode 100644
index 000000000..5d7d865ef
--- /dev/null
+++ b/addons/api/app/models/fragment-managed-group-attributes.js
@@ -0,0 +1 @@
+export { default } from 'api/models/fragment-managed-group-attributes';
diff --git a/addons/api/app/models/fragment-managed-groups-attributes.js b/addons/api/app/models/fragment-managed-groups-attributes.js
deleted file mode 100644
index 491c0628f..000000000
--- a/addons/api/app/models/fragment-managed-groups-attributes.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/models/fragment-managed-groups-attributes';
diff --git a/addons/api/app/models/managed-group.js b/addons/api/app/models/managed-group.js
new file mode 100644
index 000000000..87894c989
--- /dev/null
+++ b/addons/api/app/models/managed-group.js
@@ -0,0 +1 @@
+export { default } from 'api/models/managed-group';
diff --git a/addons/api/app/models/managed-groups.js b/addons/api/app/models/managed-groups.js
deleted file mode 100644
index 4fb49c35a..000000000
--- a/addons/api/app/models/managed-groups.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/models/managed-groups';
diff --git a/addons/api/app/serializers/fragment-managed-group-attributes.js b/addons/api/app/serializers/fragment-managed-group-attributes.js
new file mode 100644
index 000000000..1038afc31
--- /dev/null
+++ b/addons/api/app/serializers/fragment-managed-group-attributes.js
@@ -0,0 +1 @@
+export { default } from 'api/serializers/fragment-managed-group-attributes';
diff --git a/addons/api/app/serializers/fragment-managed-groups-attributes.js b/addons/api/app/serializers/fragment-managed-groups-attributes.js
deleted file mode 100644
index 1f10fec04..000000000
--- a/addons/api/app/serializers/fragment-managed-groups-attributes.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/fragment-managed-groups-attributes';
diff --git a/addons/api/tests/unit/models/fragment-managed-groups-attributes-test.js b/addons/api/tests/unit/models/fragment-managed-group-attributes-test.js
similarity index 62%
rename from addons/api/tests/unit/models/fragment-managed-groups-attributes-test.js
rename to addons/api/tests/unit/models/fragment-managed-group-attributes-test.js
index 3659b85e4..e33479dec 100644
--- a/addons/api/tests/unit/models/fragment-managed-groups-attributes-test.js
+++ b/addons/api/tests/unit/models/fragment-managed-group-attributes-test.js
@@ -1,13 +1,13 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Model | fragment managed groups attributes', function (hooks) {
+module('Unit | Model | fragment managed group attributes', function (hooks) {
   setupTest(hooks);
 
   // Replace this with your real tests.
   test('it exists', function (assert) {
     let store = this.owner.lookup('service:store');
-    let model = store.createRecord('fragment-managed-groups-attributes', {});
+    let model = store.createRecord('fragment-managed-group-attributes', {});
     assert.ok(model);
   });
 });
diff --git a/addons/api/tests/unit/models/managed-groups-test.js b/addons/api/tests/unit/models/managed-group-test.js
similarity index 65%
rename from addons/api/tests/unit/models/managed-groups-test.js
rename to addons/api/tests/unit/models/managed-group-test.js
index fd79c2f01..6df99cc9f 100644
--- a/addons/api/tests/unit/models/managed-groups-test.js
+++ b/addons/api/tests/unit/models/managed-group-test.js
@@ -1,12 +1,12 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Model | managed groups', function (hooks) {
+module('Unit | Model | managed group', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
     let store = this.owner.lookup('service:store');
-    let model = store.createRecord('managed-groups', {});
+    let model = store.createRecord('managed-group', {});
     assert.ok(model);
   });
 });
diff --git a/addons/api/tests/unit/serializers/fragment-managed-groups-attributes-test.js b/addons/api/tests/unit/serializers/fragment-managed-group-attributes-test.js
similarity index 86%
rename from addons/api/tests/unit/serializers/fragment-managed-groups-attributes-test.js
rename to addons/api/tests/unit/serializers/fragment-managed-group-attributes-test.js
index f179021d3..69af8a3a1 100644
--- a/addons/api/tests/unit/serializers/fragment-managed-groups-attributes-test.js
+++ b/addons/api/tests/unit/serializers/fragment-managed-group-attributes-test.js
@@ -9,7 +9,7 @@ module(
     test('it serializes empty string to null', function (assert) {
       assert.expect(1);
       const store = this.owner.lookup('service:store');
-      const record = store.createRecord('fragment-managed-groups-attributes', {
+      const record = store.createRecord('fragment-managed-group-attributes', {
         filter: '',
       });
       const serializedRecord = record.serialize();
diff --git a/addons/api/tests/unit/serializers/managed-groups-test.js b/addons/api/tests/unit/serializers/managed-group-test.js
similarity index 84%
rename from addons/api/tests/unit/serializers/managed-groups-test.js
rename to addons/api/tests/unit/serializers/managed-group-test.js
index 395914ed5..561cddb61 100644
--- a/addons/api/tests/unit/serializers/managed-groups-test.js
+++ b/addons/api/tests/unit/serializers/managed-group-test.js
@@ -1,14 +1,14 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Serializer | Managed groups', function (hooks) {
+module('Unit | Serializer | Managed group', function (hooks) {
   setupTest(hooks);
 
   test('it serializes correctly on create with no filter provided', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('managed-groups');
-    const record = store.createRecord('managed-groups', {
+    const serializer = store.serializerFor('managed-group');
+    const record = store.createRecord('managed-group', {
       name: 'Group',
       description: 'Description',
       member_ids: ['1', '2'],
@@ -33,8 +33,8 @@ module('Unit | Serializer | Managed groups', function (hooks) {
   test('it serializes correctly on create when filter provided', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('managed-groups');
-    const record = store.createRecord('managed-groups', {
+    const serializer = store.serializerFor('managed-group');
+    const record = store.createRecord('managed-group', {
       name: 'Group',
       description: 'Description',
       member_ids: ['1', '2'],
@@ -63,8 +63,8 @@ module('Unit | Serializer | Managed groups', function (hooks) {
   test('it does not serialize readOnly attributes', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('managed-groups');
-    const record = store.createRecord('managed-groups', {
+    const serializer = store.serializerFor('managed-group');
+    const record = store.createRecord('managed-group', {
       name: 'Group',
       description: 'Description',
       version: 1,
@@ -91,11 +91,11 @@ module('Unit | Serializer | Managed groups', function (hooks) {
   test('it serializes correctly on update', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('managed-groups');
+    const serializer = store.serializerFor('managed-group');
     store.push({
       data: {
         id: '1',
-        type: 'managed-groups',
+        type: 'managed-group',
         attributes: {
           name: 'Group Test',
           description: 'Description for the test',
@@ -109,7 +109,7 @@ module('Unit | Serializer | Managed groups', function (hooks) {
         },
       },
     });
-    const record = store.peekRecord('managed-groups', '1');
+    const record = store.peekRecord('managed-group', '1');
     const snapshot = record._createSnapshot();
     const serializedRecord = serializer.serialize(snapshot);
     assert.deepEqual(serializedRecord, {