diff --git a/scripts/apidoc/moduleMethods.ts b/scripts/apidoc/moduleMethods.ts
index d5b8f590257..9f0a9bb8b9d 100644
--- a/scripts/apidoc/moduleMethods.ts
+++ b/scripts/apidoc/moduleMethods.ts
@@ -39,7 +39,7 @@ export function processModuleMethods(project: ProjectReflection): PageIndex {
 }
 
 export function extractModuleName(module: DeclarationReflection): string {
-  return module.name.replace('_', '');
+  return module.name.replace(/Module$/, '');
 }
 
 function extractModuleFieldName(module: DeclarationReflection): string {
@@ -50,7 +50,7 @@ function extractModuleFieldName(module: DeclarationReflection): string {
 /**
  * Analyzes and writes the documentation for a module and its methods such as `faker.animal.cat()`.
  *
- * @param direct The module to process.
+ * @param module The module to process.
  * @returns The generated pages.
  */
 function processModuleMethod(module: DeclarationReflection): PageIndex {
diff --git a/src/faker.ts b/src/faker.ts
index 9534e373a8c..0283bd6dd6e 100644
--- a/src/faker.ts
+++ b/src/faker.ts
@@ -1,32 +1,32 @@
 import type { LocaleDefinition } from './definitions';
 import { FakerError } from './errors/faker-error';
 import type { KnownLocale } from './locales';
-import { Address } from './modules/address';
-import { Animal } from './modules/animal';
-import { Color } from './modules/color';
-import { Commerce } from './modules/commerce';
-import { Company } from './modules/company';
-import { Database } from './modules/database';
-import { Datatype } from './modules/datatype';
-import { _Date } from './modules/date';
-import { Fake } from './modules/fake';
-import { Finance } from './modules/finance';
-import { Git } from './modules/git';
-import { Hacker } from './modules/hacker';
-import { Helpers } from './modules/helpers';
-import { Image } from './modules/image';
-import { Internet } from './modules/internet';
-import { Lorem } from './modules/lorem';
-import { Mersenne } from './modules/mersenne';
-import { Music } from './modules/music';
-import { Name } from './modules/name';
-import { Phone } from './modules/phone';
-import { Random } from './modules/random';
-import { Science } from './modules/science';
-import { System } from './modules/system';
-import { Unique } from './modules/unique';
-import { Vehicle } from './modules/vehicle';
-import { Word } from './modules/word';
+import { AddressModule } from './modules/address';
+import { AnimalModule } from './modules/animal';
+import { ColorModule } from './modules/color';
+import { CommerceModule } from './modules/commerce';
+import { CompanyModule } from './modules/company';
+import { DatabaseModule } from './modules/database';
+import { DatatypeModule } from './modules/datatype';
+import { DateModule } from './modules/date';
+import { FakeModule } from './modules/fake';
+import { FinanceModule } from './modules/finance';
+import { GitModule } from './modules/git';
+import { HackerModule } from './modules/hacker';
+import { HelpersModule } from './modules/helpers';
+import { ImageModule } from './modules/image';
+import { InternetModule } from './modules/internet';
+import { LoremModule } from './modules/lorem';
+import { MersenneModule } from './modules/mersenne';
+import { MusicModule } from './modules/music';
+import { NameModule } from './modules/name';
+import { PhoneModule } from './modules/phone';
+import { RandomModule } from './modules/random';
+import { ScienceModule } from './modules/science';
+import { SystemModule } from './modules/system';
+import { UniqueModule } from './modules/unique';
+import { VehicleModule } from './modules/vehicle';
+import { WordModule } from './modules/word';
 import type { LiteralUnion } from './utils/types';
 
 export type UsableLocale = LiteralUnion<KnownLocale>;
@@ -76,36 +76,36 @@ export class Faker {
 
   readonly definitions: LocaleDefinition = this.initDefinitions();
 
-  readonly fake: Fake['fake'] = new Fake(this).fake;
-  readonly unique: Unique['unique'] = new Unique(this).unique;
+  readonly fake: FakeModule['fake'] = new FakeModule(this).fake;
+  readonly unique: UniqueModule['unique'] = new UniqueModule(this).unique;
 
-  readonly mersenne: Mersenne = new Mersenne();
-  readonly random: Random = new Random(this);
+  readonly mersenne: MersenneModule = new MersenneModule();
+  readonly random: RandomModule = new RandomModule(this);
 
-  readonly helpers: Helpers = new Helpers(this);
+  readonly helpers: HelpersModule = new HelpersModule(this);
 
-  readonly datatype: Datatype = new Datatype(this);
+  readonly datatype: DatatypeModule = new DatatypeModule(this);
 
-  readonly address: Address = new Address(this);
-  readonly animal: Animal = new Animal(this);
-  readonly color: Color = new Color(this);
-  readonly commerce: Commerce = new Commerce(this);
-  readonly company: Company = new Company(this);
-  readonly database: Database = new Database(this);
-  readonly date: _Date = new _Date(this);
-  readonly finance = new Finance(this);
-  readonly git: Git = new Git(this);
-  readonly hacker: Hacker = new Hacker(this);
-  readonly image: Image = new Image(this);
-  readonly internet: Internet = new Internet(this);
-  readonly lorem: Lorem = new Lorem(this);
-  readonly music: Music = new Music(this);
-  readonly name: Name = new Name(this);
-  readonly phone: Phone = new Phone(this);
-  readonly science: Science = new Science(this);
-  readonly system: System = new System(this);
-  readonly vehicle: Vehicle = new Vehicle(this);
-  readonly word: Word = new Word(this);
+  readonly address: AddressModule = new AddressModule(this);
+  readonly animal: AnimalModule = new AnimalModule(this);
+  readonly color: ColorModule = new ColorModule(this);
+  readonly commerce: CommerceModule = new CommerceModule(this);
+  readonly company: CompanyModule = new CompanyModule(this);
+  readonly database: DatabaseModule = new DatabaseModule(this);
+  readonly date: DateModule = new DateModule(this);
+  readonly finance = new FinanceModule(this);
+  readonly git: GitModule = new GitModule(this);
+  readonly hacker: HackerModule = new HackerModule(this);
+  readonly image: ImageModule = new ImageModule(this);
+  readonly internet: InternetModule = new InternetModule(this);
+  readonly lorem: LoremModule = new LoremModule(this);
+  readonly music: MusicModule = new MusicModule(this);
+  readonly name: NameModule = new NameModule(this);
+  readonly phone: PhoneModule = new PhoneModule(this);
+  readonly science: ScienceModule = new ScienceModule(this);
+  readonly system: SystemModule = new SystemModule(this);
+  readonly vehicle: VehicleModule = new VehicleModule(this);
+  readonly word: WordModule = new WordModule(this);
 
   constructor(opts: FakerOptions) {
     if (!opts) {
diff --git a/src/index.ts b/src/index.ts
index e3b223b0750..984a8c758d5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -29,17 +29,41 @@ export type {
 } from './definitions';
 export { FakerError } from './errors/faker-error';
 export type { FakerOptions, UsableLocale, UsedLocales } from './faker';
+export type { AddressModule } from './modules/address';
+export type { AnimalModule } from './modules/animal';
 export type {
   Casing,
   ColorFormat,
+  ColorModule,
   CSSFunction,
   CSSSpace,
   NumberColorFormat,
   StringColorFormat,
 } from './modules/color';
+export type { CommerceModule } from './modules/commerce';
+export type { CompanyModule } from './modules/company';
+export type { DatabaseModule } from './modules/database';
+export type { DatatypeModule } from './modules/datatype';
+export type { DateModule } from './modules/date';
+export type { FakeModule } from './modules/fake';
+export type { FinanceModule } from './modules/finance';
+export type { GitModule } from './modules/git';
+export type { HackerModule } from './modules/hacker';
+export type { HelpersModule } from './modules/helpers';
+export type { ImageModule } from './modules/image';
+export type { InternetModule } from './modules/internet';
+export type { LoremModule } from './modules/lorem';
+export type { MersenneModule } from './modules/mersenne';
+export type { MusicModule } from './modules/music';
 export { Gender, Sex } from './modules/name';
-export type { GenderType, SexType } from './modules/name';
-export type { ChemicalElement, Unit } from './modules/science';
+export type { GenderType, NameModule, SexType } from './modules/name';
+export type { PhoneModule } from './modules/phone';
+export type { RandomModule } from './modules/random';
+export type { ChemicalElement, ScienceModule, Unit } from './modules/science';
+export type { SystemModule } from './modules/system';
+export type { UniqueModule } from './modules/unique';
+export type { VehicleModule } from './modules/vehicle';
+export type { WordModule } from './modules/word';
 export { Faker };
 
 // since we are requiring the top level of faker, load all locales by default
diff --git a/src/modules/address/index.ts b/src/modules/address/index.ts
index 7f8660cd8b0..695d8249169 100644
--- a/src/modules/address/index.ts
+++ b/src/modules/address/index.ts
@@ -4,10 +4,10 @@ import { deprecated } from '../../internal/deprecated';
 /**
  * Module to generate addresses and locations.
  */
-export class Address {
+export class AddressModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Address.prototype)) {
+    for (const name of Object.getOwnPropertyNames(AddressModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/animal/index.ts b/src/modules/animal/index.ts
index c9b91451a0d..4a0af052523 100644
--- a/src/modules/animal/index.ts
+++ b/src/modules/animal/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate animal related entries.
  */
-export class Animal {
+export class AnimalModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Animal.prototype)) {
+    for (const name of Object.getOwnPropertyNames(AnimalModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/color/index.ts b/src/modules/color/index.ts
index 4b976098fd2..c6dbb0a476e 100644
--- a/src/modules/color/index.ts
+++ b/src/modules/color/index.ts
@@ -154,10 +154,10 @@ function toColorFormat(
 /**
  * Module to generate colors.
  */
-export class Color {
+export class ColorModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Color.prototype)) {
+    for (const name of Object.getOwnPropertyNames(ColorModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/commerce/index.ts b/src/modules/commerce/index.ts
index 876545e0678..11ed8d7bd03 100644
--- a/src/modules/commerce/index.ts
+++ b/src/modules/commerce/index.ts
@@ -4,10 +4,10 @@ import { deprecated } from '../../internal/deprecated';
 /**
  * Module to generate commerce and product related entries.
  */
-export class Commerce {
+export class CommerceModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Commerce.prototype)) {
+    for (const name of Object.getOwnPropertyNames(CommerceModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/company/index.ts b/src/modules/company/index.ts
index b07b2a93119..2b17a6ed419 100644
--- a/src/modules/company/index.ts
+++ b/src/modules/company/index.ts
@@ -4,10 +4,10 @@ import { deprecated } from '../../internal/deprecated';
 /**
  * Module to generate company related entries.
  */
-export class Company {
+export class CompanyModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Company.prototype)) {
+    for (const name of Object.getOwnPropertyNames(CompanyModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/database/index.ts b/src/modules/database/index.ts
index 87494315cf9..8a4291f9ceb 100644
--- a/src/modules/database/index.ts
+++ b/src/modules/database/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate database related entries.
  */
-export class Database {
+export class DatabaseModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Database.prototype)) {
+    for (const name of Object.getOwnPropertyNames(DatabaseModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/datatype/index.ts b/src/modules/datatype/index.ts
index 1a516736ecc..9991175d55d 100644
--- a/src/modules/datatype/index.ts
+++ b/src/modules/datatype/index.ts
@@ -5,10 +5,10 @@ import { deprecated } from '../../internal/deprecated';
 /**
  * Module to generate various primitive values and data types.
  */
-export class Datatype {
+export class DatatypeModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Datatype.prototype)) {
+    for (const name of Object.getOwnPropertyNames(DatatypeModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/date/index.ts b/src/modules/date/index.ts
index 0ca11d458dd..111fc4bae6f 100644
--- a/src/modules/date/index.ts
+++ b/src/modules/date/index.ts
@@ -20,12 +20,10 @@ function toDate(date?: string | Date | number): Date {
 /**
  * Module to generate dates.
  */
-// disabled until modules are renamed to something with a suffix
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export class _Date {
+export class DateModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(_Date.prototype)) {
+    for (const name of Object.getOwnPropertyNames(DateModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/fake/index.ts b/src/modules/fake/index.ts
index c3e3125377b..94ad4325149 100644
--- a/src/modules/fake/index.ts
+++ b/src/modules/fake/index.ts
@@ -6,10 +6,10 @@ import { deprecated } from '../../internal/deprecated';
  *
  * @deprecated
  */
-export class Fake {
+export class FakeModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Fake.prototype)) {
+    for (const name of Object.getOwnPropertyNames(FakeModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/finance/index.ts b/src/modules/finance/index.ts
index 87700c86029..d1580603e24 100644
--- a/src/modules/finance/index.ts
+++ b/src/modules/finance/index.ts
@@ -5,10 +5,10 @@ import iban from './iban';
 /**
  * Module to generate finance related entries.
  */
-export class Finance {
+export class FinanceModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Finance.prototype)) {
+    for (const name of Object.getOwnPropertyNames(FinanceModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/git/index.ts b/src/modules/git/index.ts
index da1dfab7d1c..d92e34540c8 100644
--- a/src/modules/git/index.ts
+++ b/src/modules/git/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate git related entries.
  */
-export class Git {
+export class GitModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Git.prototype)) {
+    for (const name of Object.getOwnPropertyNames(GitModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/hacker/index.ts b/src/modules/hacker/index.ts
index ea36fc0ea26..d842d74e2a3 100644
--- a/src/modules/hacker/index.ts
+++ b/src/modules/hacker/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate hacker/IT words and phrases.
  */
-export class Hacker {
+export class HackerModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Hacker.prototype)) {
+    for (const name of Object.getOwnPropertyNames(HackerModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts
index 9e9a3f5b300..f6aa55ac985 100644
--- a/src/modules/helpers/index.ts
+++ b/src/modules/helpers/index.ts
@@ -9,10 +9,10 @@ import * as uniqueExec from './unique';
  * Module with various helper methods that transform the method input rather than returning values from locales.
  * The transformation process may call methods that use the locale data.
  */
-export class Helpers {
+export class HelpersModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Helpers.prototype)) {
+    for (const name of Object.getOwnPropertyNames(HelpersModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/image/index.ts b/src/modules/image/index.ts
index 082f7e73f02..1a709505da9 100644
--- a/src/modules/image/index.ts
+++ b/src/modules/image/index.ts
@@ -10,7 +10,7 @@ import { Unsplash } from './providers/unsplash';
  *
  * Default provider is unsplash image provider.
  */
-export class Image {
+export class ImageModule {
   readonly lorempixel: Lorempixel;
   readonly unsplash: Unsplash;
   readonly lorempicsum: LoremPicsum;
@@ -18,7 +18,7 @@ export class Image {
 
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Image.prototype)) {
+    for (const name of Object.getOwnPropertyNames(ImageModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -46,7 +46,7 @@ export class Image {
    * @since 2.0.1
    */
   image(width?: number, height?: number, randomize?: boolean): string {
-    const categories: MethodsOf<Image, Image['image']> = [
+    const categories: MethodsOf<ImageModule, ImageModule['image']> = [
       'abstract',
       'animals',
       'business',
diff --git a/src/modules/internet/index.ts b/src/modules/internet/index.ts
index 724c35dce00..2da5b59f7e1 100644
--- a/src/modules/internet/index.ts
+++ b/src/modules/internet/index.ts
@@ -23,10 +23,10 @@ export type HTTPStatusCodeType =
 /**
  * Module to generate internet related entries.
  */
-export class Internet {
+export class InternetModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Internet.prototype)) {
+    for (const name of Object.getOwnPropertyNames(InternetModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/lorem/index.ts b/src/modules/lorem/index.ts
index e086751d1d1..4745b0e91f0 100644
--- a/src/modules/lorem/index.ts
+++ b/src/modules/lorem/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate random texts and words.
  */
-export class Lorem {
+export class LoremModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Lorem.prototype)) {
+    for (const name of Object.getOwnPropertyNames(LoremModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -181,7 +181,7 @@ export class Lorem {
    * @since 3.1.0
    */
   text(): string {
-    const methods: Array<keyof Lorem> = [
+    const methods: Array<keyof LoremModule> = [
       'word',
       'words',
       'sentence',
diff --git a/src/modules/mersenne/index.ts b/src/modules/mersenne/index.ts
index f03c137d0ec..5f60e867c07 100644
--- a/src/modules/mersenne/index.ts
+++ b/src/modules/mersenne/index.ts
@@ -4,14 +4,14 @@ import Gen from './twister';
 /**
  * Module to generate seed based random numbers.
  */
-export class Mersenne {
+export class MersenneModule {
   private gen = new Gen();
 
   constructor() {
     this.gen.initGenrand(new Date().getTime() % 1000000000);
 
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Mersenne.prototype)) {
+    for (const name of Object.getOwnPropertyNames(MersenneModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/music/index.ts b/src/modules/music/index.ts
index a03e76cb72a..482ee2b0c8b 100644
--- a/src/modules/music/index.ts
+++ b/src/modules/music/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate music related entries.
  */
-export class Music {
+export class MusicModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Music.prototype)) {
+    for (const name of Object.getOwnPropertyNames(MusicModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/name/index.ts b/src/modules/name/index.ts
index c524b64bfa7..bdd3bd37795 100644
--- a/src/modules/name/index.ts
+++ b/src/modules/name/index.ts
@@ -75,10 +75,10 @@ function selectDefinition(
 /**
  * Module to generate people's names and titles.
  */
-export class Name {
+export class NameModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Name.prototype)) {
+    for (const name of Object.getOwnPropertyNames(NameModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/phone/index.ts b/src/modules/phone/index.ts
index 2571014da91..1f0d16a3e77 100644
--- a/src/modules/phone/index.ts
+++ b/src/modules/phone/index.ts
@@ -4,10 +4,10 @@ import { deprecated } from '../../internal/deprecated';
 /**
  * Module to generate phone-related data.
  */
-export class Phone {
+export class PhoneModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Phone.prototype)) {
+    for (const name of Object.getOwnPropertyNames(PhoneModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/random/index.ts b/src/modules/random/index.ts
index 8a788d9f262..b4034343d88 100644
--- a/src/modules/random/index.ts
+++ b/src/modules/random/index.ts
@@ -97,10 +97,10 @@ function arrayRemove<T>(arr: T[], values: readonly T[]): T[] {
 /**
  * Generates random values of different kinds.
  */
-export class Random {
+export class RandomModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Random.prototype)) {
+    for (const name of Object.getOwnPropertyNames(RandomModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/science/index.ts b/src/modules/science/index.ts
index 1f685adbffd..51203a3a47c 100644
--- a/src/modules/science/index.ts
+++ b/src/modules/science/index.ts
@@ -32,10 +32,10 @@ export interface Unit {
 /**
  * Module to generate science related entries.
  */
-export class Science {
+export class ScienceModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Science.prototype)) {
+    for (const name of Object.getOwnPropertyNames(ScienceModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/system/index.ts b/src/modules/system/index.ts
index 3700a2d8cd3..860ab7b9d95 100644
--- a/src/modules/system/index.ts
+++ b/src/modules/system/index.ts
@@ -35,10 +35,10 @@ const CRON_DAY_OF_WEEK = [
 /**
  * Generates fake data for many computer systems properties.
  */
-export class System {
+export class SystemModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(System.prototype)) {
+    for (const name of Object.getOwnPropertyNames(SystemModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/unique/index.ts b/src/modules/unique/index.ts
index 89c322bfc13..fd817ec498b 100644
--- a/src/modules/unique/index.ts
+++ b/src/modules/unique/index.ts
@@ -7,10 +7,10 @@ import type { RecordKey } from '../helpers/unique';
  *
  * @deprecated
  */
-export class Unique {
+export class UniqueModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Unique.prototype)) {
+    for (const name of Object.getOwnPropertyNames(UniqueModule.prototype)) {
       if (
         name === 'constructor' ||
         name === 'maxTime' ||
diff --git a/src/modules/vehicle/index.ts b/src/modules/vehicle/index.ts
index c38bbc5927c..cd01ece30c9 100644
--- a/src/modules/vehicle/index.ts
+++ b/src/modules/vehicle/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate vehicle related entries.
  */
-export class Vehicle {
+export class VehicleModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Vehicle.prototype)) {
+    for (const name of Object.getOwnPropertyNames(VehicleModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/word/index.ts b/src/modules/word/index.ts
index 4faa4352117..725c0c4263f 100644
--- a/src/modules/word/index.ts
+++ b/src/modules/word/index.ts
@@ -28,10 +28,10 @@ function filterWordListByLength(options: {
 /**
  * Module to return various types of words.
  */
-export class Word {
+export class WordModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Word.prototype)) {
+    for (const name of Object.getOwnPropertyNames(WordModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/test/mersenne.spec.ts b/test/mersenne.spec.ts
index 4ed803af823..62b65a69be6 100644
--- a/test/mersenne.spec.ts
+++ b/test/mersenne.spec.ts
@@ -1,6 +1,6 @@
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 import { FakerError } from '../src/errors/faker-error';
-import { Mersenne } from '../src/modules/mersenne';
+import { MersenneModule } from '../src/modules/mersenne';
 import { seededRuns } from './support/seededRuns';
 
 const minMaxTestCases = [
@@ -14,10 +14,10 @@ const functionNames = ['rand'];
 const NON_SEEDED_BASED_RUN = 25;
 
 describe('mersenne twister', () => {
-  let mersenne: Mersenne;
+  let mersenne: MersenneModule;
 
   beforeEach(() => {
-    mersenne = new Mersenne();
+    mersenne = new MersenneModule();
   });
 
   for (const seed of [...seededRuns, [42, 1, 2], [1337, 1, 2], [1211, 1, 2]]) {