diff --git a/components/form/src/auro-form.js b/components/form/src/auro-component-form.js
similarity index 93%
rename from components/form/src/auro-form.js
rename to components/form/src/auro-component-form.js
index 8eb26468..16587d42 100644
--- a/components/form/src/auro-form.js
+++ b/components/form/src/auro-component-form.js
@@ -23,7 +23,7 @@ import styleCss from "./styles/style-css.js";
  */
 
 // build the component class
-export class AuroForm extends LitElement {
+export class Form extends LitElement {
   // constructor() {
   //   super();
   // }
@@ -60,6 +60,6 @@ export class AuroForm extends LitElement {
 }
 
 // default internal definition
-if (!customElements.get("auro-form")) {
-  customElements.define("auro-form", AuroForm);
+if (!customElements.get("auro-component-form")) {
+  customElements.define("auro-component-form", Form);
 }
diff --git a/components/form/src/index.js b/components/form/src/index.js
index 73817d20..c27df23a 100644
--- a/components/form/src/index.js
+++ b/components/form/src/index.js
@@ -1,4 +1,4 @@
-import { AuroForm } from './src/auro-form.js';
+import { Form } from './src/auro-component-form.js';
 
 /**
  * Register Custom Element.
@@ -8,7 +8,7 @@ import { AuroForm } from './src/auro-form.js';
 const registerComponent = (name = 'custom-form') => {
   // alias definition
   if (!customElements.get(name)) {
-    customElements.define(name, class extends AuroForm {});
+    customElements.define(name, class extends Form {});
   }
 };
 
diff --git a/components/form/test/auro-component-form.test.js b/components/form/test/auro-component-form.test.js
new file mode 100644
index 00000000..c87edc53
--- /dev/null
+++ b/components/form/test/auro-component-form.test.js
@@ -0,0 +1,27 @@
+import { fixture, html, expect } from '@open-wc/testing';
+import '../src/auro-component-form';
+
+describe('auro-form', () => {
+  it('sets the CSS class on auro-component-form > div element', async () => {
+    const el = await fixture(html`
+      <auro-component-form cssclass="testClass"></auro-component-form>
+    `);
+
+    const div = el.shadowRoot?.querySelector('div');
+    expect(div?.className).to.equal('testClass');
+  });
+
+  it('auro-component-form is accessible', async () => {
+    const el = await fixture(html`
+      <auro-component-form cssclass="testClass"></auro-component-form>
+    `);
+
+    await expect(el).to.be.accessible();
+  });
+
+  it('auro-component-form custom element is defined', async () => {
+    const el = await !!customElements.get("auro-component-form");
+
+    await expect(el).to.be.true;
+  });
+});
diff --git a/components/form/test/auro-form.test.js b/components/form/test/auro-form.test.js
deleted file mode 100644
index e966c1a4..00000000
--- a/components/form/test/auro-form.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { fixture, html, expect } from '@open-wc/testing';
-import '../src/auro-form';
-
-describe('auro-form', () => {
-  it('sets the CSS class on auro-form > div element', async () => {
-    const el = await fixture(html`
-      <auro-form cssclass="testClass"></auro-form>
-    `);
-
-    const div = el.shadowRoot.querySelector('div');
-    expect(div.className).to.equal('testClass');
-  });
-
-  it('auro-form is accessible', async () => {
-    const el = await fixture(html`
-      <auro-form cssclass="testClass"></auro-form>
-    `);
-
-    await expect(el).to.be.accessible();
-  });
-
-  it('auro-form custom element is defined', async () => {
-    const el = await !!customElements.get("auro-form");
-
-    await expect(el).to.be.true;
-  });
-});