diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
index 5dd8cd621ba..1b5a775d835 100644
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -11,7 +11,6 @@
 ./libs/common/src/abstractions/fileDownload
 ./libs/common/src/abstractions/userVerification
 ./libs/common/src/abstractions/vaultTimeout
-./libs/common/src/emailForwarders
 ./libs/common/src/misc/logInStrategies
 ./libs/common/src/services/userVerification
 ./libs/common/src/services/vaultTimeout
@@ -112,12 +111,6 @@
 ./libs/common/src/enums/nativeMessagingVersion.ts
 ./libs/common/src/enums/cipherRepromptType.ts
 ./libs/common/src/enums/organizationUserType.ts
-./libs/common/src/emailForwarders/fastmailForwarder.ts
-./libs/common/src/emailForwarders/duckDuckGoForwarder.ts
-./libs/common/src/emailForwarders/firefoxRelayForwarder.ts
-./libs/common/src/emailForwarders/anonAddyForwarder.ts
-./libs/common/src/emailForwarders/simpleLoginForwarder.ts
-./libs/common/src/emailForwarders/forwarderOptions.ts
 ./libs/common/src/factories/accountFactory.ts
 ./libs/common/src/factories/globalStateFactory.ts
 ./libs/common/src/factories/stateFactory.ts
diff --git a/libs/common/src/emailForwarders/anonAddyForwarder.ts b/libs/common/src/email-forwarders/anon-addy-forwarder.ts
similarity index 96%
rename from libs/common/src/emailForwarders/anonAddyForwarder.ts
rename to libs/common/src/email-forwarders/anon-addy-forwarder.ts
index af4e3c9bce0..c4657f8372d 100644
--- a/libs/common/src/emailForwarders/anonAddyForwarder.ts
+++ b/libs/common/src/email-forwarders/anon-addy-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class AnonAddyForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/duckDuckGoForwarder.ts b/libs/common/src/email-forwarders/duck-duck-go-forwarder.ts
similarity index 95%
rename from libs/common/src/emailForwarders/duckDuckGoForwarder.ts
rename to libs/common/src/email-forwarders/duck-duck-go-forwarder.ts
index a4730733874..a600c904bc7 100644
--- a/libs/common/src/emailForwarders/duckDuckGoForwarder.ts
+++ b/libs/common/src/email-forwarders/duck-duck-go-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class DuckDuckGoForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/fastmailForwarder.ts b/libs/common/src/email-forwarders/fastmail-forwarder.ts
similarity index 98%
rename from libs/common/src/emailForwarders/fastmailForwarder.ts
rename to libs/common/src/email-forwarders/fastmail-forwarder.ts
index 19b7d043cf2..dc24c623a34 100644
--- a/libs/common/src/emailForwarders/fastmailForwarder.ts
+++ b/libs/common/src/email-forwarders/fastmail-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class FastmailForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/firefoxRelayForwarder.ts b/libs/common/src/email-forwarders/firefox-relay-forwarder.ts
similarity index 95%
rename from libs/common/src/emailForwarders/firefoxRelayForwarder.ts
rename to libs/common/src/email-forwarders/firefox-relay-forwarder.ts
index bdfaecc117c..f64dc4b06a4 100644
--- a/libs/common/src/emailForwarders/firefoxRelayForwarder.ts
+++ b/libs/common/src/email-forwarders/firefox-relay-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class FirefoxRelayForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/forwarderOptions.ts b/libs/common/src/email-forwarders/forwarder-options.ts
similarity index 100%
rename from libs/common/src/emailForwarders/forwarderOptions.ts
rename to libs/common/src/email-forwarders/forwarder-options.ts
diff --git a/libs/common/src/emailForwarders/forwarder.ts b/libs/common/src/email-forwarders/forwarder.ts
similarity index 75%
rename from libs/common/src/emailForwarders/forwarder.ts
rename to libs/common/src/email-forwarders/forwarder.ts
index 05b84c913af..da3d1bb485c 100644
--- a/libs/common/src/emailForwarders/forwarder.ts
+++ b/libs/common/src/email-forwarders/forwarder.ts
@@ -1,6 +1,6 @@
 import { ApiService } from "../abstractions/api.service";
 
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export interface Forwarder {
   generate(apiService: ApiService, options: ForwarderOptions): Promise<string>;
diff --git a/libs/common/src/emailForwarders/simpleLoginForwarder.ts b/libs/common/src/email-forwarders/simple-login-forwarder.ts
similarity index 96%
rename from libs/common/src/emailForwarders/simpleLoginForwarder.ts
rename to libs/common/src/email-forwarders/simple-login-forwarder.ts
index adc8a13aefc..ef1eecb59ba 100644
--- a/libs/common/src/emailForwarders/simpleLoginForwarder.ts
+++ b/libs/common/src/email-forwarders/simple-login-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class SimpleLoginForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/services/usernameGeneration.service.ts b/libs/common/src/services/usernameGeneration.service.ts
index 72eb11b3430..ce5857f37cc 100644
--- a/libs/common/src/services/usernameGeneration.service.ts
+++ b/libs/common/src/services/usernameGeneration.service.ts
@@ -2,13 +2,13 @@ import { ApiService } from "../abstractions/api.service";
 import { CryptoService } from "../abstractions/crypto.service";
 import { StateService } from "../abstractions/state.service";
 import { UsernameGenerationService as BaseUsernameGenerationService } from "../abstractions/usernameGeneration.service";
-import { AnonAddyForwarder } from "../emailForwarders/anonAddyForwarder";
-import { DuckDuckGoForwarder } from "../emailForwarders/duckDuckGoForwarder";
-import { FastmailForwarder } from "../emailForwarders/fastmailForwarder";
-import { FirefoxRelayForwarder } from "../emailForwarders/firefoxRelayForwarder";
-import { Forwarder } from "../emailForwarders/forwarder";
-import { ForwarderOptions } from "../emailForwarders/forwarderOptions";
-import { SimpleLoginForwarder } from "../emailForwarders/simpleLoginForwarder";
+import { AnonAddyForwarder } from "../email-forwarders/anon-addy-forwarder";
+import { DuckDuckGoForwarder } from "../email-forwarders/duck-duck-go-forwarder";
+import { FastmailForwarder } from "../email-forwarders/fastmail-forwarder";
+import { FirefoxRelayForwarder } from "../email-forwarders/firefox-relay-forwarder";
+import { Forwarder } from "../email-forwarders/forwarder";
+import { ForwarderOptions } from "../email-forwarders/forwarder-options";
+import { SimpleLoginForwarder } from "../email-forwarders/simple-login-forwarder";
 import { EFFLongWordList } from "../misc/wordlist";
 
 const DefaultOptions = {