diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
index 65cdc61442d..e742471cb57 100644
--- a/blueprints/component-class/index.js
+++ b/blueprints/component-class/index.js
@@ -173,9 +173,9 @@ module.exports = {
         importComponent = `import Component from '@glimmer/component';`;
         if (this._isUsingTS) {
           componentSignature = generateComponentSignature(classifiedModuleName);
-          defaultExport = `class ${classifiedModuleName}Component extends Component<${classifiedModuleName}Signature> {}`;
+          defaultExport = `class ${classifiedModuleName} extends Component<${classifiedModuleName}Signature> {}`;
         } else {
-          defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
+          defaultExport = `class ${classifiedModuleName} extends Component {}`;
         }
         break;
       case '@ember/component/template-only':
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index 90840c5bb42..fffa4961bea 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -275,9 +275,9 @@ module.exports = {
         importComponent = `import Component from '@glimmer/component';`;
         if (this._isUsingTS) {
           componentSignature = generateComponentSignature(classifiedModuleName);
-          defaultExport = `class ${classifiedModuleName}Component extends Component<${classifiedModuleName}Signature> {}`;
+          defaultExport = `class ${classifiedModuleName} extends Component<${classifiedModuleName}Signature> {}`;
         } else {
-          defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
+          defaultExport = `class ${classifiedModuleName} extends Component {}`;
         }
         break;
       case '@ember/component/template-only':
diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js
index 4eb913c76ee..be866b0a8a2 100644
--- a/node-tests/blueprints/component-class-test.js
+++ b/node-tests/blueprints/component-class-test.js
@@ -18,7 +18,7 @@ const enableOctane = setupTestEnvironment.enableOctane;
 
 const glimmerComponentContents = `import Component from '@glimmer/component';
 
-export default class FooComponent extends Component {}
+export default class Foo extends Component {}
 `;
 
 const emberComponentContents = `import Component from '@ember/component';
@@ -145,7 +145,7 @@ describe('Blueprint: component-class', function () {
     it('component-class x-foo', function () {
       return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+          glimmerComponentContents.replace('Foo', 'XFoo')
         );
       });
     });
@@ -154,7 +154,7 @@ describe('Blueprint: component-class', function () {
       return emberGenerateDestroy(['component-class', 'x-foo.js'], (_file) => {
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
         expect(_file('app/components/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+          glimmerComponentContents.replace('Foo', 'XFoo')
         );
       });
     });
@@ -162,7 +162,7 @@ describe('Blueprint: component-class', function () {
     it('component-class foo/x-foo', function () {
       return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
         expect(_file('app/components/foo/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
+          glimmerComponentContents.replace('Foo', 'FooXFoo')
         );
       });
     });
@@ -172,7 +172,7 @@ describe('Blueprint: component-class', function () {
         ['component-class', 'foo/x-foo', '--component-class', '@glimmer/component'],
         (_file) => {
           expect(_file('app/components/foo/x-foo.js')).to.equal(
-            glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
+            glimmerComponentContents.replace('Foo', 'FooXFoo')
           );
         }
       );
@@ -298,7 +298,7 @@ describe('Blueprint: component-class', function () {
     it('component-class x-foo', function () {
       return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
         expect(_file('addon/components/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+          glimmerComponentContents.replace('Foo', 'XFoo')
         );
         expect(_file('app/components/x-foo.js')).to.contain(
           "export { default } from 'my-addon/components/x-foo';"
@@ -309,7 +309,7 @@ describe('Blueprint: component-class', function () {
     it('component-class foo/x-foo', function () {
       return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
         expect(_file('addon/components/foo/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
+          glimmerComponentContents.replace('Foo', 'FooXFoo')
         );
         expect(_file('app/components/foo/x-foo.js')).to.contain(
           "export { default } from 'my-addon/components/foo/x-foo';"
@@ -320,7 +320,7 @@ describe('Blueprint: component-class', function () {
     it('component-class x-foo --dummy', function () {
       return emberGenerateDestroy(['component-class', 'x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js')).equal(
-          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+          glimmerComponentContents.replace('Foo', 'XFoo')
         );
         expect(_file('app/components/x-foo.js')).to.not.exist;
       });
@@ -329,7 +329,7 @@ describe('Blueprint: component-class', function () {
     it('component-class foo/x-foo --dummy', function () {
       return emberGenerateDestroy(['component-class', 'foo/x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
+          glimmerComponentContents.replace('Foo', 'FooXFoo')
         );
         expect(_file('app/components/foo/x-foo.hbs')).to.not.exist;
       });
@@ -367,7 +367,7 @@ describe('Blueprint: component-class', function () {
         ['component-class', 'x-foo', '--in-repo-addon=my-addon'],
         (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
-            glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+            glimmerComponentContents.replace('Foo', 'XFoo')
           );
           expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
             "export { default } from 'my-addon/components/x-foo';"
diff --git a/node-tests/blueprints/component-test.js b/node-tests/blueprints/component-test.js
index 3769e94f1bd..b8338928887 100644
--- a/node-tests/blueprints/component-test.js
+++ b/node-tests/blueprints/component-test.js
@@ -18,7 +18,7 @@ const enableOctane = setupTestEnvironment.enableOctane;
 
 const glimmerComponentContents = `import Component from '@glimmer/component';
 
-export default class FooComponent extends Component {}
+export default class Foo extends Component {}
 `;
 
 const emberComponentContents = `import Component from '@ember/component';
@@ -308,7 +308,7 @@ describe('Blueprint: component', function () {
         ['component', 'foo/x-foo', '--component-class', '@glimmer/component'],
         (_file) => {
           expect(_file('app/components/foo/x-foo.js')).to.equal(
-            glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
+            glimmerComponentContents.replace('Foo', 'FooXFoo')
           );
           expect(_file('app/components/foo/x-foo.hbs')).to.equal('{{yield}}');
 
diff --git a/node-tests/fixtures/component/component-dash.js b/node-tests/fixtures/component/component-dash.js
index 77fcff7ef89..2aa37ee4637 100644
--- a/node-tests/fixtures/component/component-dash.js
+++ b/node-tests/fixtures/component/component-dash.js
@@ -1,3 +1,3 @@
 import Component from '@glimmer/component';
 
-export default class XFooComponent extends Component {}
+export default class XFoo extends Component {}
diff --git a/node-tests/fixtures/component/component-nested.js b/node-tests/fixtures/component/component-nested.js
index b1da76d57d4..4c7bcef6ffb 100644
--- a/node-tests/fixtures/component/component-nested.js
+++ b/node-tests/fixtures/component/component-nested.js
@@ -1,3 +1,3 @@
 import Component from '@glimmer/component';
 
-export default class FooXFooComponent extends Component {}
+export default class FooXFoo extends Component {}
diff --git a/node-tests/fixtures/component/component.js b/node-tests/fixtures/component/component.js
index 5663784b5d5..a0662369764 100644
--- a/node-tests/fixtures/component/component.js
+++ b/node-tests/fixtures/component/component.js
@@ -1,3 +1,3 @@
 import Component from '@glimmer/component';
 
-export default class FooComponent extends Component {}
+export default class Foo extends Component {}