diff --git a/templates/helper/class-based.js b/templates/helper/class-based.js
index 7f2b455..eec4ea4 100644
--- a/templates/helper/class-based.js
+++ b/templates/helper/class-based.js
@@ -1,6 +1,6 @@
 import Helper from "@ember/component/helper";
 
-export default class {{name.pascal}} extends Helper {
+export default class {{name.camel}} extends Helper {
   compute(positional, named) {
     return positional;
   }
diff --git a/templates/helper/class-based.ts b/templates/helper/class-based.ts
index 3446656..05a6422 100644
--- a/templates/helper/class-based.ts
+++ b/templates/helper/class-based.ts
@@ -12,7 +12,7 @@ export interface {{name.signature}} {
   Return: Return;
 }
 
-export default class {{name.pascal}} extends Helper<{{name.signature}}> {
+export default class {{name.camel}} extends Helper<{{name.signature}}> {
   compute(positional: Positional, named: Named): Return {
     return positional;
   }
diff --git a/templates/modifier/class-based.js b/templates/modifier/class-based.js
index 95f45e0..d9f41f2 100644
--- a/templates/modifier/class-based.js
+++ b/templates/modifier/class-based.js
@@ -1,5 +1,5 @@
 import Modifier from "ember-modifier";
 
-export default class {{name.pascal}} extends Modifier {
+export default class {{name.camel}} extends Modifier {
   modify(element, positional, named) {}
 }
diff --git a/templates/modifier/class-based.ts b/templates/modifier/class-based.ts
index 471c1b7..c142544 100644
--- a/templates/modifier/class-based.ts
+++ b/templates/modifier/class-based.ts
@@ -12,6 +12,6 @@ export interface {{name.signature}} {
   Element: Element;
 }
 
-export default class {{name.pascal}} extends Modifier<{{name.signature}}> {
+export default class {{name.camel}} extends Modifier<{{name.signature}}> {
   modify(element: Element, positional: Positional, named: Named) {}
 }
diff --git a/templates/service/service.js b/templates/service/service.js
index ce50101..6ab1bb2 100644
--- a/templates/service/service.js
+++ b/templates/service/service.js
@@ -1,3 +1,3 @@
 import Service from "@ember/service";
 
-export default class {{name.pascal}} extends Service {}
+export default class {{name.pascal}}Service extends Service {}
diff --git a/templates/service/service.ts b/templates/service/service.ts
index 385e265..d33c8fa 100644
--- a/templates/service/service.ts
+++ b/templates/service/service.ts
@@ -1,9 +1,9 @@
 import Service from "@ember/service";
 
-export default class {{name.pascal}} extends Service {}
+export default class {{name.pascal}}Service extends Service {}
 
 declare module "@ember/service" {
   interface Registry {
-    "{{name.path}}": {{name.pascal}};
+    "{{name.path}}": {{name.pascal}}Service;
   }
 }
diff --git a/test/__snapshots__/generate-helper.test.ts.snap b/test/__snapshots__/generate-helper.test.ts.snap
index 71a0ef8..ed53681 100644
--- a/test/__snapshots__/generate-helper.test.ts.snap
+++ b/test/__snapshots__/generate-helper.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`generates a class-based \`.js\` helper 1`] = `
 "import Helper from "@ember/component/helper";
 
-export default class Foo extends Helper {
+export default class foo extends Helper {
   compute(positional, named) {
     return positional;
   }
@@ -26,7 +26,7 @@ export interface FooSignature {
   Return: Return;
 }
 
-export default class Foo extends Helper<FooSignature> {
+export default class foo extends Helper<FooSignature> {
   compute(positional: Positional, named: Named): Return {
     return positional;
   }
diff --git a/test/__snapshots__/generate-modifier.test.ts.snap b/test/__snapshots__/generate-modifier.test.ts.snap
index 696e18a..2abef1d 100644
--- a/test/__snapshots__/generate-modifier.test.ts.snap
+++ b/test/__snapshots__/generate-modifier.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`generates a class-based \`.js\` modifier 1`] = `
 "import Modifier from "ember-modifier";
 
-export default class Foo extends Modifier {
+export default class foo extends Modifier {
   modify(element, positional, named) {}
 }
 "
@@ -24,7 +24,7 @@ export interface FooSignature {
   Element: Element;
 }
 
-export default class Foo extends Modifier<FooSignature> {
+export default class foo extends Modifier<FooSignature> {
   modify(element: Element, positional: Positional, named: Named) {}
 }
 "
diff --git a/test/__snapshots__/generate-service.test.ts.snap b/test/__snapshots__/generate-service.test.ts.snap
index b8bd441..2728efa 100644
--- a/test/__snapshots__/generate-service.test.ts.snap
+++ b/test/__snapshots__/generate-service.test.ts.snap
@@ -3,25 +3,25 @@
 exports[`generates a \`.js\` service 1`] = `
 "import Service from "@ember/service";
 
-export default class Foo extends Service {}
+export default class FooService extends Service {}
 "
 `;
 
 exports[`generates a \`.js\` service at a custom path 1`] = `
 "import Service from "@ember/service";
 
-export default class Foo extends Service {}
+export default class FooService extends Service {}
 "
 `;
 
 exports[`generates a \`.ts\` service 1`] = `
 "import Service from "@ember/service";
 
-export default class Foo extends Service {}
+export default class FooService extends Service {}
 
 declare module "@ember/service" {
   interface Registry {
-    "foo": Foo;
+    "foo": FooService;
   }
 }
 "
@@ -30,11 +30,11 @@ declare module "@ember/service" {
 exports[`generates a \`.ts\` service at a custom path 1`] = `
 "import Service from "@ember/service";
 
-export default class Foo extends Service {}
+export default class FooService extends Service {}
 
 declare module "@ember/service" {
   interface Registry {
-    "foo": Foo;
+    "foo": FooService;
   }
 }
 "
@@ -43,6 +43,6 @@ declare module "@ember/service" {
 exports[`generates a nested \`.js\` service 1`] = `
 "import Service from "@ember/service";
 
-export default class FooBar extends Service {}
+export default class FooBarService extends Service {}
 "
 `;