diff --git a/apps/browser/src/webauthn/content/content-script.ts b/apps/browser/src/fido2/content/content-script.ts
similarity index 100%
rename from apps/browser/src/webauthn/content/content-script.ts
rename to apps/browser/src/fido2/content/content-script.ts
diff --git a/apps/browser/src/webauthn/content/messaging/message.ts b/apps/browser/src/fido2/content/messaging/message.ts
similarity index 100%
rename from apps/browser/src/webauthn/content/messaging/message.ts
rename to apps/browser/src/fido2/content/messaging/message.ts
diff --git a/apps/browser/src/webauthn/content/messaging/messenger.spec.ts b/apps/browser/src/fido2/content/messaging/messenger.spec.ts
similarity index 100%
rename from apps/browser/src/webauthn/content/messaging/messenger.spec.ts
rename to apps/browser/src/fido2/content/messaging/messenger.spec.ts
diff --git a/apps/browser/src/webauthn/content/messaging/messenger.ts b/apps/browser/src/fido2/content/messaging/messenger.ts
similarity index 100%
rename from apps/browser/src/webauthn/content/messaging/messenger.ts
rename to apps/browser/src/fido2/content/messaging/messenger.ts
diff --git a/apps/browser/src/webauthn/content/page-script.ts b/apps/browser/src/fido2/content/page-script.ts
similarity index 100%
rename from apps/browser/src/webauthn/content/page-script.ts
rename to apps/browser/src/fido2/content/page-script.ts
diff --git a/apps/browser/src/webauthn/popup/fido2/fido2.component.html b/apps/browser/src/fido2/popup/fido2/fido2.component.html
similarity index 100%
rename from apps/browser/src/webauthn/popup/fido2/fido2.component.html
rename to apps/browser/src/fido2/popup/fido2/fido2.component.html
diff --git a/apps/browser/src/webauthn/popup/fido2/fido2.component.ts b/apps/browser/src/fido2/popup/fido2/fido2.component.ts
similarity index 100%
rename from apps/browser/src/webauthn/popup/fido2/fido2.component.ts
rename to apps/browser/src/fido2/popup/fido2/fido2.component.ts
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index a321c66a8e..bd2e990f4e 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -32,7 +32,7 @@ import { ShareComponent } from "../vault/popup/components/vault/share.component"
 import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component";
 import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component";
 import { ViewComponent } from "../vault/popup/components/vault/view.component";
-import { Fido2Component } from "../webauthn/popup/fido2/fido2.component";
+import { Fido2Component } from "../fido2/popup/fido2/fido2.component";
 
 import { DebounceNavigationService } from "./services/debounceNavigationService";
 import { AutofillComponent } from "./settings/autofill.component";
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 78f2d87e8c..95f046f553 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -54,7 +54,7 @@ import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items
 import { VaultSelectComponent } from "../vault/popup/components/vault/vault-select.component";
 import { ViewCustomFieldsComponent } from "../vault/popup/components/vault/view-custom-fields.component";
 import { ViewComponent } from "../vault/popup/components/vault/view.component";
-import { Fido2Component } from "../webauthn/popup/fido2/fido2.component";
+import { Fido2Component } from "../fido2/popup/fido2/fido2.component";
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";