diff --git a/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/AuthenticatorOATH.java b/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/AuthenticatorOATH.java
index 15c70fb455..659b87978f 100644
--- a/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/AuthenticatorOATH.java
+++ b/openam-authentication/openam-auth-fr-oath/src/main/java/org/forgerock/openam/authentication/modules/fr/oath/AuthenticatorOATH.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2012-2016 ForgeRock AS.
  * Portions Copyrighted 2014-2015 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2024 3A Systems LLC
  */
 
 package org.forgerock.openam.authentication.modules.fr.oath;
@@ -104,7 +105,7 @@ public class AuthenticatorOATH extends AMLoginModule {
     private static final String ISSUER_NAME = "openam-auth-fr-oath-issuer-name";
     private static final int TOTAL_ATTEMPTS = 3;
 
-    private static final String MODULE_NAME = "ForgeRock Authenticator (OATH)";
+    private static final String MODULE_NAME = "Authenticator (OATH)";
 
     //module attribute holders
     private String issuerName;
diff --git a/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.properties b/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.properties
index e70b842293..f730ce379a 100644
--- a/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.properties
+++ b/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.properties
@@ -11,9 +11,10 @@
 # information: "Portions copyright [year] [name of copyright owner]".
 #
 # Copyright 2012-2015 ForgeRock AS.
+# Portions Copyrighted 2024 3A Systems LLC
 
 authentication=Authentication Modules
-iPlanetAMAuthAuthenticatorOATHServiceDescription=ForgeRock Authenticator (OATH)
+iPlanetAMAuthAuthenticatorOATHServiceDescription=Authenticator (OATH)
 a500=Authentication Level
 a500.help=The authentication level associated with this module.
 a500.help.txt=Each authentication module has an authentication level that can be used to indicate the level of security \
diff --git a/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.xml b/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.xml
index 5f73a9b8b6..519fdfe6a6 100644
--- a/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.xml
+++ b/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH.xml
@@ -24,6 +24,7 @@
   your own identifying information:
   "Portions Copyrighted 2012 ForgeRock AS"
 
+  Portions Copyrighted 2024 3A Systems LLC
 -->
 
 
@@ -36,7 +37,7 @@
         <Schema
                 serviceHierarchy="/DSAMEConfig/authentication/iPlanetAMAuthAuthenticatorOATHService"
                 i18nFileName="amAuthAuthenticatorOATH"
-                revisionNumber="1"
+                revisionNumber="2"
                 i18nKey="iPlanetAMAuthAuthenticatorOATHServiceDescription"
                 resourceName="authenticatoroath">
 
@@ -177,7 +178,7 @@
                                  validator="RequiredValueValidator"
                                  resourceName="oathIssuerName">
                     <ExampleValue>
-                        <Value>ForgeRock</Value>
+                        <Value>OpenAM</Value>
                     </ExampleValue>
                 </AttributeSchema>
                 <SubSchema name="serverconfig" inheritance="multiple" resourceName="USE-PARENT">
@@ -313,7 +314,7 @@
                                      validator="RequiredValueValidator"
                                      resourceName="oathIssuerName">
                         <ExampleValue>
-                            <Value>ForgeRock</Value>
+                            <Value>OpenAM</Value>
                         </ExampleValue>
                     </AttributeSchema>
                 </SubSchema>
diff --git a/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH_ja.properties b/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH_ja.properties
index ae7cbe5f23..ddac152513 100644
--- a/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH_ja.properties
+++ b/openam-authentication/openam-auth-fr-oath/src/main/resources/amAuthAuthenticatorOATH_ja.properties
@@ -22,10 +22,11 @@
 # "Portions Copyrighted [year] [name of copyright owner]"
 #
 # Portions Copyrighted 2015 ForgeRock AS.
+# Portions Copyrighted 2024 3A Systems LLC
 #
 
 authentication=\u8a8d\u8a3c\u30e2\u30b8\u30e5\u30fc\u30eb
-iPlanetAMAuthAuthenticatorOATHServiceDescription=ForgeRock Authenticator (OATH)
+iPlanetAMAuthAuthenticatorOATHServiceDescription=Authenticator (OATH)
 a500 = \u8a8d\u8a3c\u30ec\u30d9\u30eb
 a500.help=\u3053\u306e\u8a8d\u8a3c\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u8a8d\u8a3c\u6210\u529f\u6642\u306b\u8a2d\u5b9a\u3055\u308c\u308b\u8a8d\u8a3c\u30ec\u30d9\u30eb\u3067\u3059\u3002
 a500.help.txt=\u5404\u8a8d\u8a3c\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u95a2\u9023\u4ed8\u3051\u3089\u308c\u305f\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ec\u30d9\u30eb\u3092\u793a\u3059\u305f\u3081\u306b\u4f7f\u7528\u3067\u304d\u308b\u8a8d\u8a3c\u30ec\u30d9\u30eb\u3092\u6301\u3063\u3066\u3044\u307e\u3059\u3002\
diff --git a/openam-rest/src/main/resources/AuthenticatorOATHService.properties b/openam-rest/src/main/resources/AuthenticatorOATHService.properties
index d3acd83f0b..853d2d6e08 100644
--- a/openam-rest/src/main/resources/AuthenticatorOATHService.properties
+++ b/openam-rest/src/main/resources/AuthenticatorOATHService.properties
@@ -22,8 +22,9 @@
 # "Portions copyright [year] [name of copyright owner]"
 #
 # Portions Copyrighted 2016 Nomura Research Institute, Ltd.
+# Portions Copyrighted 2024 3A Systems LLC
 
-forgerock-auth-authenticator-oath-service-description=ForgeRock Authenticator (OATH) Service
+forgerock-auth-authenticator-oath-service-description=Authenticator (OATH) Service
 a100=Profile Storage Attribute
 a100.help=The user's attribute in which to store Two Step Verification profiles.
 a100.help.txt=A specific field has been generated by OpenAM to handle these profiles, and in most cases the default \
@@ -57,6 +58,6 @@ JKS=Java Key Store (JKS).
 JCEKS=Java Cryptography Extension Key Store (JCEKS).
 PKCS11=PKCS#11 Hardware Crypto Storage.
 PKCS12=PKCS#12 Key Store.
-a107=ForgeRock Authenticator (OATH) Device Skippable Attribute Name
+a107=Authenticator (OATH) Device Skippable Attribute Name
 a107.help=Name of the attribute on a user's profile used to store their selection of whether to \
-  skip ForgeRock Authenticator (OATH) 2FA modules.
\ No newline at end of file
+  skip Authenticator (OATH) 2FA modules.
\ No newline at end of file
diff --git a/openam-server-only/src/main/webapp/config/auth/default/AuthenticatorOATH.xml b/openam-server-only/src/main/webapp/config/auth/default/AuthenticatorOATH.xml
index fa12185df6..01a8b0356d 100644
--- a/openam-server-only/src/main/webapp/config/auth/default/AuthenticatorOATH.xml
+++ b/openam-server-only/src/main/webapp/config/auth/default/AuthenticatorOATH.xml
@@ -14,6 +14,7 @@
   information: "Portions copyright [year] [name of copyright owner]".
 
   Copyright 2012-2015 ForgeRock AS.
+  Portions Copyrighted 2024 3A Systems LLC
  -->
 
 <!DOCTYPE ModuleProperties PUBLIC "=//iPlanet//Authentication Module Properties XML Interface 1.0 DTD//EN"
@@ -21,10 +22,10 @@
 
 <ModuleProperties moduleName="AuthenticatorOATH" version="1.0">
     <!-- For determining which we are -->
-    <Callbacks length="0" order="1" timeout="120" header="ForgeRock Authenticator (OATH)">
+    <Callbacks length="0" order="1" timeout="120" header="Authenticator (OATH)">
     </Callbacks>
     <!-- For when we're optional and device isn't registered -->
-    <Callbacks length="1" order="2" timeout="120" header="ForgeRock Authenticator (OATH)">
+    <Callbacks length="1" order="2" timeout="120" header="Authenticator (OATH)">
         <ConfirmationCallback>
             <OptionValues>
                 <OptionValue>
@@ -37,7 +38,7 @@
         </ConfirmationCallback>
     </Callbacks>
     <!-- For when we're not optional and a device isn't registered -->
-    <Callbacks length="1" order="3" timeout="120" header="ForgeRock Authenticator (OATH)">
+    <Callbacks length="1" order="3" timeout="120" header="Authenticator (OATH)">
         <ConfirmationCallback>
             <OptionValues>
                 <OptionValue>
@@ -75,10 +76,10 @@
         </ConfirmationCallback>
     </Callbacks>
     <!-- For recovery code use -->
-    <Callbacks length="2" order="6" timeout="120" header="ForgeRock Authenticator (OATH) Emergency Code Used">
+    <Callbacks length="2" order="6" timeout="120" header="Authenticator (OATH) Emergency Code Used">
         <TextOutputCallback>
-            You have used one of your Emergency ForgeRock Authenticator (OATH) Codes. Please make sure you have a note of
-            any remaining ForgeRock Authenticator (OATH) Codes.
+            You have used one of your Emergency Authenticator (OATH) Codes. Please make sure you have a note of
+            any remaining Authenticator (OATH) Codes.
         </TextOutputCallback>
         <ConfirmationCallback>
             <OptionValues>