diff --git a/client/man/default.conf.5 b/client/man/default.conf.5
index 8336ed841..f85fd6704 100644
--- a/client/man/default.conf.5
+++ b/client/man/default.conf.5
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@@redhat.com>
 .\"
-.TH "default.conf" "5" "Feb 21 2011" "FreeIPA" "FreeIPA Manual Pages"
+.TH "default.conf" "5" "Feb 21 2011" "IPA" "IPA Manual Pages"
 .SH "NAME"
 default.conf \- IPA configuration file
 .SH "SYNOPSIS"
diff --git a/client/man/epn.conf.5 b/client/man/epn.conf.5
index 60508d292..9f0ec59d0 100644
--- a/client/man/epn.conf.5
+++ b/client/man/epn.conf.5
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@@redhat.com>
 .\"
-.TH "EPN.CONF" "5" "April 28, 2020" "FreeIPA" "FreeIPA Manual Pages"
+.TH "EPN.CONF" "5" "April 28, 2020" "IPA" "IPA Manual Pages"
 .SH "NAME"
 epn.conf \- Expiring Password Notification configuration file
 .SH "SYNOPSIS"
diff --git a/client/man/ipa-certupdate.1 b/client/man/ipa-certupdate.1
index d95790a36..431b395a9 100644
--- a/client/man/ipa-certupdate.1
+++ b/client/man/ipa-certupdate.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Jan Cholasta <jcholast@redhat.com>
 .\"
-.TH "ipa-certupdate" "1" "Jul 2 2014" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-certupdate" "1" "Jul 2 2014" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-certupdate \- Update local IPA certificate databases with certificates from the server
 .SH "SYNOPSIS"
diff --git a/client/man/ipa-client-automount.1 b/client/man/ipa-client-automount.1
index 4c3caee93..3f6edabd0 100644
--- a/client/man/ipa-client-automount.1
+++ b/client/man/ipa-client-automount.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-client-automount" "1" "May 25 2012" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-client-automount" "1" "May 25 2012" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-client\-automount \- Configure automount and NFS for IPA
 .SH "SYNOPSIS"
diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
index 5d6ac8653..1db3445c0 100644
--- a/client/man/ipa-client-install.1
+++ b/client/man/ipa-client-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-client-install
 .\" Copyright (C) 2008-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-client-install" "1" "Dec 19 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-client-install" "1" "Dec 19 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-client\-install \- Configure an IPA client
 .SH "SYNOPSIS"
diff --git a/client/man/ipa-client-samba.1 b/client/man/ipa-client-samba.1
index ea83715ff..5ed6c7150 100644
--- a/client/man/ipa-client-samba.1
+++ b/client/man/ipa-client-samba.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-client-samba
 .\" Copyright (C) 2008-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-client-samba" "1" "Jun 10 2019" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-client-samba" "1" "Jun 10 2019" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-client\-samba \- Configure Samba file server on an IPA client
 .SH "SYNOPSIS"
@@ -39,7 +39,7 @@ The ipa\-client\-samba script assumes that the machine has alreaby been enrolled
 .SS "IPA Master Requirements"
 At least one IPA master must hold a \fBTrust Controller\fR role. This can be achieved by running ipa\-adtrust\-install on the IPA master. The utility will configure IPA master to be a domain controller for IPA domain.
 
-IPA master holding a \fBTrust Controller\fR role has also to have support for a special service command to create SMB service, \fBipa service-add-smb\fR. This command is available with FreeIPA 4.8.0 or later release.
+IPA master holding a \fBTrust Controller\fR role has also to have support for a special service command to create SMB service, \fBipa service-add-smb\fR. This command is available with IPA 4.8.0 or later release.
 
 .SH "OPTIONS"
 .SS "BASIC OPTIONS"
diff --git a/client/man/ipa-epn.1 b/client/man/ipa-epn.1
index 124fd4536..5e8438b69 100644
--- a/client/man/ipa-epn.1
+++ b/client/man/ipa-epn.1
@@ -15,7 +15,7 @@
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .\"
 .\"
-.TH "IPA-EPN" "1" "April 24, 2020" "FreeIPA" "FreeIPA Manual Pages"
+.TH "IPA-EPN" "1" "April 24, 2020" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-epn \- Send expiring password nofications
 .SH "SYNOPSIS"
diff --git a/client/man/ipa-getkeytab.1 b/client/man/ipa-getkeytab.1
index a4bcd8871..b57c5489c 100644
--- a/client/man/ipa-getkeytab.1
+++ b/client/man/ipa-getkeytab.1
@@ -17,7 +17,7 @@
 .\" Author: Karl MacMillan <kmacmill@redhat.com>
 .\" Author: Simo Sorce <ssorce@redhat.com>
 .\"
-.TH "ipa-getkeytab" "1" "Oct 10 2007" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-getkeytab" "1" "Oct 10 2007" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-getkeytab \- Get a keytab for a Kerberos principal
 .SH "SYNOPSIS"
@@ -118,7 +118,7 @@ GSSAPI or EXTERNAL.
 \fB\-r\fR
 Retrieve mode. Retrieve an existing key from the server instead of generating a
 new one. This is incompatible with the \-\-password option, and will work only
-against a FreeIPA server more recent than version 3.3. The user requesting the
+against a IPA server more recent than version 3.3. The user requesting the
 keytab must have access to the keys for this operation to succeed.
 .SH "EXAMPLES"
 Add and retrieve a keytab for the NFS service principal on
diff --git a/client/man/ipa-join.1 b/client/man/ipa-join.1
index 6e512b875..5eaf68f9d 100644
--- a/client/man/ipa-join.1
+++ b/client/man/ipa-join.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-join" "1" "Oct 8 2009" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-join" "1" "Oct 8 2009" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-join \- Join a machine to an IPA realm and get a keytab for the host service principal
 .SH "SYNOPSIS"
diff --git a/client/man/ipa-rmkeytab.1 b/client/man/ipa-rmkeytab.1
index 583871ebd..f4e1c51fa 100644
--- a/client/man/ipa-rmkeytab.1
+++ b/client/man/ipa-rmkeytab.1
@@ -17,7 +17,7 @@
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
 .\"
-.TH "ipa-rmkeytab" "1" "Oct 30 2009" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-rmkeytab" "1" "Oct 30 2009" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-rmkeytab \- Remove a kerberos principal from a keytab
 .SH "SYNOPSIS"
diff --git a/client/man/ipa.1 b/client/man/ipa.1
index f9fae7c0d..2fb21b52d 100644
--- a/client/man/ipa.1
+++ b/client/man/ipa.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Pavel Zuna <pzuna@redhat.com>
 .\"
-.TH "ipa" "1" "Apr 29 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa" "1" "Apr 29 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa \- IPA command\-line interface
 .SH "SYNOPSIS"
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index a48a24511..f934dbb40 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
     <script type="text/javascript">
         var dojoConfig = {
@@ -69,7 +69,7 @@
 
     <nav class="navbar navbar-default navbar-pf" role="navigation">
     <div class="navbar-header">
-        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="FreeIPA"></a>
+        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="Identity Management"></a>
     </div>
     </nav>
 
diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
index 630982da8..b8c64d69d 100644
--- a/install/html/unauthorized.html
+++ b/install/html/unauthorized.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
     <script type="text/javascript">
         var dojoConfig = {
@@ -62,7 +62,7 @@
 
     <nav class="navbar navbar-default navbar-pf" role="navigation">
     <div class="navbar-header">
-        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="FreeIPA"></a>
+        <a class="brand" href="../ui/index.html"><img src="../ui/images/header-logo.png" alt="Identity Management"></a>
     </div>
     </nav>
 
diff --git a/install/migration/index.html b/install/migration/index.html
index fca517cdc..b5ac1f6df 100644
--- a/install/migration/index.html
+++ b/install/migration/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
diff --git a/install/share/ipaca_default.ini b/install/share/ipaca_default.ini
index e71edaca7..3a3dfd0c9 100644
--- a/install/share/ipaca_default.ini
+++ b/install/share/ipaca_default.ini
@@ -2,7 +2,7 @@
 # Dogtag PKI configuration file
 #
 # The ipaca_default.ini contains hard-coded defaults that cannot be modified
-# by a user without breaking FreeIPA internals.
+# by a user without breaking IPA internals.
 #
 # Note: "%" must be quoted as "%%".
 #
diff --git a/install/share/schema.d/README b/install/share/schema.d/README
index 19e3e6832..2a92ec6ae 100644
--- a/install/share/schema.d/README
+++ b/install/share/schema.d/README
@@ -7,8 +7,8 @@ schema files during the run of ipa-server-upgrade utility. Therefore, they are
 also installed when upgrade happens within the process of ipa-server-install.
 
 The directory is installed as /usr/share/ipa/schema.d and is owned by a
-freeipa-server-common package. Therefore, a 3rd-party plugin would need to
-depend on the freeipa-server-common package if it delivers the schema file(s).
+ipa-server-common package. Therefore, a 3rd-party plugin would need to
+depend on the ipa-server-common package if it delivers the schema file(s).
 
 You may place your schema files in a subdirectory too, the code that loads
 schema files processes recursively all subdirectories of schema.d.
diff --git a/install/tools/ipa-adtrust-install.in b/install/tools/ipa-adtrust-install.in
index 93365cc23..707b8873a 100644
--- a/install/tools/ipa-adtrust-install.in
+++ b/install/tools/ipa-adtrust-install.in
@@ -141,11 +141,11 @@ def main():
           "==============")
     print("This program will setup components needed to establish trust to "
           "AD domains for")
-    print("the FreeIPA Server.")
+    print("the IPA Server.")
     print("")
     print("This includes:")
     print("  * Configure Samba")
-    print("  * Add trust related objects to FreeIPA LDAP server")
+    print("  * Add trust related objects to IPA LDAP server")
     # TODO:
     # print "  * Add a SID to all users and Posix groups"
     print("")
diff --git a/install/tools/ipa-replica-conncheck.in b/install/tools/ipa-replica-conncheck.in
index fdc3224d6..a7497789f 100644
--- a/install/tools/ipa-replica-conncheck.in
+++ b/install/tools/ipa-replica-conncheck.in
@@ -291,7 +291,7 @@ class PortResponder(threading.Thread):
         self._sockets = []
         self._close = False
         self._close_lock = threading.Lock()
-        self.responder_data = b'FreeIPA'
+        self.responder_data = b'IPA'
         self.ports_opened = False
         self.ports_open_cond = threading.Condition()
 
diff --git a/install/tools/man/ipa-acme-manage.1 b/install/tools/man/ipa-acme-manage.1
index 07ee48d6f..e15d25bd0 100644
--- a/install/tools/man/ipa-acme-manage.1
+++ b/install/tools/man/ipa-acme-manage.1
@@ -1,17 +1,17 @@
 .\"
 .\" Copyright (C) 2020  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-acme-manage" "1" "Jun 2 2020" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-acme-manage" "1" "Jun 2 2020" "IPA" "IPA Manual Pages"
 .SH "NAME"
-ipa\-acme\-manage \- Manage the FreeIPA ACME service
+ipa\-acme\-manage \- Manage the IPA ACME service
 .SH "SYNOPSIS"
 ipa\-acme\-manage enable|disable|status
 .SH "DESCRIPTION"
 
 Use the \fIipa-acme-manage\fR command to enable, disable or retrieve
-the status of the ACME service on a FreeIPA CA server.
+the status of the ACME service on a IPA CA server.
 
-In a FreeIPA topology all CA servers capable of ACME will
+In a IPA topology all CA servers capable of ACME will
 have the ACME service deployed.  The service is not enabled
 by default.  It is expected that the ACME service will either be
 enabled on all CA servers, or disabled on all CA servers.  However
@@ -33,6 +33,6 @@ Display the status of the ACME service.
 
 1 if an error occurred
 
-2 if the host is not a FreeIPA server
+2 if the host is not a IPA server
 
 3 if the host is not a CA server
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
index b11065806..f70f316f6 100644
--- a/install/tools/man/ipa-adtrust-install.1
+++ b/install/tools/man/ipa-adtrust-install.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Sumit Bose <sbose@redhat.com>
 .\"
-.TH "ipa-adtrust-install" "1" "April 11 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-adtrust-install" "1" "April 11 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-adtrust\-install \- Prepare an IPA server to be able to establish trust relationships with AD domains
 .SH "SYNOPSIS"
@@ -87,7 +87,7 @@ ldapmodify command info the directory server.
 .TP
 \fB\-\-add\-agents\fR
 Add IPA masters to the list that allows to serve information about
-users from trusted forests. Starting with FreeIPA 4.2, a regular IPA master
+users from trusted forests. Starting with IPA 4.2, a regular IPA master
 can provide this information to SSSD clients. IPA masters aren't added
 to the list automatically as restart of the LDAP service on each of them
 is required. The host where ipa\-adtrust\-install is being run is added
diff --git a/install/tools/man/ipa-advise.1 b/install/tools/man/ipa-advise.1
index 4c494aab9..515bbddbe 100644
--- a/install/tools/man/ipa-advise.1
+++ b/install/tools/man/ipa-advise.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Tomas Babej <tbabej@redhat.com>
 .\"
-.TH "ipa-advise" "1" "Jun 10 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-advise" "1" "Jun 10 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-advise \- Provide configurations advice for various use cases.
 .SH "SYNOPSIS"
@@ -41,4 +41,4 @@ Log to the given file
 .SH "EXIT STATUS"
 0 if the command was successful
 
-1 if an error occurred
\ No newline at end of file
+1 if an error occurred
diff --git a/install/tools/man/ipa-backup.1 b/install/tools/man/ipa-backup.1
index 2f0bc9e6a..77d5d7caa 100644
--- a/install/tools/man/ipa-backup.1
+++ b/install/tools/man/ipa-backup.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-backup" "1" "Mar 22 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-backup" "1" "Mar 22 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-backup \- Back up an IPA master
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-ca-install.1 b/install/tools/man/ipa-ca-install.1
index 3ebe32c0a..8e57c0092 100644
--- a/install/tools/man/ipa-ca-install.1
+++ b/install/tools/man/ipa-ca-install.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-ca-install" "1" "Mar 30 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-ca-install" "1" "Mar 30 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-ca\-install \- Install a CA on a server
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-cacert-manage.1 b/install/tools/man/ipa-cacert-manage.1
index 3f8c3464b..c9923846b 100644
--- a/install/tools/man/ipa-cacert-manage.1
+++ b/install/tools/man/ipa-cacert-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Jan Cholasta <jcholast@redhat.com>
 .\"
-.TH "ipa-cacert-manage" "1" "Aug 12 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-cacert-manage" "1" "Aug 12 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-cacert\-manage \- Manage CA certificates in IPA
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-cert-fix.1 b/install/tools/man/ipa-cert-fix.1
index 3edef3118..1ce655965 100644
--- a/install/tools/man/ipa-cert-fix.1
+++ b/install/tools/man/ipa-cert-fix.1
@@ -1,7 +1,7 @@
 .\"
 .\" Copyright (C) 2019  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-cert-fix" "1" "Mar 25 2019" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-cert-fix" "1" "Mar 25 2019" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-cert\-fix \- Renew expired certificates
 .SH "SYNOPSIS"
@@ -9,7 +9,7 @@ ipa\-cert\-fix [options]
 .SH "DESCRIPTION"
 
 \fIipa-cert-fix\fR is a tool for recovery when expired certificates
-prevent the normal operation of FreeIPA.  It should ONLY be used in
+prevent the normal operation of IPA.  It should ONLY be used in
 such scenarios, and backup of the system, especially certificates
 and keys, is \fBSTRONGLY RECOMMENDED\fR.
 
@@ -22,7 +22,7 @@ This tool cannot renew certificates signed by external CAs.  To
 install new, externally-signed HTTP, LDAP or KDC certificates, use
 \fIipa-server-certinstall(1)\fR.
 
-\fIipa-cert-fix\fR will examine FreeIPA and Certificate System
+\fIipa-cert-fix\fR will examine IPA and Certificate System
 certificates and renew certificates that are expired, or close to
 expiry (less than two weeks).  If any "shared" certificates are
 renewed, \fIipa-cert-fix\fR will set the current server to be the CA
diff --git a/install/tools/man/ipa-compat-manage.1 b/install/tools/man/ipa-compat-manage.1
index f22b1743e..26470331a 100644
--- a/install/tools/man/ipa-compat-manage.1
+++ b/install/tools/man/ipa-compat-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Simo Sorce <ssorce@redhat.com>
 .\"
-.TH "ipa-compat-manage" "1" "Dec 2 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-compat-manage" "1" "Dec 2 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-compat\-manage \- Enables or disables the schema compatibility plugin
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-crlgen-manage.1 b/install/tools/man/ipa-crlgen-manage.1
index 1fa48ceca..f17573bbc 100644
--- a/install/tools/man/ipa-crlgen-manage.1
+++ b/install/tools/man/ipa-crlgen-manage.1
@@ -1,7 +1,7 @@
 .\"
 .\" Copyright (C) 2019  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-crlgen-manage" "1" "Feb 12 2019" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-crlgen-manage" "1" "Feb 12 2019" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-crlgen\-manage \- Enables or disables CRL generation
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-csreplica-manage.1 b/install/tools/man/ipa-csreplica-manage.1
index ab5bfddd8..6d039751e 100644
--- a/install/tools/man/ipa-csreplica-manage.1
+++ b/install/tools/man/ipa-csreplica-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-csreplica-manage" "1" "Jul 14 2011" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-csreplica-manage" "1" "Jul 14 2011" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-csreplica\-manage \- Manage an IPA CS replica
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1
index 14e4cd51f..029001eca 100644
--- a/install/tools/man/ipa-dns-install.1
+++ b/install/tools/man/ipa-dns-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-dns-install
 .\" Copyright (C) 2010-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-dns-install" "1" "Jun 28, 2012" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-dns-install" "1" "Jun 28, 2012" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-dns\-install \- Add DNS as a service to an IPA server
 .SH "SYNOPSIS"
@@ -12,7 +12,7 @@ In cases where the IPA server name does not belong to the primary DNS domain and
 
 IPA provides an integrated DNS server which can be used to simplify IPA deployment. If you decide to use it, IPA will automatically maintain SRV and other service records when you change your topology.
 
-The DNS component in FreeIPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
+The DNS component in IPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
 
 This command requires that an IPA server is already installed and configured.
 
diff --git a/install/tools/man/ipa-kra-install.1 b/install/tools/man/ipa-kra-install.1
index 6c8523aa0..5476a4e71 100644
--- a/install/tools/man/ipa-kra-install.1
+++ b/install/tools/man/ipa-kra-install.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Ade Lee <alee@redhat.com>
 .\"
-.TH "ipa-kra-install" "1" "May 10 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-kra-install" "1" "May 10 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-kra\-install \- Install a KRA on a server
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-ldap-updater.1 b/install/tools/man/ipa-ldap-updater.1
index 4893802c2..7ead55bd9 100644
--- a/install/tools/man/ipa-ldap-updater.1
+++ b/install/tools/man/ipa-ldap-updater.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-ldap-updater" "1" "Sep 12 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-ldap-updater" "1" "Sep 12 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-ldap\-updater \- Update the IPA LDAP configuration
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-managed-entries.1 b/install/tools/man/ipa-managed-entries.1
index 3d5ca22b8..edaa0a90d 100644
--- a/install/tools/man/ipa-managed-entries.1
+++ b/install/tools/man/ipa-managed-entries.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Jr Aquino <jr.aquino@citrix.com>
 .\"
-.TH "ipa-managed-entries" "1" "Feb 06 2012" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-managed-entries" "1" "Feb 06 2012" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-managed\-entries \- Enables or disables the schema Managed Entry plugins
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-nis-manage.1 b/install/tools/man/ipa-nis-manage.1
index 93278487c..1107b7790 100644
--- a/install/tools/man/ipa-nis-manage.1
+++ b/install/tools/man/ipa-nis-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-nis-manage" "1" "April 25 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-nis-manage" "1" "April 25 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-nis\-manage \- Enables or disables the NIS listener plugin
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-otptoken-import.1 b/install/tools/man/ipa-otptoken-import.1
index 920a08ca2..fe91040fa 100644
--- a/install/tools/man/ipa-otptoken-import.1
+++ b/install/tools/man/ipa-otptoken-import.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Nathaniel McCallum <npmccallum@redhat.com>
 .\"
-.TH "ipa-otptoken-import" "1" "Jun 12 2014" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-otptoken-import" "1" "Jun 12 2014" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-otptoken\-import \- Imports OTP tokens from RFC 6030 XML file
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-pkinit-manage.1 b/install/tools/man/ipa-pkinit-manage.1
index 5018ce8aa..50d63e921 100644
--- a/install/tools/man/ipa-pkinit-manage.1
+++ b/install/tools/man/ipa-pkinit-manage.1
@@ -1,7 +1,7 @@
 .\"
 .\" Copyright (C) 2017  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-pkinit-manage" "1" "Jun 05 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-pkinit-manage" "1" "Jun 05 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-pkinit\-manage \- Enables or disables PKINIT
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-replica-conncheck.1 b/install/tools/man/ipa-replica-conncheck.1
index 6451f3545..ed441e3be 100644
--- a/install/tools/man/ipa-replica-conncheck.1
+++ b/install/tools/man/ipa-replica-conncheck.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Martin Kosek <mkosek@redhat.com>
 .\"
-.TH "ipa-replica-conncheck" "1" "Jun 2 2011" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-replica-conncheck" "1" "Jun 2 2011" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-replica\-conncheck \- Check a replica\-master network connection before installation
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
index 19d1d9110..44fce10ba 100644
--- a/install/tools/man/ipa-replica-install.1
+++ b/install/tools/man/ipa-replica-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-replica-install
 .\" Copyright (C) 2008-2016  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-replica-install" "1" "Dec 19 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-replica-install" "1" "Dec 19 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-replica\-install \- Create an IPA replica
 .SH "SYNOPSIS"
@@ -12,7 +12,7 @@ Configures a new IPA server that is a replica of the server. Once it has been cr
 
 Domain level 0 is not supported anymore.
 
-To create a replica, the machine only needs to be enrolled in the FreeIPA domain first. This process of turning the IPA client into a replica is also referred to as replica promotion.
+To create a replica, the machine only needs to be enrolled in the IPA domain first. This process of turning the IPA client into a replica is also referred to as replica promotion.
 
 If you're starting with an existing IPA client, simply run ipa\-replica\-install to have it promoted into a replica. The NTP configuration cannot be updated during client promotion. 
 
@@ -229,7 +229,7 @@ ldapmodify command info the directory server.
 .TP
 \fB\-\-add\-agents\fR
 Add IPA masters to the list that allows to serve information about
-users from trusted forests. Starting with FreeIPA 4.2, a regular IPA master
+users from trusted forests. Starting with IPA 4.2, a regular IPA master
 can provide this information to SSSD clients. IPA masters aren't added
 to the list automatically as restart of the LDAP service on each of them
 is required. The host where ipa\-adtrust\-install is being run is added
diff --git a/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
index 239f1591c..2c94278ca 100644
--- a/install/tools/man/ipa-replica-manage.1
+++ b/install/tools/man/ipa-replica-manage.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-replica-manage" "1" "Jul 12 2016" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-replica-manage" "1" "Jul 12 2016" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-replica\-manage \- Manage an IPA replica
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-restore.1 b/install/tools/man/ipa-restore.1
index 5843d5546..bc0755baa 100644
--- a/install/tools/man/ipa-restore.1
+++ b/install/tools/man/ipa-restore.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\"
-.TH "ipa-restore" "1" "Mar 22 2013" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-restore" "1" "Mar 22 2013" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-restore \- Restore an IPA master
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-server-certinstall.1 b/install/tools/man/ipa-server-certinstall.1
index 8798819d7..0aa5315ae 100644
--- a/install/tools/man/ipa-server-certinstall.1
+++ b/install/tools/man/ipa-server-certinstall.1
@@ -16,7 +16,7 @@
 .\" 
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\" 
-.TH "ipa-server-certinstall" "1" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-server-certinstall" "1" "Mar 14 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-server\-certinstall \- Install new SSL server certificates
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
index 1a4d2f658..fdb0f4cb3 100644
--- a/install/tools/man/ipa-server-install.1
+++ b/install/tools/man/ipa-server-install.1
@@ -1,7 +1,7 @@
 .\" A man page for ipa-server-install
 .\" Copyright (C) 2008-2017  FreeIPA Contributors see COPYING for license
 .\"
-.TH "ipa-server-install" "1" "Feb 17 2017" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-server-install" "1" "Feb 17 2017" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-server\-install \- Configure an IPA server
 .SH "SYNOPSIS"
@@ -172,7 +172,7 @@ Install and configure a KRA on this server.
 .SS "DNS OPTIONS"
 IPA provides an integrated DNS server which can be used to simplify IPA deployment. If you decide to use it, IPA will automatically maintain SRV and other service records when you change your topology.
 
-The DNS component in FreeIPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
+The DNS component in IPA is optional and you may choose to manage all your DNS records manually on another third party DNS server. IPA DNS is not a general-purpose DNS server. If you need advanced features like DNS views, do not deploy IPA DNS.
 
 .TP
 \fB\-\-setup\-dns\fR
diff --git a/install/tools/man/ipa-server-upgrade.1 b/install/tools/man/ipa-server-upgrade.1
index cbbdc5901..3db19b0f1 100644
--- a/install/tools/man/ipa-server-upgrade.1
+++ b/install/tools/man/ipa-server-upgrade.1
@@ -2,7 +2,7 @@
 .\" Copyright (C) 2015  FreeIPA Contributors see COPYING for license
 .\"
 
-.TH "ipa-server-upgrade" "1" "April 02 2015" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-server-upgrade" "1" "April 02 2015" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-server\-upgrade \- upgrade IPA server
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipa-winsync-migrate.1 b/install/tools/man/ipa-winsync-migrate.1
index 88702bad6..1812f6348 100644
--- a/install/tools/man/ipa-winsync-migrate.1
+++ b/install/tools/man/ipa-winsync-migrate.1
@@ -16,7 +16,7 @@
 .\"
 .\" Author: Tomas Babej <tbabej@redhat.com>
 .\"
-.TH "ipa-winsync-migrate" "1" "Mar 10 2015" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipa-winsync-migrate" "1" "Mar 10 2015" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipa\-winsync\-migrate \- Seamless migration of AD users created by winsync to native AD users.
 .SH "SYNOPSIS"
diff --git a/install/tools/man/ipactl.8 b/install/tools/man/ipactl.8
index df7baf585..8fdc09632 100644
--- a/install/tools/man/ipactl.8
+++ b/install/tools/man/ipactl.8
@@ -16,7 +16,7 @@
 .\" 
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\" 
-.TH "ipactl" "8" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
+.TH "ipactl" "8" "Mar 14 2008" "IPA" "IPA Manual Pages"
 .SH "NAME"
 ipactl \- IPA Server Control Interface
 .SH "SYNOPSIS"
diff --git a/install/ui/index.html b/install/ui/index.html
index bc0f0cd1e..d1eacaf53 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
diff --git a/install/ui/reset_password.html b/install/ui/reset_password.html
index e5700c964..a4ea1ce0e 100644
--- a/install/ui/reset_password.html
+++ b/install/ui/reset_password.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js
index 3a139555a..b0f75885d 100644
--- a/install/ui/src/freeipa/widgets/App.js
+++ b/install/ui/src/freeipa/widgets/App.js
@@ -187,7 +187,7 @@ define(['dojo/_base/declare',
 
             construct.create('img', {
                 src: 'images/header-logo.png',
-                alt: 'FreeIPA' // TODO: replace with configuration value
+                alt: 'Identity Management' // TODO: replace with configuration value
             }, this.brand_node);
 
             return this.brand_node;
diff --git a/install/ui/sync_otp.html b/install/ui/sync_otp.html
index 5814b6c57..36a51ca62 100644
--- a/install/ui/sync_otp.html
+++ b/install/ui/sync_otp.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>IPA: Identity Policy Audit</title>
+    <title>Identity Management</title>
 
     <!--[if IE]>
     <meta id="ie-detector">
diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index 8fa499944..4b51d9745 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -8689,7 +8689,7 @@
                   "label" : "Clock offset",
                   "confirm" : true,
                   "alwaysask" : false,
-                  "doc" : "TOTP token / FreeIPA server time difference",
+                  "doc" : "TOTP token / IPA server time difference",
                   "deprecated" : false,
                   "flags" : [
                      "no_update"
@@ -29875,7 +29875,7 @@
                   "primary_key" : false,
                   "alwaysask" : false,
                   "deprecated" : false,
-                  "doc" : "TOTP token / FreeIPA server time difference",
+                  "doc" : "TOTP token / IPA server time difference",
                   "flags" : [
                      "no_update"
                   ],
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index 90514493a..973cdb73e 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -21192,7 +21192,7 @@
                   "autofill" : true,
                   "multivalue" : false,
                   "deprecated" : false,
-                  "doc" : "TOTP token / FreeIPA server time difference",
+                  "doc" : "TOTP token / IPA server time difference",
                   "primary_key" : false,
                   "cli_metavar" : "INT",
                   "default" : 0,
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index dac6bbfc0..8acfa0cd1 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -2104,7 +2104,7 @@ def install_check(options):
     global client_domain
     global cli_basedn
 
-    print("This program will set up FreeIPA client.")
+    print("This program will set up IPA client.")
     print("Version {}".format(version.VERSION))
     print("")
 
diff --git a/ipaclient/remote_plugins/2_114/otptoken.py b/ipaclient/remote_plugins/2_114/otptoken.py
index 632c97ea2..d3edb589d 100644
--- a/ipaclient/remote_plugins/2_114/otptoken.py
+++ b/ipaclient/remote_plugins/2_114/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
             'ipatokentotpclockoffset',
             required=False,
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
         ),
         parameters.Int(
             'ipatokentotptimestep',
@@ -263,7 +263,7 @@ class otptoken_add(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
         ),
@@ -553,7 +553,7 @@ class otptoken_find(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
         ),
         parameters.Int(
diff --git a/ipaclient/remote_plugins/2_114/sudorule.py b/ipaclient/remote_plugins/2_114/sudorule.py
index 808720e42..4b020738f 100644
--- a/ipaclient/remote_plugins/2_114/sudorule.py
+++ b/ipaclient/remote_plugins/2_114/sudorule.py
@@ -24,7 +24,7 @@ give certain users (or groups of users) the ability to run some (or all)
 commands as root or another user while providing an audit trail of the
 commands and their arguments.
 
-FreeIPA provides a means to configure the various aspects of Sudo:
+IPA provides a means to configure the various aspects of Sudo:
    Users: The user(s)/group(s) allowed to invoke Sudo.
    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
    Allow Command: The specific command(s) permitted to be run via Sudo.
@@ -37,7 +37,7 @@ An order can be added to a sudorule to control the order in which they
 are evaluated (if the client supports it). This order is an integer and
 must be unique.
 
-FreeIPA provides a designated binddn to use with Sudo located at:
+IPA provides a designated binddn to use with Sudo located at:
 uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 
 To enable the binddn run the following command to set the password:
diff --git a/ipaclient/remote_plugins/2_156/certprofile.py b/ipaclient/remote_plugins/2_156/certprofile.py
index b612342a1..1727f6d2e 100644
--- a/ipaclient/remote_plugins/2_156/certprofile.py
+++ b/ipaclient/remote_plugins/2_156/certprofile.py
@@ -55,7 +55,7 @@ PROFILE CONFIGURATION FORMAT:
 The profile configuration format is the raw property-list format
 used by Dogtag Certificate System.  The XML format is not supported.
 
-The following restrictions apply to profiles managed by FreeIPA:
+The following restrictions apply to profiles managed by IPA:
 
 - When importing a profile the "profileId" field, if present, must
   match the ID given on the command line.
diff --git a/ipaclient/remote_plugins/2_156/otptoken.py b/ipaclient/remote_plugins/2_156/otptoken.py
index 0b2b54c6e..e674d465d 100644
--- a/ipaclient/remote_plugins/2_156/otptoken.py
+++ b/ipaclient/remote_plugins/2_156/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
             'ipatokentotpclockoffset',
             required=False,
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
         ),
         parameters.Int(
             'ipatokentotptimestep',
@@ -263,7 +263,7 @@ class otptoken_add(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
         ),
@@ -553,7 +553,7 @@ class otptoken_find(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
         ),
         parameters.Int(
diff --git a/ipaclient/remote_plugins/2_156/sudorule.py b/ipaclient/remote_plugins/2_156/sudorule.py
index 5d185ed31..d475e68a6 100644
--- a/ipaclient/remote_plugins/2_156/sudorule.py
+++ b/ipaclient/remote_plugins/2_156/sudorule.py
@@ -24,7 +24,7 @@ give certain users (or groups of users) the ability to run some (or all)
 commands as root or another user while providing an audit trail of the
 commands and their arguments.
 
-FreeIPA provides a means to configure the various aspects of Sudo:
+IPA provides a means to configure the various aspects of Sudo:
    Users: The user(s)/group(s) allowed to invoke Sudo.
    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
    Allow Command: The specific command(s) permitted to be run via Sudo.
@@ -37,7 +37,7 @@ An order can be added to a sudorule to control the order in which they
 are evaluated (if the client supports it). This order is an integer and
 must be unique.
 
-FreeIPA provides a designated binddn to use with Sudo located at:
+IPA provides a designated binddn to use with Sudo located at:
 uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 
 To enable the binddn run the following command to set the password:
diff --git a/ipaclient/remote_plugins/2_164/certprofile.py b/ipaclient/remote_plugins/2_164/certprofile.py
index b612342a1..1727f6d2e 100644
--- a/ipaclient/remote_plugins/2_164/certprofile.py
+++ b/ipaclient/remote_plugins/2_164/certprofile.py
@@ -55,7 +55,7 @@ PROFILE CONFIGURATION FORMAT:
 The profile configuration format is the raw property-list format
 used by Dogtag Certificate System.  The XML format is not supported.
 
-The following restrictions apply to profiles managed by FreeIPA:
+The following restrictions apply to profiles managed by IPA:
 
 - When importing a profile the "profileId" field, if present, must
   match the ID given on the command line.
diff --git a/ipaclient/remote_plugins/2_164/otptoken.py b/ipaclient/remote_plugins/2_164/otptoken.py
index 0b2b54c6e..e674d465d 100644
--- a/ipaclient/remote_plugins/2_164/otptoken.py
+++ b/ipaclient/remote_plugins/2_164/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
             'ipatokentotpclockoffset',
             required=False,
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
         ),
         parameters.Int(
             'ipatokentotptimestep',
@@ -263,7 +263,7 @@ class otptoken_add(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
         ),
@@ -553,7 +553,7 @@ class otptoken_find(Method):
             required=False,
             cli_name='offset',
             label=_(u'Clock offset'),
-            doc=_(u'TOTP token / FreeIPA server time difference'),
+            doc=_(u'TOTP token / IPA server time difference'),
             default=0,
         ),
         parameters.Int(
diff --git a/ipaclient/remote_plugins/2_164/sudorule.py b/ipaclient/remote_plugins/2_164/sudorule.py
index 5d185ed31..d475e68a6 100644
--- a/ipaclient/remote_plugins/2_164/sudorule.py
+++ b/ipaclient/remote_plugins/2_164/sudorule.py
@@ -24,7 +24,7 @@ give certain users (or groups of users) the ability to run some (or all)
 commands as root or another user while providing an audit trail of the
 commands and their arguments.
 
-FreeIPA provides a means to configure the various aspects of Sudo:
+IPA provides a means to configure the various aspects of Sudo:
    Users: The user(s)/group(s) allowed to invoke Sudo.
    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
    Allow Command: The specific command(s) permitted to be run via Sudo.
@@ -37,7 +37,7 @@ An order can be added to a sudorule to control the order in which they
 are evaluated (if the client supports it). This order is an integer and
 must be unique.
 
-FreeIPA provides a designated binddn to use with Sudo located at:
+IPA provides a designated binddn to use with Sudo located at:
 uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 
 To enable the binddn run the following command to set the password:
diff --git a/ipaclient/remote_plugins/2_49/sudorule.py b/ipaclient/remote_plugins/2_49/sudorule.py
index 3d01ecdf2..912a0b1ef 100644
--- a/ipaclient/remote_plugins/2_49/sudorule.py
+++ b/ipaclient/remote_plugins/2_49/sudorule.py
@@ -24,7 +24,7 @@ give certain users (or groups of users) the ability to run some (or all)
 commands as root or another user while providing an audit trail of the
 commands and their arguments.
 
-FreeIPA provides a means to configure the various aspects of Sudo:
+IPA provides a means to configure the various aspects of Sudo:
    Users: The user(s)/group(s) allowed to invoke Sudo.
    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
    Allow Command: The specific command(s) permitted to be run via Sudo.
@@ -37,13 +37,13 @@ An order can be added to a sudorule to control the order in which they
 are evaluated (if the client supports it). This order is an integer and
 must be unique.
 
-FreeIPA provides a designated binddn to use with Sudo located at:
+IPA provides a designated binddn to use with Sudo located at:
 uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 
 To enable the binddn run the following command to set the password:
 LDAPTLS_CACERT=/etc/ipa/ca.crt /usr/bin/ldappasswd -S -W -h ipa.example.com -ZZ -D "cn=Directory Manager" uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 
-For more information, see the FreeIPA Documentation to Sudo.
+For more information, see the IPA Documentation to Sudo.
 """)
 
 register = Registry()
diff --git a/ipalib/pkcs10.py b/ipalib/pkcs10.py
index 2756c8568..590ce0757 100644
--- a/ipalib/pkcs10.py
+++ b/ipalib/pkcs10.py
@@ -2,7 +2,7 @@ from __future__ import print_function
 import sys
 
 print(
-    "ipalib.pkcs10 module is deprecated and will be removed in FreeIPA 4.6. "
+    "ipalib.pkcs10 module is deprecated and will be removed in IPA 4.6. "
     "To load CSRs, please, use python-cryptography instead.",
     file=sys.stderr
 )
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 01746cb4e..c3d051349 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -282,7 +282,7 @@ class _JSONPrimer(dict):
 
     Prepare a data structure for JSON serialization. In an ideal world, priming
     could be handled by the default hook of json.dumps(). Unfortunately the
-    hook treats Python 2 str as text while FreeIPA considers str as bytes.
+    hook treats Python 2 str as text while IPA considers str as bytes.
 
     The primer uses a couple of tricks to archive maximum performance:
 
diff --git a/ipalib/util.py b/ipalib/util.py
index e3a510fc7..f63ae1b08 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -242,7 +242,7 @@ def normalize_zone(zone):
 def get_proper_tls_version_span(tls_version_min, tls_version_max):
     """
     This function checks whether the given TLS versions are known in
-    FreeIPA and that these versions fulfill the requirements for minimal
+    IPA and that these versions fulfill the requirements for minimal
     TLS version (see
     `ipalib.constants: TLS_VERSIONS, TLS_VERSION_MINIMAL`).
 
diff --git a/ipalib/x509.py b/ipalib/x509.py
index 0ee710f1f..402e0e9ff 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -92,7 +92,7 @@ SAN_KRB5PRINCIPALNAME = '1.3.6.1.5.2.2'
 class IPACertificate:
     """
     A proxy class wrapping a python-cryptography certificate representation for
-    FreeIPA purposes
+    IPA purposes
     """
     def __init__(self, cert, backend=None):
         """
diff --git a/ipaserver/advise/plugins/legacy_clients.py b/ipaserver/advise/plugins/legacy_clients.py
index 2a56922b8..0e322fe96 100644
--- a/ipaserver/advise/plugins/legacy_clients.py
+++ b/ipaserver/advise/plugins/legacy_clients.py
@@ -94,7 +94,7 @@ class config_redhat_sssd_before_1_9(config_base_legacy_client):
     Legacy client configuration for Red Hat based systems, using SSSD.
     """
     description = ('Instructions for configuring a system with an old version '
-                   'of SSSD (1.5-1.8) as a FreeIPA client. This set of '
+                   'of SSSD (1.5-1.8) as a IPA client. This set of '
                    'instructions is targeted for platforms that include '
                    'the authconfig utility, which are all Red Hat based '
                    'platforms.')
@@ -129,7 +129,7 @@ class config_generic_linux_sssd_before_1_9(config_base_legacy_client):
     using SSSD.
     """
     description = ('Instructions for configuring a system with an old version '
-                   'of SSSD (1.5-1.8) as a FreeIPA client. This set of '
+                   'of SSSD (1.5-1.8) as a IPA client. This set of '
                    'instructions is targeted for linux systems that do not '
                    'include the authconfig utility.')
 
@@ -184,7 +184,7 @@ class config_redhat_nss_pam_ldapd(config_base_legacy_client):
     using nss-pam-ldapd.
     """
     description = ('Instructions for configuring a system with nss-pam-ldapd '
-                   'as a FreeIPA client. This set of instructions is targeted '
+                   'as a IPA client. This set of instructions is targeted '
                    'for platforms that include the authconfig utility, which '
                    'are all Red Hat based platforms.')
 
@@ -352,7 +352,7 @@ class config_redhat_nss_ldap(config_base_legacy_client):
     using nss-ldap.
     """
     description = ('Instructions for configuring a system with nss-ldap '
-                   'as a FreeIPA client. This set of instructions is targeted '
+                   'as a IPA client. This set of instructions is targeted '
                    'for platforms that include the authconfig utility, which '
                    'are all Red Hat based platforms.')
 
diff --git a/ipaserver/advise/plugins/smart_card_auth.py b/ipaserver/advise/plugins/smart_card_auth.py
index 0709ec402..a067f366c 100644
--- a/ipaserver/advise/plugins/smart_card_auth.py
+++ b/ipaserver/advise/plugins/smart_card_auth.py
@@ -97,7 +97,7 @@ class config_server_for_smart_card_auth(common_smart_card_auth_config):
     """
 
     description = ("Instructions for enabling Smart Card authentication on "
-                   " a single FreeIPA server. Includes Apache configuration, "
+                   " a single IPA server. Includes Apache configuration, "
                    "enabling PKINIT on KDC and configuring WebUI to accept "
                    "Smart Card auth requests. To enable the feature in the "
                    "whole topology you have to run the script on each master")
@@ -244,11 +244,11 @@ class config_server_for_smart_card_auth(common_smart_card_auth_config):
 @register()
 class config_client_for_smart_card_auth(common_smart_card_auth_config):
     """
-    Configures smart card authentication on FreeIPA client
+    Configures smart card authentication on IPA client
     """
 
     description = ("Instructions for enabling Smart Card authentication on "
-                   " a single FreeIPA client. Configures Smart Card daemon, "
+                   " a single IPA client. Configures Smart Card daemon, "
                    "set the system-wide trust store and configures SSSD to "
                    "allow smart card logins to desktop")
 
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 2e716570d..e62fc4ddc 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -1581,7 +1581,7 @@ def fetch_domains(api, mydomain, trustdomain, creds=None, server=None):
     def communicate(td):
         td.init_lsa_pipe(td.info['dc'])
         netr_pipe = netlogon.netlogon(td.binding, td.parm, td.creds)
-        # Older FreeIPA versions used netr_DsrEnumerateDomainTrusts call
+        # Older IPA versions used netr_DsrEnumerateDomainTrusts call
         # but it doesn't provide information about non-domain UPNs associated
         # with the forest, thus we have to use netr_DsRGetForestTrustInformation
         domains = netr_pipe.netr_DsRGetForestTrustInformation(td.info['dc'],
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
index 9cd897872..b51b92bfd 100644
--- a/ipaserver/install/dns.py
+++ b/ipaserver/install/dns.py
@@ -154,7 +154,7 @@ def install_check(standalone, api, replica, options, hostname):
 
     if standalone:
         print("==============================================================================")
-        print("This program will setup DNS for the FreeIPA Server.")
+        print("This program will setup DNS for the IPA Server.")
         print("")
         print("This includes:")
         print("  * Configure DNS (bind)")
diff --git a/ipaserver/install/ipa_cert_fix.py b/ipaserver/install/ipa_cert_fix.py
index 5279616de..2f2c15613 100644
--- a/ipaserver/install/ipa_cert_fix.py
+++ b/ipaserver/install/ipa_cert_fix.py
@@ -50,7 +50,7 @@ msg = """
                           WARNING
 
 ipa-cert-fix is intended for recovery when expired certificates
-prevent the normal operation of FreeIPA.  It should ONLY be used
+prevent the normal operation of IPA.  It should ONLY be used
 in such scenarios, and backup of the system, especially certificates
 and keys, is STRONGLY RECOMMENDED.
 
diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py
index 159f02e51..04ac94bf5 100644
--- a/ipaserver/install/ipa_kra_install.py
+++ b/ipaserver/install/ipa_kra_install.py
@@ -93,7 +93,7 @@ class KRAInstall(admintool.AdminTool):
         if options.uninstall:
             sys.exit(
                 'ERROR: Standalone KRA uninstallation was removed in '
-                'FreeIPA 4.5 as it had never worked properly and only caused '
+                'IPA 4.5 as it had never worked properly and only caused '
                 'issues.')
         else:
             return KRAInstaller
@@ -104,7 +104,7 @@ class KRAInstaller(KRAInstall):
 
     INSTALLER_START_MESSAGE = '''
         ===================================================================
-        This program will setup Dogtag KRA for the FreeIPA Server.
+        This program will setup Dogtag KRA for the IPA Server.
 
     '''
 
diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
index ad875b4d3..9d6ca47d3 100644
--- a/ipaserver/install/plugins/dns.py
+++ b/ipaserver/install/plugins/dns.py
@@ -161,11 +161,11 @@ class update_ipaconfigstring_dnsversion_to_ipadnsversion(Updater):
 @register()
 class update_dnszones(Updater):
     """
-    Update all zones to meet requirements in the new FreeIPA versions
+    Update all zones to meet requirements in the new IPA versions
 
     1) AllowQuery and AllowTransfer
     Set AllowQuery and AllowTransfer ACLs in all zones that may be configured
-    in an upgraded FreeIPA instance.
+    in an upgraded IPA instance.
 
     Upgrading to new version of bind-dyndb-ldap and having these ACLs empty
     would result in a leak of potentially sensitive DNS information as
@@ -173,7 +173,7 @@ class update_dnszones(Updater):
     or LDAP.
 
     This plugin disables the zone transfer by default so that it needs to be
-    explicitly enabled by FreeIPA Administrator.
+    explicitly enabled by IPA Administrator.
 
     2) Update policy
     SSH public key support includes a feature to automatically add/update
@@ -272,7 +272,7 @@ class update_dns_limits(Updater):
 @register()
 class update_master_to_dnsforwardzones(DNSUpdater):
     """
-    Update all zones to meet requirements in the new FreeIPA versions
+    Update all zones to meet requirements in the new IPA versions
 
     All masters zones with specified forwarders, and forward-policy different
     than none, will be tranformed to forward zones.
@@ -420,7 +420,7 @@ class update_dnsforward_emptyzones(DNSUpdater):
 
     BIND ignores conflicting forwarding configuration
     when forwarding policy != only.
-    bind-dyndb-ldap 9.0+ will do the same so we have to adjust FreeIPA zones
+    bind-dyndb-ldap 9.0+ will do the same so we have to adjust IPA zones
     accordingly.
     """
     backup_filename = u'dns-forwarding-empty-zones-%Y-%m-%d-%H-%M-%S.ldif'
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 6d4b30a86..5a3e5e565 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -1821,7 +1821,7 @@ class ReplicationManager:
         Ensure that the 'cn=replication managers,cn=sysaccounts' group exists
         and contains the principals for master and remote replica
 
-        On FreeIPA 3.x masters lacking support for nsds5ReplicaBinddnGroup
+        On IPA 3.x masters lacking support for nsds5ReplicaBinddnGroup
         attribute, add replica bind DN directly into the replica entry.
         """
         my_dn = DN(
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index bc77f8a68..b01fd85a5 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -427,7 +427,7 @@ def install_check(installer):
 
     print("======================================="
           "=======================================")
-    print("This program will set up the FreeIPA Server.")
+    print("This program will set up the IPA Server.")
     print("Version {}".format(version.VERSION))
     print("")
     print("This includes:")
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index f75f5fd99..73967a224 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -623,7 +623,7 @@ def check_domain_level_is_supported(current):
     above_upper_bound = current > constants.MAX_DOMAIN_LEVEL
 
     if under_lower_bound or above_upper_bound:
-        message = ("This version of FreeIPA does not support "
+        message = ("This version of IPA does not support "
                    "the Domain Level which is currently set for "
                    "this domain. The Domain Level needs to be "
                    "raised before installing a replica with "
diff --git a/ipaserver/plugins/certmap.py b/ipaserver/plugins/certmap.py
index ee8f0c15f..cdbc38f70 100644
--- a/ipaserver/plugins/certmap.py
+++ b/ipaserver/plugins/certmap.py
@@ -614,7 +614,7 @@ class certmap_match(Search):
         The search is performed using SSSD's DBus interface
         Users.ListByCertificate.
         SSSD does the lookup based on certificate mapping rules, using
-        FreeIPA domain and trusted domains.
+        IPA domain and trusted domains.
         :raise RemoteRetrieveError: if DBus returns an exception
         """
         sssd = _sssd()
diff --git a/ipaserver/plugins/certprofile.py b/ipaserver/plugins/certprofile.py
index ffede6e3f..978fce8a5 100644
--- a/ipaserver/plugins/certprofile.py
+++ b/ipaserver/plugins/certprofile.py
@@ -57,7 +57,7 @@ PROFILE CONFIGURATION FORMAT:
 The profile configuration format is the raw property-list format
 used by Dogtag Certificate System.  The XML format is not supported.
 
-The following restrictions apply to profiles managed by FreeIPA:
+The following restrictions apply to profiles managed by IPA:
 
 - When importing a profile the "profileId" field, if present, must
   match the ID given on the command line.
diff --git a/ipaserver/plugins/config.py b/ipaserver/plugins/config.py
index e96e51971..ace66e589 100644
--- a/ipaserver/plugins/config.py
+++ b/ipaserver/plugins/config.py
@@ -462,7 +462,7 @@ class config(LDAPObject):
 
         known_domains = self.gather_trusted_domains()
 
-        # add FreeIPA domain to the list of domains. This one is always enabled
+        # add IPA domain to the list of domains. This one is always enabled
         known_domains.update({self.api.env.domain: True})
 
         for domain in submitted_domains:
diff --git a/ipaserver/plugins/otptoken.py b/ipaserver/plugins/otptoken.py
index 72ed5393d..46e4d5e8d 100644
--- a/ipaserver/plugins/otptoken.py
+++ b/ipaserver/plugins/otptoken.py
@@ -245,7 +245,7 @@ class otptoken(LDAPObject):
         Int('ipatokentotpclockoffset?',
             cli_name='offset',
             label=_('Clock offset'),
-            doc=_('TOTP token / FreeIPA server time difference'),
+            doc=_('TOTP token / IPA server time difference'),
             default=0,
             autofill=True,
             flags=('no_update'),
diff --git a/ipaserver/plugins/sudorule.py b/ipaserver/plugins/sudorule.py
index 6d01b330c..3b0d17d4f 100644
--- a/ipaserver/plugins/sudorule.py
+++ b/ipaserver/plugins/sudorule.py
@@ -48,7 +48,7 @@ give certain users (or groups of users) the ability to run some (or all)
 commands as root or another user while providing an audit trail of the
 commands and their arguments.
 """) + _("""
-FreeIPA provides a means to configure the various aspects of Sudo:
+IPA provides a means to configure the various aspects of Sudo:
    Users: The user(s)/group(s) allowed to invoke Sudo.
    Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke Sudo.
    Allow Command: The specific command(s) permitted to be run via Sudo.
@@ -61,7 +61,7 @@ An order can be added to a sudorule to control the order in which they
 are evaluated (if the client supports it). This order is an integer and
 must be unique.
 """) + _("""
-FreeIPA provides a designated binddn to use with Sudo located at:
+IPA provides a designated binddn to use with Sudo located at:
 uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com
 """) + _("""
 To enable the binddn run the following command to set the password:
diff --git a/po/de.po b/po/de.po
index 3d818c760..3b5835578 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3644,7 +3644,7 @@ msgstr "TOTP Sychnronisierungsfenster"
 msgid "TOTP authentication Window"
 msgstr "TOTP Authentifizierungsfenster"
 
-msgid "TOTP token / FreeIPA server time difference"
+msgid "TOTP token / IPA server time difference"
 msgstr "Differenz zwischen Token und Serverzeit"
 
 msgid "Target"
diff --git a/po/es.po b/po/es.po
index 506253b37..afa6ac777 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3056,7 +3056,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -3114,7 +3114,7 @@ msgstr ""
 "propiedad\n"
 "usado por Dogtag Certificate System.  No está soportado el formato XML.\n"
 "\n"
-"A los perfiles manejados por FreeIPA se les aplican las siguientes "
+"A los perfiles manejados por IPA se les aplican las siguientes "
 "restricciones:\n"
 "\n"
 "- Cuando se importa un perfil el campo \"profileId\", si está presente, debe "
@@ -4903,7 +4903,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -4918,7 +4918,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -4926,7 +4926,7 @@ msgid ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"For more information, see the FreeIPA Documentation to Sudo.\n"
+"For more information, see the IPA Documentation to Sudo.\n"
 msgstr ""
 "\n"
 "Reglas Sudo\n"
@@ -4939,7 +4939,7 @@ msgstr ""
 "auditoria de\n"
 " los comandos y sus argumentos.\n"
 "\n"
-"FreeIPA proporciona un medio para configurar diversos aspectos de Sudo:\n"
+"IPA proporciona un medio para configurar diversos aspectos de Sudo:\n"
 "   Users: Los usuario(s)/grupos(s) que tienen permitido llamar a Sudo.\n"
 "   Hosts: Loshost(s)/grupo(s) de host a los que el usuario permite llamar a "
 "Sudo.\n"
@@ -4957,7 +4957,7 @@ msgstr ""
 "será evaluada\n"
 "(si el cliente lo soporta). Este orden es un entero y debe ser único.\n"
 "\n"
-"FreeIPA suministra un binddn designado para usar con Sudo situado en :\n"
+"IPA suministra un binddn designado para usar con Sudo situado en :\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "Para habilitar el binddn ejecute el siguiente comando para fijar la "
@@ -4966,7 +4966,7 @@ msgstr ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"Para más información, vea la Documentación FreeIPA para Sudo.\n"
+"Para más información, vea la Documentación IPA para Sudo.\n"
 
 msgid ""
 "\n"
@@ -12604,8 +12604,8 @@ msgstr "Variación del tiempo de autenticación TOTP (segundos)"
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Variación del tiempo de sincronización TOTP (segundos)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Ficha TOTP / Diferencia de hora del servidor FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Ficha TOTP / Diferencia de hora del servidor IPA"
 
 msgid "Take a revoked certificate off hold."
 msgstr "Tomar un certificado revocado de espera."
diff --git a/po/fr.po b/po/fr.po
index ee23e1c28..987b0db0f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2575,17 +2575,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 msgstr ""
 "\n"
-"FreeIPA permet la désignation d'un « binddn » à utiliser avec sudo situé "
+"IPA permet la désignation d'un « binddn » à utiliser avec sudo situé "
 "à :\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -2597,7 +2597,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"FreeIPA offre les moyens de configurer les divers aspects de sudo :\n"
+"IPA offre les moyens de configurer les divers aspects de sudo :\n"
 "   Users : utilisateur/groupe autorisés à invoquer sudo.\n"
 "   Hosts : hôte/groupe d'hôte dont l'utilisateur peut invoquer sudo.\n"
 "   Allow Command : commande donnée pouvant être exécutée via sudo.\n"
@@ -3708,7 +3708,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -3770,7 +3770,7 @@ msgstr ""
 "propriété utilisé par Dogtag Certificate System.  Le format  XML n'est\n"
 "pas pris en charge.\n"
 "\n"
-"Les restrictions suivantes s'appliquent aux profils gérés par FreeIPA :\n"
+"Les restrictions suivantes s'appliquent aux profils gérés par IPA :\n"
 "\n"
 "- Lors de l'import d'un profil, le champ « profileId » s'il est présent "
 "doit\n"
@@ -15617,8 +15617,8 @@ msgstr "Durée de la fenêtre d'authentification TOTP (secondes)"
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Variance temporelle de synchronisation TOTP (secondes)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Différence entre le jeton TOTP et le serveur FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Différence entre le jeton TOTP et le serveur IPA"
 
 msgid "TSIG record"
 msgstr "Enregistrement TSIG"
diff --git a/po/ru.po b/po/ru.po
index 770cf1eb1..e626f9072 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5261,17 +5261,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 msgstr ""
 "\n"
-"FreeIPA предусматривает специальную привязку DN (binddn) для использования с "
+"IPA предусматривает специальную привязку DN (binddn) для использования с "
 "Sudo:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -5283,7 +5283,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"FreeIPA предоставляет возможности настройки различных аспектов Sudo:\n"
+"IPA предоставляет возможности настройки различных аспектов Sudo:\n"
 "   Users: пользователь (пользователи) или группа (группы), которые могут "
 "вызывать Sudo.\n"
 "   Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
@@ -7779,7 +7779,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -7833,7 +7833,7 @@ msgstr ""
 "свойств, который используется системой сертификации Dogtag Certificate "
 "System.  Поддержка формата XML не предусмотрена.\n"
 "\n"
-"К профилям под управлением  FreeIPA применяются следующие ограничения:\n"
+"К профилям под управлением  IPA применяются следующие ограничения:\n"
 "\n"
 "- При импорте профиля значение поля \"profileId\", если это поле имеется, "
 "должно совпадать с идентификатором, указанным в командной строке.\n"
@@ -7889,7 +7889,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -7945,7 +7945,7 @@ msgstr ""
 "свойств, который используется системой сертификации Dogtag Certificate "
 "System.  Поддержка формата XML не предусмотрена.\n"
 "\n"
-"К профилям под управлением  FreeIPA применяются следующие ограничения:\n"
+"К профилям под управлением  IPA применяются следующие ограничения:\n"
 "\n"
 "- При импорте профиля значение поля \"profileId\", если это поле имеется, "
 "должно совпадать с идентификатором, указанным в командной строке.\n"
@@ -13725,7 +13725,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -13740,7 +13740,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -13778,7 +13778,7 @@ msgstr ""
 "пользователя \"root\" или другого пользователя, вместе с тем предоставляя "
 "журнал аудита команд и их аргументов.\n"
 "\n"
-"FreeIPA предоставляет возможности настройки различных аспектов Sudo:\n"
+"IPA предоставляет возможности настройки различных аспектов Sudo:\n"
 "   Users: пользователь (пользователи) или группа (группы), которые могут "
 "вызывать Sudo.\n"
 "   Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
@@ -13799,7 +13799,7 @@ msgstr ""
 "Порядок определяется числовым индексом (целое число), который не должен "
 "повторяться.\n"
 "\n"
-"FreeIPA предусматривает специальную привязку DN (binddn) для использования с "
+"IPA предусматривает специальную привязку DN (binddn) для использования с "
 "Sudo:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -13840,7 +13840,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -13855,7 +13855,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -13863,7 +13863,7 @@ msgid ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"For more information, see the FreeIPA Documentation to Sudo.\n"
+"For more information, see the IPA Documentation to Sudo.\n"
 msgstr ""
 "\n"
 "Правила Sudo\n"
@@ -13874,7 +13874,7 @@ msgstr ""
 "пользователя \"root\" или другого пользователя, вместе с тем предоставляя "
 "журнал аудита команд и их аргументов.\n"
 "\n"
-"FreeIPA предоставляет возможности настройки различных аспектов Sudo:\n"
+"IPA предоставляет возможности настройки различных аспектов Sudo:\n"
 "   Users: пользователь (пользователи) или группа (группы), которые могут "
 "вызывать Sudo.\n"
 "   Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
@@ -13895,7 +13895,7 @@ msgstr ""
 "Порядок определяется числовым индексом (целое число), который не должен "
 "повторяться.\n"
 "\n"
-"FreeIPA предусматривает специальную привязку DN (binddn) для использования с "
+"IPA предусматривает специальную привязку DN (binddn) для использования с "
 "Sudo:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -13904,7 +13904,7 @@ msgstr ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"Дополнительные сведения приведены в документации FreeIPA по Sudo.\n"
+"Дополнительные сведения приведены в документации IPA по Sudo.\n"
 
 msgid ""
 "\n"
@@ -27149,8 +27149,8 @@ msgstr "Отклонение по времени TOTP-аутентификаци
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Отклонение по времени TOTP-синхронизации (в секундах)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Разница времени между токеном TOTP и сервером FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Разница времени между токеном TOTP и сервером IPA"
 
 msgid "TSIG record"
 msgstr "Запись TSIG"
diff --git a/po/uk.po b/po/uk.po
index c6d36f541..a054401ac 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5411,17 +5411,17 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 msgstr ""
 "\n"
-"У FreeIPA передбачено визначений binddn для використання з sudo, який "
+"У IPA передбачено визначений binddn для використання з sudo, який "
 "розташовано у\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -5433,7 +5433,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"У FreeIPA передбачено декілька параметрів налаштовування роботи sudo:\n"
+"У IPA передбачено декілька параметрів налаштовування роботи sudo:\n"
 "   Users: користувачі або групи, які можуть викликати sudo.\n"
 "   Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
 "   Allow Command: специфічні команди, які можна виконувати за допомогою "
@@ -9393,7 +9393,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -9447,7 +9447,7 @@ msgstr ""
 "властивостей, що використовується системою сертифікації Dogtag.\n"
 "Підтримки формату XML не передбачено.\n"
 "\n"
-"Профілів, які керуються FreeIPA, стосуються такі обмеження:\n"
+"Профілів, які керуються IPA, стосуються такі обмеження:\n"
 "\n"
 "- Під час імпортування профілю поле «profileId», якщо таке є, має\n"
 "  містити значення, що збігається з ідентифікатором, вказаним у рядку "
@@ -9504,7 +9504,7 @@ msgid ""
 "The profile configuration format is the raw property-list format\n"
 "used by Dogtag Certificate System.  The XML format is not supported.\n"
 "\n"
-"The following restrictions apply to profiles managed by FreeIPA:\n"
+"The following restrictions apply to profiles managed by IPA:\n"
 "\n"
 "- When importing a profile the \"profileId\" field, if present, must\n"
 "  match the ID given on the command line.\n"
@@ -9559,7 +9559,7 @@ msgstr ""
 "властивостей, що використовується системою сертифікації Dogtag.\n"
 "Підтримки формату XML не передбачено.\n"
 "\n"
-"Профілів, які керуються FreeIPA, стосуються такі обмеження:\n"
+"Профілів, які керуються IPA, стосуються такі обмеження:\n"
 "\n"
 "- Під час імпортування профілю поле «profileId», якщо таке є, має\n"
 "  містити значення, що збігається з ідентифікатором, вказаним у рядку "
@@ -15481,7 +15481,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -15496,7 +15496,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -15534,7 +15534,7 @@ msgstr ""
 "користувача, зберігаючи водночас журнал виконання команд та\n"
 "аргументів.\n"
 "\n"
-"У FreeIPA передбачено декілька параметрів налаштовування роботи sudo:\n"
+"У IPA передбачено декілька параметрів налаштовування роботи sudo:\n"
 "   Users: користувачі або групи, які можуть викликати sudo.\n"
 "   Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
 "   Allow Command: специфічні команди, які можна виконувати за допомогою "
@@ -15552,7 +15552,7 @@ msgstr ""
 "обробки записів (якщо такий порядок передбачено на клієнтському боці).\n"
 "Порядок визначається числовим індексом, який не повинен повторюватися.\n"
 "\n"
-"У FreeIPA передбачено визначений binddn для використання з sudo, який "
+"У IPA передбачено визначений binddn для використання з sudo, який "
 "розташовано у\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -15592,7 +15592,7 @@ msgid ""
 "commands as root or another user while providing an audit trail of the\n"
 "commands and their arguments.\n"
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -15607,7 +15607,7 @@ msgid ""
 "are evaluated (if the client supports it). This order is an integer and\n"
 "must be unique.\n"
 "\n"
-"FreeIPA provides a designated binddn to use with Sudo located at:\n"
+"IPA provides a designated binddn to use with Sudo located at:\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
 "To enable the binddn run the following command to set the password:\n"
@@ -15615,7 +15615,7 @@ msgid ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"For more information, see the FreeIPA Documentation to Sudo.\n"
+"For more information, see the IPA Documentation to Sudo.\n"
 msgstr ""
 "\n"
 "Правила sudo\n"
@@ -15626,7 +15626,7 @@ msgstr ""
 "користувача, зберігаючи водночас журнал виконання команд та\n"
 "аргументів.\n"
 "\n"
-"У FreeIPA передбачено декілька параметрів налаштовування роботи sudo:\n"
+"У IPA передбачено декілька параметрів налаштовування роботи sudo:\n"
 "   Users: користувачі або групи, які можуть викликати sudo.\n"
 "   Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
 "   Allow Command: специфічні команди, які можна виконувати за допомогою "
@@ -15644,7 +15644,7 @@ msgstr ""
 "обробки записів (якщо такий порядок передбачено на клієнтському боці).\n"
 "Порядок визначається числовим індексом, який не повинен повторюватися.\n"
 "\n"
-"У FreeIPA передбачено визначений binddn для використання з sudo, який "
+"У IPA передбачено визначений binddn для використання з sudo, який "
 "розташовано у\n"
 "uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
 "\n"
@@ -15653,7 +15653,7 @@ msgstr ""
 "ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
 "dc=com\n"
 "\n"
-"Докладніші відомості наведено у документації з FreeIPA щодо sudo.\n"
+"Докладніші відомості наведено у документації з IPA щодо sudo.\n"
 
 msgid ""
 "\n"
@@ -29271,8 +29271,8 @@ msgstr "Відхилення часу розпізнавання TOTP (у сек
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "Відхилення часу синхронізації TOTP (у секундах)"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "Часова розбіжність між ключем TOTP і сервером FreeIPA"
+msgid "TOTP token / IPA server time difference"
+msgstr "Часова розбіжність між ключем TOTP і сервером IPA"
 
 msgid "TSIG record"
 msgstr "Запис TSIG"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 743afbe3b..b345605ea 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -298,7 +298,7 @@ msgstr ""
 
 msgid ""
 "\n"
-"FreeIPA provides a means to configure the various aspects of Sudo:\n"
+"IPA provides a means to configure the various aspects of Sudo:\n"
 "   Users: The user(s)/group(s) allowed to invoke Sudo.\n"
 "   Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
 "Sudo.\n"
@@ -310,7 +310,7 @@ msgid ""
 "   Options: The various Sudoers Options that can modify Sudo's behavior.\n"
 msgstr ""
 "\n"
-"FreeIPA提供了一种方法来配置Sudo的各个方面：\n"
+"IPA提供了一种方法来配置Sudo的各个方面：\n"
 "   用户：用户/用户组允许调用Sudo。\n"
 "   主机：主机/主机组上的用户允许调用Sudo。\n"
 "   允许的命令：指定命令允许通过Sudo来运行。\n"
@@ -9885,8 +9885,8 @@ msgstr "TOTP认证时间差异（秒）"
 msgid "TOTP synchronization time variance (seconds)"
 msgstr "TOTP同步时间差异（秒）"
 
-msgid "TOTP token / FreeIPA server time difference"
-msgstr "TOTP令牌/FreeIPA服务器时差"
+msgid "TOTP token / IPA server time difference"
+msgstr "TOTP令牌/IPA服务器时差"
 
 msgid "TSIG record"
 msgstr "TSIG记录"