diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index b8c263652e..0c6dfe9e54 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -1794,6 +1794,9 @@
   "passwordHistory": {
     "message": "Password history"
   },
+  "generatorHistory": {
+    "message": "Generator history"
+  },
   "back": {
     "message": "Back"
   },
@@ -1910,11 +1913,11 @@
   "clearHistory": {
     "message": "Clear history"
   },
-  "noPasswordsToShow": {
-    "message": "No passwords to show"
+  "nothingToShow": {
+    "message": "Nothing to show"
   },
-  "noRecentlyGeneratedPassword": {
-    "message": "You haven't generated a password recently"
+  "nothingGeneratedRecently": {
+    "message": "You haven't generated anything recently"
   },
   "remove": {
     "message": "Remove"
diff --git a/apps/browser/src/tools/popup/generator/credential-generator-history.component.html b/apps/browser/src/tools/popup/generator/credential-generator-history.component.html
index 48f0479d8d..06b503534b 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator-history.component.html
+++ b/apps/browser/src/tools/popup/generator/credential-generator-history.component.html
@@ -1,5 +1,5 @@
 <popup-page>
-  <popup-header slot="header" [pageTitle]="'passwordHistory' | i18n" showBackButton>
+  <popup-header slot="header" [pageTitle]="'generatorHistory' | i18n" showBackButton>
     <ng-container slot="end">
       <app-pop-out></app-pop-out>
     </ng-container>
diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.html b/apps/browser/src/tools/popup/generator/credential-generator.component.html
index fd278592e6..aed02b4617 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator.component.html
+++ b/apps/browser/src/tools/popup/generator/credential-generator.component.html
@@ -8,7 +8,7 @@
   <tools-credential-generator />
   <bit-item>
     <a type="button" bit-item-content routerLink="/generator-history">
-      {{ "passwordHistory" | i18n }}
+      {{ "generatorHistory" | i18n }}
       <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
     </a>
   </bit-item>
diff --git a/libs/tools/generator/components/src/empty-credential-history.component.html b/libs/tools/generator/components/src/empty-credential-history.component.html
index ee28dc5895..f7f35fe936 100644
--- a/libs/tools/generator/components/src/empty-credential-history.component.html
+++ b/libs/tools/generator/components/src/empty-credential-history.component.html
@@ -1,7 +1,7 @@
 <div class="tw-flex tw-flex-col tw-h-full tw-justify-center">
   <div class="tw-text-center">
     <bit-icon [icon]="noCredentialsIcon" aria-hidden="true"></bit-icon>
-    <h2 bitTypography="h4" class="tw-mt-3">{{ "noPasswordsToShow" | i18n }}</h2>
-    <div>{{ "noRecentlyGeneratedPassword" | i18n }}</div>
+    <h2 bitTypography="h4" class="tw-mt-3">{{ "nothingToShow" | i18n }}</h2>
+    <div>{{ "nothingGeneratedRecently" | i18n }}</div>
   </div>
 </div>