diff --git a/ui/core/app/components/form/account/password/settings.hbs b/ui/core/app/components/form/account/password/set-password.hbs
similarity index 100%
rename from ui/core/app/components/form/account/password/settings.hbs
rename to ui/core/app/components/form/account/password/set-password.hbs
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs
index 348503f1b..98fe07606 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/settings.hbs
@@ -1,6 +1,6 @@
 <p>{{t 'descriptions.account-settings-overview'}}</p>
 
-<Form::Account::Password::Settings
+<Form::Account::Password::SetPassword
   @model={{@model}}
   @submit={{route-action "savePassword" @model}}
   @cancel={{route-action "cancel" @model}}
diff --git a/ui/core/tests/integration/components/form/account/password/set-password-test.js b/ui/core/tests/integration/components/form/account/password/set-password-test.js
new file mode 100644
index 000000000..8aacee5e1
--- /dev/null
+++ b/ui/core/tests/integration/components/form/account/password/set-password-test.js
@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | form/account/password/set-password', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function(assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<Form::Account::Password::SetPassword />`);
+
+    assert.equal(this.element.textContent.trim(), '');
+
+    // Template block usage:
+    await render(hbs`
+      <Form::Account::Password::SetPassword>
+        template block text
+      </Form::Account::Password::SetPassword>
+    `);
+
+    assert.equal(this.element.textContent.trim(), 'template block text');
+  });
+});
diff --git a/ui/core/tests/integration/components/form/account/password/settings-test.js b/ui/core/tests/integration/components/form/account/password/settings-test.js
deleted file mode 100644
index c905dd76d..000000000
--- a/ui/core/tests/integration/components/form/account/password/settings-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render, find } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | form/account/password/settings', function(hooks) {
-  setupRenderingTest(hooks);
-
-  test('it renders', async function(assert) {
-    this.submit = () => {};
-    this.cancel = () => {};
-    this.model = { type: 'password' };
-
-    await render(hbs`
-      <Form::Account::Password::Settings
-        @model={{this.model}}
-        @submit={{this.submit}}
-        @cancel={{this.cancel}}
-      />`);
-
-    assert.ok(find('form'));
-  });
-});