diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index a2f8b533b..ae1009867 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -269,15 +269,15 @@
                                 Grid.Column="1"
                                 AutomationId="ShowForwardedEmailApiSecretButton" />
                         </Grid>
-                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
+                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AddyIo}}"
                             Text="{u:I18n DomainNameRequiredParenthesis}"
                             StyleClass="box-label"
                             Margin="0,10,0,0"/>
-                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
-                            x:Name="_anonAddyDomainNameEntry"
-                            Text="{Binding AnonAddyDomainName}"
+                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AddyIo}}"
+                            x:Name="_addyIoDomainNameEntry"
+                            Text="{Binding AddyIoDomainName}"
                             StyleClass="box-value"
-                            AutomationId="AnonAddyDomainNameEntry" />
+                            AutomationId="AddyIoDomainNameEntry" />
                     </StackLayout>                    
                     <!--RANDOM WORD OPTIONS-->
                     <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">
diff --git a/src/App/Pages/Generator/GeneratorPageViewModel.cs b/src/App/Pages/Generator/GeneratorPageViewModel.cs
index 935a9f7e0..67c92f5fd 100644
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -77,7 +77,7 @@ namespace Bit.App.Pages
             };
 
             ForwardedEmailServiceTypeOptions = new List<ForwardedEmailServiceType> {
-                ForwardedEmailServiceType.AnonAddy,
+                ForwardedEmailServiceType.AddyIo,
                 ForwardedEmailServiceType.DuckDuckGo,
                 ForwardedEmailServiceType.Fastmail,
                 ForwardedEmailServiceType.FirefoxRelay,
@@ -451,8 +451,8 @@ namespace Bit.App.Pages
             {
                 switch (ForwardedEmailServiceSelected)
                 {
-                    case ForwardedEmailServiceType.AnonAddy:
-                        return _usernameOptions.AnonAddyApiAccessToken;
+                    case ForwardedEmailServiceType.AddyIo:
+                        return _usernameOptions.AddyIoApiAccessToken;
                     case ForwardedEmailServiceType.DuckDuckGo:
                         return _usernameOptions.DuckDuckGoApiKey;
                     case ForwardedEmailServiceType.Fastmail:
@@ -470,10 +470,10 @@ namespace Bit.App.Pages
                 bool changed = false;
                 switch (ForwardedEmailServiceSelected)
                 {
-                    case ForwardedEmailServiceType.AnonAddy:
-                        if (_usernameOptions.AnonAddyApiAccessToken != value)
+                    case ForwardedEmailServiceType.AddyIo:
+                        if (_usernameOptions.AddyIoApiAccessToken != value)
                         {
-                            _usernameOptions.AnonAddyApiAccessToken = value;
+                            _usernameOptions.AddyIoApiAccessToken = value;
                             changed = true;
                         }
                         break;
@@ -523,7 +523,7 @@ namespace Bit.App.Pages
             {
                 switch (ForwardedEmailServiceSelected)
                 {
-                    case ForwardedEmailServiceType.AnonAddy:
+                    case ForwardedEmailServiceType.AddyIo:
                     case ForwardedEmailServiceType.FirefoxRelay:
                         return AppResources.APIAccessToken;
                     case ForwardedEmailServiceType.DuckDuckGo:
@@ -545,15 +545,15 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showForwardedEmailApiSecret, value);
         }
 
-        public string AnonAddyDomainName
+        public string AddyIoDomainName
         {
-            get => _usernameOptions.AnonAddyDomainName;
+            get => _usernameOptions.AddyIoDomainName;
             set
             {
-                if (_usernameOptions.AnonAddyDomainName != value)
+                if (_usernameOptions.AddyIoDomainName != value)
                 {
-                    _usernameOptions.AnonAddyDomainName = value;
-                    TriggerPropertyChanged(nameof(AnonAddyDomainName));
+                    _usernameOptions.AddyIoDomainName = value;
+                    TriggerPropertyChanged(nameof(AddyIoDomainName));
                     SaveUsernameOptionsAsync(false).FireAndForget();
                 }
             }
@@ -793,7 +793,7 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
             TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
             TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
-            TriggerPropertyChanged(nameof(AnonAddyDomainName));
+            TriggerPropertyChanged(nameof(AddyIoDomainName));
             TriggerPropertyChanged(nameof(CatchAllEmailDomain));
             TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
             TriggerPropertyChanged(nameof(UsernameTypeSelected));
@@ -832,7 +832,7 @@ namespace Bit.App.Pages
             {
                 if (ex is ForwardedEmailInvalidSecretException)
                 {
-                    message = ForwardedEmailServiceSelected == ForwardedEmailServiceType.AnonAddy || ForwardedEmailServiceSelected == ForwardedEmailServiceType.FirefoxRelay
+                    message = ForwardedEmailServiceSelected == ForwardedEmailServiceType.AddyIo || ForwardedEmailServiceSelected == ForwardedEmailServiceType.FirefoxRelay
                                 ? AppResources.InvalidAPIToken
                                 : AppResources.InvalidAPIKey;
                 }
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 65d0c606e..023e47c93 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -509,11 +509,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to AnonAddy.
+        ///   Looks up a localized string similar to addy.io.
         /// </summary>
-        public static string AnonAddy {
+        public static string AddyIo {
             get {
-                return ResourceManager.GetString("AnonAddy", resourceCulture);
+                return ResourceManager.GetString("AddyIo", resourceCulture);
             }
         }
         
diff --git a/src/App/Resources/AppResources.af.resx b/src/App/Resources/AppResources.af.resx
index e4b4f5e12..63fc91958 100644
--- a/src/App/Resources/AppResources.af.resx
+++ b/src/App/Resources/AppResources.af.resx
@@ -2413,7 +2413,7 @@ kies u Voeg TOTP toe om die sleutel veilig te bewaar</value>
   <data name="Service" xml:space="preserve">
     <value>Diens</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
+  <data name="AddyIo" xml:space="preserve">
     <value>addy.io</value>
     <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
diff --git a/src/App/Resources/AppResources.ar.resx b/src/App/Resources/AppResources.ar.resx
index 1e8bc9250..ec8db5d7d 100644
--- a/src/App/Resources/AppResources.ar.resx
+++ b/src/App/Resources/AppResources.ar.resx
@@ -2414,9 +2414,9 @@
   <data name="Service" xml:space="preserve">
     <value>الخدمة</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>FirefoxRelay</value>
diff --git a/src/App/Resources/AppResources.az.resx b/src/App/Resources/AppResources.az.resx
index d740a8191..22fdb61c1 100644
--- a/src/App/Resources/AppResources.az.resx
+++ b/src/App/Resources/AppResources.az.resx
@@ -2412,9 +2412,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="Service" xml:space="preserve">
     <value>Xidmət</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.be.resx b/src/App/Resources/AppResources.be.resx
index e059d53af..1574e687a 100644
--- a/src/App/Resources/AppResources.be.resx
+++ b/src/App/Resources/AppResources.be.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>Сэрвіс</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.bg.resx b/src/App/Resources/AppResources.bg.resx
index b44bced77..ba104442a 100644
--- a/src/App/Resources/AppResources.bg.resx
+++ b/src/App/Resources/AppResources.bg.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Услуга</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.bn.resx b/src/App/Resources/AppResources.bn.resx
index 02e56be43..75e2537a2 100644
--- a/src/App/Resources/AppResources.bn.resx
+++ b/src/App/Resources/AppResources.bn.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.bs.resx b/src/App/Resources/AppResources.bs.resx
index 83818ae0c..6fc2d37a8 100644
--- a/src/App/Resources/AppResources.bs.resx
+++ b/src/App/Resources/AppResources.bs.resx
@@ -2412,9 +2412,9 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ca.resx b/src/App/Resources/AppResources.ca.resx
index 5d397411f..daf14723e 100644
--- a/src/App/Resources/AppResources.ca.resx
+++ b/src/App/Resources/AppResources.ca.resx
@@ -2413,9 +2413,9 @@ seleccioneu Afegeix TOTP per emmagatzemar la clau de manera segura</value>
   <data name="Service" xml:space="preserve">
     <value>Servei</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.cs.resx b/src/App/Resources/AppResources.cs.resx
index e7749fdb3..d17095707 100644
--- a/src/App/Resources/AppResources.cs.resx
+++ b/src/App/Resources/AppResources.cs.resx
@@ -2412,9 +2412,9 @@ Načtení proběhne automaticky.</value>
   <data name="Service" xml:space="preserve">
     <value>Služba</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.cy.resx b/src/App/Resources/AppResources.cy.resx
index e61e46c99..03fcb5320 100644
--- a/src/App/Resources/AppResources.cy.resx
+++ b/src/App/Resources/AppResources.cy.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.da.resx b/src/App/Resources/AppResources.da.resx
index a3bb496f6..56ab6ca01 100644
--- a/src/App/Resources/AppResources.da.resx
+++ b/src/App/Resources/AppResources.da.resx
@@ -2413,9 +2413,9 @@ vælg Tilføj TOTP for at gemme nøglen sikkert</value>
   <data name="Service" xml:space="preserve">
     <value>Tjeneste</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.de.resx b/src/App/Resources/AppResources.de.resx
index 8511df3f9..6dc44d0e9 100644
--- a/src/App/Resources/AppResources.de.resx
+++ b/src/App/Resources/AppResources.de.resx
@@ -2412,9 +2412,9 @@ Das Scannen erfolgt automatisch.</value>
   <data name="Service" xml:space="preserve">
     <value>Dienst</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.el.resx b/src/App/Resources/AppResources.el.resx
index d9843036d..7b847a0a0 100644
--- a/src/App/Resources/AppResources.el.resx
+++ b/src/App/Resources/AppResources.el.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>Υπηρεσία</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.en-GB.resx b/src/App/Resources/AppResources.en-GB.resx
index dfd4e769f..6d7adcb95 100644
--- a/src/App/Resources/AppResources.en-GB.resx
+++ b/src/App/Resources/AppResources.en-GB.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.en-IN.resx b/src/App/Resources/AppResources.en-IN.resx
index c5cd4e2e1..9ede8f4be 100644
--- a/src/App/Resources/AppResources.en-IN.resx
+++ b/src/App/Resources/AppResources.en-IN.resx
@@ -2427,9 +2427,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.es.resx b/src/App/Resources/AppResources.es.resx
index 536f260f6..a2d0bb5b4 100644
--- a/src/App/Resources/AppResources.es.resx
+++ b/src/App/Resources/AppResources.es.resx
@@ -2414,9 +2414,9 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="Service" xml:space="preserve">
     <value>Servicio</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.et.resx b/src/App/Resources/AppResources.et.resx
index 1852ebbc7..473c7ce22 100644
--- a/src/App/Resources/AppResources.et.resx
+++ b/src/App/Resources/AppResources.et.resx
@@ -2413,9 +2413,9 @@ Skaneerimine toimub automaatselt.</value>
   <data name="Service" xml:space="preserve">
     <value>Teenus</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.eu.resx b/src/App/Resources/AppResources.eu.resx
index 8c41a24a2..8aebe0872 100644
--- a/src/App/Resources/AppResources.eu.resx
+++ b/src/App/Resources/AppResources.eu.resx
@@ -2412,9 +2412,9 @@
   <data name="Service" xml:space="preserve">
     <value>Zerbitzua</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.fa.resx b/src/App/Resources/AppResources.fa.resx
index dfb61a8d5..ad9d7d1c5 100644
--- a/src/App/Resources/AppResources.fa.resx
+++ b/src/App/Resources/AppResources.fa.resx
@@ -2414,9 +2414,9 @@
   <data name="Service" xml:space="preserve">
     <value>سرویس</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>رله فایرفاکس</value>
diff --git a/src/App/Resources/AppResources.fi.resx b/src/App/Resources/AppResources.fi.resx
index ded228a98..27bb68f31 100644
--- a/src/App/Resources/AppResources.fi.resx
+++ b/src/App/Resources/AppResources.fi.resx
@@ -2414,9 +2414,9 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
   <data name="Service" xml:space="preserve">
     <value>Palvelu</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.fil.resx b/src/App/Resources/AppResources.fil.resx
index 8698c53f3..3a1de4f95 100644
--- a/src/App/Resources/AppResources.fil.resx
+++ b/src/App/Resources/AppResources.fil.resx
@@ -2414,9 +2414,9 @@ pindutin ang Magdagdag ng TOTP para ligtas na mai-store ang key</value>
   <data name="Service" xml:space="preserve">
     <value>Serbisyo</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.fr.resx b/src/App/Resources/AppResources.fr.resx
index f0ca6ab2a..709501a11 100644
--- a/src/App/Resources/AppResources.fr.resx
+++ b/src/App/Resources/AppResources.fr.resx
@@ -2414,9 +2414,9 @@ sélectionnez Ajouter TOTP pour stocker la clé en toute sécurité</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.gl.resx b/src/App/Resources/AppResources.gl.resx
index aa0081e1e..6cfe82ce6 100644
--- a/src/App/Resources/AppResources.gl.resx
+++ b/src/App/Resources/AppResources.gl.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.he.resx b/src/App/Resources/AppResources.he.resx
index d98ad9c1e..19d61795d 100644
--- a/src/App/Resources/AppResources.he.resx
+++ b/src/App/Resources/AppResources.he.resx
@@ -2416,9 +2416,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.hi.resx b/src/App/Resources/AppResources.hi.resx
index d5ffd9502..ce140065b 100644
--- a/src/App/Resources/AppResources.hi.resx
+++ b/src/App/Resources/AppResources.hi.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>सेवा</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
+  <data name="AddyIo" xml:space="preserve">
     <value>एननऐडी</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>फायरफॉक्स रीले</value>
diff --git a/src/App/Resources/AppResources.hr.resx b/src/App/Resources/AppResources.hr.resx
index 761df4b85..2e83ee1fc 100644
--- a/src/App/Resources/AppResources.hr.resx
+++ b/src/App/Resources/AppResources.hr.resx
@@ -2411,9 +2411,9 @@
   <data name="Service" xml:space="preserve">
     <value>Usluga</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.hu.resx b/src/App/Resources/AppResources.hu.resx
index 815b31e9e..961d4d372 100644
--- a/src/App/Resources/AppResources.hu.resx
+++ b/src/App/Resources/AppResources.hu.resx
@@ -2412,9 +2412,9 @@ TOTP hozzáadása a kulcs biztonságos tárolásához lehetőséget.</value>
   <data name="Service" xml:space="preserve">
     <value>Szolgáltatás</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.id.resx b/src/App/Resources/AppResources.id.resx
index 41d8acc62..7711d18b2 100644
--- a/src/App/Resources/AppResources.id.resx
+++ b/src/App/Resources/AppResources.id.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.it.resx b/src/App/Resources/AppResources.it.resx
index 255b955e2..41b026e6c 100644
--- a/src/App/Resources/AppResources.it.resx
+++ b/src/App/Resources/AppResources.it.resx
@@ -2413,9 +2413,9 @@ clicca Aggiungi TOTP per salvare la chiave in modo sicuro</value>
   <data name="Service" xml:space="preserve">
     <value>Servizio</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>FirefoxRelay</value>
diff --git a/src/App/Resources/AppResources.ja.resx b/src/App/Resources/AppResources.ja.resx
index a8ec30912..b1dc3380d 100644
--- a/src/App/Resources/AppResources.ja.resx
+++ b/src/App/Resources/AppResources.ja.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>サービス</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ka.resx b/src/App/Resources/AppResources.ka.resx
index aa0081e1e..6cfe82ce6 100644
--- a/src/App/Resources/AppResources.ka.resx
+++ b/src/App/Resources/AppResources.ka.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.kn.resx b/src/App/Resources/AppResources.kn.resx
index c1f664cd2..455237008 100644
--- a/src/App/Resources/AppResources.kn.resx
+++ b/src/App/Resources/AppResources.kn.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ko.resx b/src/App/Resources/AppResources.ko.resx
index cbf940942..606ea26ba 100644
--- a/src/App/Resources/AppResources.ko.resx
+++ b/src/App/Resources/AppResources.ko.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>서비스</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.lt.resx b/src/App/Resources/AppResources.lt.resx
index f8c89e250..7f86779b1 100644
--- a/src/App/Resources/AppResources.lt.resx
+++ b/src/App/Resources/AppResources.lt.resx
@@ -2414,9 +2414,9 @@ pasirinkite Pridėti TOTP, kad raktas būtų saugiai išsaugotas</value>
   <data name="Service" xml:space="preserve">
     <value>Paslauga</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.lv.resx b/src/App/Resources/AppResources.lv.resx
index b6792a60e..fbb351b65 100644
--- a/src/App/Resources/AppResources.lv.resx
+++ b/src/App/Resources/AppResources.lv.resx
@@ -2413,9 +2413,9 @@ jāizvēlas "Pievienot TOTP", lai droši glabātu atslēgu.</value>
   <data name="Service" xml:space="preserve">
     <value>Pakalpojums</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ml.resx b/src/App/Resources/AppResources.ml.resx
index a75c82096..fbf3bd390 100644
--- a/src/App/Resources/AppResources.ml.resx
+++ b/src/App/Resources/AppResources.ml.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.mr.resx b/src/App/Resources/AppResources.mr.resx
index 8b0690b2d..be3de6e29 100644
--- a/src/App/Resources/AppResources.mr.resx
+++ b/src/App/Resources/AppResources.mr.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.my.resx b/src/App/Resources/AppResources.my.resx
index aa0081e1e..6cfe82ce6 100644
--- a/src/App/Resources/AppResources.my.resx
+++ b/src/App/Resources/AppResources.my.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.nb.resx b/src/App/Resources/AppResources.nb.resx
index 2490bad1e..5e6477157 100644
--- a/src/App/Resources/AppResources.nb.resx
+++ b/src/App/Resources/AppResources.nb.resx
@@ -2414,9 +2414,9 @@ velg Legg til TOTP for å lagre nøkkelen sikkert</value>
   <data name="Service" xml:space="preserve">
     <value>Tjeneste</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ne.resx b/src/App/Resources/AppResources.ne.resx
index aa0081e1e..6cfe82ce6 100644
--- a/src/App/Resources/AppResources.ne.resx
+++ b/src/App/Resources/AppResources.ne.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.nl.resx b/src/App/Resources/AppResources.nl.resx
index 7cdc0dc1f..b268861f7 100644
--- a/src/App/Resources/AppResources.nl.resx
+++ b/src/App/Resources/AppResources.nl.resx
@@ -2413,9 +2413,9 @@ kies je TOTP toevoegen om de sleutel veilig op te slaan</value>
   <data name="Service" xml:space="preserve">
     <value>Dienst</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.nn.resx b/src/App/Resources/AppResources.nn.resx
index d28ae3242..f6791713b 100644
--- a/src/App/Resources/AppResources.nn.resx
+++ b/src/App/Resources/AppResources.nn.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.or.resx b/src/App/Resources/AppResources.or.resx
index 3dfdd0807..ce881ab27 100644
--- a/src/App/Resources/AppResources.or.resx
+++ b/src/App/Resources/AppResources.or.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.pl.resx b/src/App/Resources/AppResources.pl.resx
index e9d822563..666d27b43 100644
--- a/src/App/Resources/AppResources.pl.resx
+++ b/src/App/Resources/AppResources.pl.resx
@@ -2413,9 +2413,9 @@ wybierz Dodaj TOTP, aby bezpiecznie przechowywać klucz</value>
   <data name="Service" xml:space="preserve">
     <value>Usługa</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.pt-BR.resx b/src/App/Resources/AppResources.pt-BR.resx
index 324bb2997..c1996f30d 100644
--- a/src/App/Resources/AppResources.pt-BR.resx
+++ b/src/App/Resources/AppResources.pt-BR.resx
@@ -2414,9 +2414,9 @@ selecione Adicionar TOTP para armazenar a chave de forma segura</value>
   <data name="Service" xml:space="preserve">
     <value>Serviço</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.pt-PT.resx b/src/App/Resources/AppResources.pt-PT.resx
index 987bf8e98..0693064e0 100644
--- a/src/App/Resources/AppResources.pt-PT.resx
+++ b/src/App/Resources/AppResources.pt-PT.resx
@@ -2412,9 +2412,9 @@ A leitura será efetuada automaticamente.</value>
   <data name="Service" xml:space="preserve">
     <value>Serviço</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index c83e6646a..b983847b6 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ro.resx b/src/App/Resources/AppResources.ro.resx
index b327e2e5b..d529045dd 100644
--- a/src/App/Resources/AppResources.ro.resx
+++ b/src/App/Resources/AppResources.ro.resx
@@ -2413,9 +2413,9 @@ selectați „Adăugare TOTP” pentru a stoca cheia în siguranță</value>
   <data name="Service" xml:space="preserve">
     <value>Serviciu</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ru.resx b/src/App/Resources/AppResources.ru.resx
index d4ae7c342..1a094b0a6 100644
--- a/src/App/Resources/AppResources.ru.resx
+++ b/src/App/Resources/AppResources.ru.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>Служба</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.si.resx b/src/App/Resources/AppResources.si.resx
index 13d19bca0..f99ceb337 100644
--- a/src/App/Resources/AppResources.si.resx
+++ b/src/App/Resources/AppResources.si.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.sk.resx b/src/App/Resources/AppResources.sk.resx
index 5ce0a2c05..d64e30de4 100644
--- a/src/App/Resources/AppResources.sk.resx
+++ b/src/App/Resources/AppResources.sk.resx
@@ -2413,9 +2413,9 @@ Pridať TOTP, aby ste kľúč bezpečne uložili</value>
   <data name="Service" xml:space="preserve">
     <value>Služba</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.sl.resx b/src/App/Resources/AppResources.sl.resx
index 485037bb6..cabddb326 100644
--- a/src/App/Resources/AppResources.sl.resx
+++ b/src/App/Resources/AppResources.sl.resx
@@ -2413,9 +2413,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.sr.resx b/src/App/Resources/AppResources.sr.resx
index da8fc3a11..81b19e390 100644
--- a/src/App/Resources/AppResources.sr.resx
+++ b/src/App/Resources/AppResources.sr.resx
@@ -2415,9 +2415,9 @@
   <data name="Service" xml:space="preserve">
     <value>Сервис</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.sv.resx b/src/App/Resources/AppResources.sv.resx
index d2a0b5a12..dde303eda 100644
--- a/src/App/Resources/AppResources.sv.resx
+++ b/src/App/Resources/AppResources.sv.resx
@@ -2415,9 +2415,9 @@ välj Lägg till TOTP för att lagra nyckeln på ett säkert sätt</value>
   <data name="Service" xml:space="preserve">
     <value>Tjänst</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.ta.resx b/src/App/Resources/AppResources.ta.resx
index 104c40e8b..a6735c393 100644
--- a/src/App/Resources/AppResources.ta.resx
+++ b/src/App/Resources/AppResources.ta.resx
@@ -2414,9 +2414,9 @@
   <data name="Service" xml:space="preserve">
     <value>சேவை</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.te.resx b/src/App/Resources/AppResources.te.resx
index aa0081e1e..6cfe82ce6 100644
--- a/src/App/Resources/AppResources.te.resx
+++ b/src/App/Resources/AppResources.te.resx
@@ -2414,9 +2414,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.th.resx b/src/App/Resources/AppResources.th.resx
index 2f06f601b..f8ff3bede 100644
--- a/src/App/Resources/AppResources.th.resx
+++ b/src/App/Resources/AppResources.th.resx
@@ -2421,9 +2421,9 @@ select Add TOTP to store the key safely</value>
   <data name="Service" xml:space="preserve">
     <value>Service</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.tr.resx b/src/App/Resources/AppResources.tr.resx
index 68af72991..d60fe9751 100644
--- a/src/App/Resources/AppResources.tr.resx
+++ b/src/App/Resources/AppResources.tr.resx
@@ -2412,9 +2412,9 @@ Kod otomatik olarak taranacaktır.</value>
   <data name="Service" xml:space="preserve">
     <value>Servis</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.uk.resx b/src/App/Resources/AppResources.uk.resx
index e61cb44ae..08296369c 100644
--- a/src/App/Resources/AppResources.uk.resx
+++ b/src/App/Resources/AppResources.uk.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>Послуга</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.vi.resx b/src/App/Resources/AppResources.vi.resx
index 2da9e7d46..691fec4d9 100644
--- a/src/App/Resources/AppResources.vi.resx
+++ b/src/App/Resources/AppResources.vi.resx
@@ -2413,9 +2413,9 @@ chọn Thêm TOTP để lưu khóa an toàn</value>
   <data name="Service" xml:space="preserve">
     <value>Dịch vụ</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.zh-Hans.resx b/src/App/Resources/AppResources.zh-Hans.resx
index 151d8462b..b4dc7356c 100644
--- a/src/App/Resources/AppResources.zh-Hans.resx
+++ b/src/App/Resources/AppResources.zh-Hans.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>服务</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/App/Resources/AppResources.zh-Hant.resx b/src/App/Resources/AppResources.zh-Hant.resx
index 4466980e9..90a86922c 100644
--- a/src/App/Resources/AppResources.zh-Hant.resx
+++ b/src/App/Resources/AppResources.zh-Hant.resx
@@ -2413,9 +2413,9 @@
   <data name="Service" xml:space="preserve">
     <value>服務</value>
   </data>
-  <data name="AnonAddy" xml:space="preserve">
-    <value>AnonAddy</value>
-    <comment>"AnonAddy" is the product name and should not be translated.</comment>
+  <data name="AddyIo" xml:space="preserve">
+    <value>addy.io</value>
+    <comment>"addy.io" is the product name and should not be translated.</comment>
   </data>
   <data name="FirefoxRelay" xml:space="preserve">
     <value>Firefox Relay</value>
diff --git a/src/Core/Enums/ForwardedEmailServiceType.cs b/src/Core/Enums/ForwardedEmailServiceType.cs
index 71bb25048..5a0df251b 100644
--- a/src/Core/Enums/ForwardedEmailServiceType.cs
+++ b/src/Core/Enums/ForwardedEmailServiceType.cs
@@ -5,8 +5,8 @@ namespace Bit.Core.Enums
     public enum ForwardedEmailServiceType
     {
         None = -1,
-        [LocalizableEnum("AnonAddy")]
-        AnonAddy = 0,
+        [LocalizableEnum("AddyIo")]
+        AddyIo = 0,
         [LocalizableEnum("FirefoxRelay")]
         FirefoxRelay = 1,
         [LocalizableEnum("SimpleLogin")]
diff --git a/src/Core/Models/Domain/UsernameGenerationOptions.cs b/src/Core/Models/Domain/UsernameGenerationOptions.cs
index deb98521d..8e88599e3 100644
--- a/src/Core/Models/Domain/UsernameGenerationOptions.cs
+++ b/src/Core/Models/Domain/UsernameGenerationOptions.cs
@@ -22,8 +22,8 @@ namespace Bit.Core.Models.Domain
         public string SimpleLoginApiKey { get; set; }
         public string DuckDuckGoApiKey { get; set; }
         public string FastMailApiKey { get; set; }
-        public string AnonAddyApiAccessToken { get; set; }
-        public string AnonAddyDomainName { get; set; }
+        public string AddyIoApiAccessToken { get; set; }
+        public string AddyIoDomainName { get; set; }
         public string EmailWebsite { get; set; }
 
         public ForwarderOptions GetForwarderOptions()
@@ -35,11 +35,11 @@ namespace Bit.Core.Models.Domain
 
             switch (ServiceType)
             {
-                case ForwardedEmailServiceType.AnonAddy:
-                    return new AnonAddyForwarderOptions
+                case ForwardedEmailServiceType.AddyIo:
+                    return new AddyIoForwarderOptions
                     {
-                        ApiKey = AnonAddyApiAccessToken,
-                        DomainName = AnonAddyDomainName
+                        ApiKey = AddyIoApiAccessToken,
+                        DomainName = AddyIoDomainName
                     };
                 case ForwardedEmailServiceType.DuckDuckGo:
                     return new ForwarderOptions { ApiKey = DuckDuckGoApiKey };
diff --git a/src/Core/Services/EmailForwarders/AnonAddyForwarder.cs b/src/Core/Services/EmailForwarders/AddyIoForwarder.cs
similarity index 70%
rename from src/Core/Services/EmailForwarders/AnonAddyForwarder.cs
rename to src/Core/Services/EmailForwarders/AddyIoForwarder.cs
index 834dd863d..162dfcb0f 100644
--- a/src/Core/Services/EmailForwarders/AnonAddyForwarder.cs
+++ b/src/Core/Services/EmailForwarders/AddyIoForwarder.cs
@@ -7,26 +7,26 @@ using Newtonsoft.Json.Linq;
 
 namespace Bit.Core.Services.EmailForwarders
 {
-    public class AnonAddyForwarderOptions : ForwarderOptions
+    public class AddyIoForwarderOptions : ForwarderOptions
     {
         public string DomainName { get; set; }
     }
 
-    public class AnonAddyForwarder : BaseForwarder<AnonAddyForwarderOptions>
+    public class AddyIoForwarder : BaseForwarder<AddyIoForwarderOptions>
     {
-        protected override string RequestUri => "https://app.anonaddy.com/api/v1/aliases";
+        protected override string RequestUri => "https://app.addy.io/api/v1/aliases";
 
-        protected override bool CanGenerate(AnonAddyForwarderOptions options)
+        protected override bool CanGenerate(AddyIoForwarderOptions options)
         {
             return !string.IsNullOrWhiteSpace(options.ApiKey) && !string.IsNullOrWhiteSpace(options.DomainName);
         }
 
-        protected override void ConfigureHeaders(HttpRequestHeaders headers, AnonAddyForwarderOptions options)
+        protected override void ConfigureHeaders(HttpRequestHeaders headers, AddyIoForwarderOptions options)
         {
             headers.Add("Authorization", $"Bearer {options.ApiKey}");
         }
 
-        protected override Task<HttpContent> GetContentAsync(IApiService apiService, AnonAddyForwarderOptions options)
+        protected override Task<HttpContent> GetContentAsync(IApiService apiService, AddyIoForwarderOptions options)
         {
             return Task.FromResult<HttpContent>(new FormUrlEncodedContent(new Dictionary<string, string>
             {
diff --git a/src/Core/Services/UsernameGenerationService.cs b/src/Core/Services/UsernameGenerationService.cs
index 9ec9fa215..6506ca0a2 100644
--- a/src/Core/Services/UsernameGenerationService.cs
+++ b/src/Core/Services/UsernameGenerationService.cs
@@ -135,10 +135,10 @@ namespace Bit.Core.Services
 
         private async Task<string> GenerateForwardedEmailAliasAsync(UsernameGenerationOptions options)
         {
-            if (options.ServiceType == ForwardedEmailServiceType.AnonAddy)
+            if (options.ServiceType == ForwardedEmailServiceType.AddyIo)
             {
-                return await new AnonAddyForwarder()
-                                    .GenerateAsync(_apiService, (AnonAddyForwarderOptions)options.GetForwarderOptions());
+                return await new AddyIoForwarder()
+                                    .GenerateAsync(_apiService, (AddyIoForwarderOptions)options.GetForwarderOptions());
             }
 
             BaseForwarder<ForwarderOptions> simpleForwarder = null;