aa60fb
From 5e341cea66938c8dfd99d83c869a1f2ba71479be Mon Sep 17 00:00:00 2001
99b6f7
From: Martin Kosek <mkosek@redhat.com>
e3ffab
Date: Fri, 5 Sep 2014 11:46:59 +0200
e3ffab
Subject: [PATCH] Change branding to IPA and Identity Management
99b6f7
99b6f7
---
e3ffab
 install/html/browserconfig.html            | 4 ++--
e3ffab
 install/html/ssbrowser.html                | 4 ++--
e3ffab
 install/html/unauthorized.html             | 4 ++--
e3ffab
 install/migration/error.html               | 4 ++--
99b6f7
 install/migration/index.html               | 2 +-
99b6f7
 install/migration/invalid.html             | 2 +-
590d18
 install/tools/ipa-adtrust-install          | 4 ++--
99b6f7
 install/tools/ipa-replica-conncheck        | 2 +-
99b6f7
 install/tools/man/ipa-adtrust-install.1    | 2 +-
99b6f7
 install/tools/man/ipa-advise.1             | 4 ++--
99b6f7
 install/tools/man/ipa-backup.1             | 2 +-
99b6f7
 install/tools/man/ipa-ca-install.1         | 2 +-
590d18
 install/tools/man/ipa-cacert-manage.1      | 2 +-
99b6f7
 install/tools/man/ipa-compat-manage.1      | 2 +-
99b6f7
 install/tools/man/ipa-csreplica-manage.1   | 2 +-
99b6f7
 install/tools/man/ipa-dns-install.1        | 2 +-
590d18
 install/tools/man/ipa-kra-install.1        | 2 +-
99b6f7
 install/tools/man/ipa-ldap-updater.1       | 2 +-
99b6f7
 install/tools/man/ipa-managed-entries.1    | 2 +-
99b6f7
 install/tools/man/ipa-nis-manage.1         | 2 +-
e3ffab
 install/tools/man/ipa-otptoken-import.1    | 2 +-
99b6f7
 install/tools/man/ipa-replica-conncheck.1  | 2 +-
99b6f7
 install/tools/man/ipa-replica-install.1    | 2 +-
99b6f7
 install/tools/man/ipa-replica-manage.1     | 2 +-
99b6f7
 install/tools/man/ipa-replica-prepare.1    | 2 +-
99b6f7
 install/tools/man/ipa-restore.1            | 2 +-
99b6f7
 install/tools/man/ipa-server-certinstall.1 | 2 +-
99b6f7
 install/tools/man/ipa-server-install.1     | 2 +-
590d18
 install/tools/man/ipa-server-upgrade.1     | 2 +-
99b6f7
 install/tools/man/ipactl.8                 | 2 +-
99b6f7
 install/ui/index.html                      | 2 +-
99b6f7
 install/ui/reset_password.html             | 2 +-
e3ffab
 install/ui/src/freeipa/widgets/App.js      | 2 +-
e3ffab
 install/ui/sync_otp.html                   | 2 +-
99b6f7
 ipa-client/man/default.conf.5              | 2 +-
590d18
 ipa-client/man/ipa-certupdate.1            | 2 +-
99b6f7
 ipa-client/man/ipa-client-automount.1      | 2 +-
99b6f7
 ipa-client/man/ipa-client-install.1        | 2 +-
e3ffab
 ipa-client/man/ipa-getkeytab.1             | 4 ++--
99b6f7
 ipa-client/man/ipa-join.1                  | 2 +-
99b6f7
 ipa-client/man/ipa-rmkeytab.1              | 2 +-
e3ffab
 ipa.1                                      | 2 +-
e3ffab
 ipaserver/advise/plugins/legacy_clients.py | 8 ++++----
590d18
 ipaserver/install/dns.py                   | 2 +-
590d18
 ipaserver/install/ipa_kra_install.py       | 2 +-
590d18
 ipaserver/install/server/install.py        | 2 +-
590d18
 ipaserver/install/server/replicainstall.py | 2 +-
590d18
 47 files changed, 57 insertions(+), 57 deletions(-)
99b6f7
99b6f7
diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
aa60fb
index 9c5cf68211281723e12b518f346aac43c1541cdc..14c4ca1f98a60cd8dfe486f8b942fcf9ae9de4c0 100644
99b6f7
--- a/install/html/browserconfig.html
99b6f7
+++ b/install/html/browserconfig.html
99b6f7
@@ -2,7 +2,7 @@
99b6f7
 <html>
99b6f7
 <head>
99b6f7
     <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
e3ffab
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
e3ffab
     <script type="text/javascript">
e3ffab
         (function() {
e3ffab
@@ -26,7 +26,7 @@
e3ffab
 
e3ffab
     <nav class="navbar navbar-default navbar-pf" role="navigation">
e3ffab
     
e3ffab
-        FreeIPA
e3ffab
+        Identity Management
e3ffab
     
e3ffab
     </nav>
99b6f7
 
99b6f7
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
590d18
index 685800e16e6e77c70adf905acfca2996513d1e1d..8595f82ead70c8e6b2fcd38e2e290bd126d32e70 100644
99b6f7
--- a/install/html/ssbrowser.html
99b6f7
+++ b/install/html/ssbrowser.html
99b6f7
@@ -2,7 +2,7 @@
99b6f7
 <html>
99b6f7
 <head>
99b6f7
 <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
e3ffab
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
e3ffab
     <script type="text/javascript">
e3ffab
         (function() {
e3ffab
@@ -45,7 +45,7 @@
e3ffab
 
e3ffab
     <nav class="navbar navbar-default navbar-pf" role="navigation">
e3ffab
     
e3ffab
-        FreeIPA
e3ffab
+        Identity Management
e3ffab
     
e3ffab
     </nav>
99b6f7
 
99b6f7
diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
e3ffab
index 0b4414f55e7e2ab242e782b6824c2af7ae9eae59..37f2548591f691c79c0ac29afb9f4213ec5dc31a 100644
99b6f7
--- a/install/html/unauthorized.html
99b6f7
+++ b/install/html/unauthorized.html
99b6f7
@@ -2,7 +2,7 @@
99b6f7
 <html>
99b6f7
 <head>
99b6f7
     <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
e3ffab
     <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
e3ffab
     <script type="text/javascript">
e3ffab
         (function() {
e3ffab
@@ -19,7 +19,7 @@
99b6f7
 
e3ffab
     <nav class="navbar navbar-default navbar-pf" role="navigation">
e3ffab
     
e3ffab
-        FreeIPA
e3ffab
+        Identity Management
e3ffab
     
e3ffab
     </nav>
99b6f7
 
99b6f7
diff --git a/install/migration/error.html b/install/migration/error.html
e3ffab
index 896e56ec63c6eee62cb0b93f4e7fe97d668e703d..c7a4cb41961e181633ddd4f0d41064d8b696782f 100644
99b6f7
--- a/install/migration/error.html
99b6f7
+++ b/install/migration/error.html
99b6f7
@@ -2,7 +2,7 @@
99b6f7
 <html>
99b6f7
 <head>
99b6f7
 <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
99b6f7
 
e3ffab
     <link rel="stylesheet" type="text/css" href="../ui/css/patternfly.css" />
e3ffab
     <link rel="stylesheet" type="text/css" href="../ui/css/ipa.css" />
e3ffab
@@ -11,7 +11,7 @@
e3ffab
 <body class="info-page">
e3ffab
     <nav class="navbar navbar-default navbar-pf" role="navigation">
e3ffab
     
e3ffab
-        FreeIPA
e3ffab
+        Identity Management
e3ffab
     
e3ffab
     </nav>
e3ffab
 
99b6f7
diff --git a/install/migration/index.html b/install/migration/index.html
e3ffab
index 302eca263fa62c92d39ad9ccc678cf251a0afc8c..189aa71943ae1a5acfae977c0f74400d7ac4d23b 100644
99b6f7
--- a/install/migration/index.html
99b6f7
+++ b/install/migration/index.html
99b6f7
@@ -2,7 +2,7 @@
e3ffab
 <html class="login-pf">
99b6f7
 <head>
99b6f7
 <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
99b6f7
 
e3ffab
     <link rel="stylesheet" type="text/css" href="../ui/css/patternfly.css" />
e3ffab
     <link rel="stylesheet" type="text/css" href="../ui/css/ipa.css" />
99b6f7
diff --git a/install/migration/invalid.html b/install/migration/invalid.html
e3ffab
index f75b0bdc7d00d54d801ef66f373a09e89ead3251..16c455ca12e922ece1ea49813071fc2db0a22970 100644
99b6f7
--- a/install/migration/invalid.html
99b6f7
+++ b/install/migration/invalid.html
99b6f7
@@ -2,7 +2,7 @@
e3ffab
 <html class="login-pf">
99b6f7
 <head>
99b6f7
 <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
99b6f7
 
e3ffab
     <link rel="stylesheet" type="text/css" href="../ui/css/patternfly.css" />
e3ffab
     <link rel="stylesheet" type="text/css" href="../ui/css/ipa.css" />
99b6f7
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
590d18
index 21e58dd9f25e82429ce8d0c776d1b512c2661809..45b75a36d855ad11a5ac8c0358127a6726ff6ef2 100755
99b6f7
--- a/install/tools/ipa-adtrust-install
99b6f7
+++ b/install/tools/ipa-adtrust-install
590d18
@@ -228,11 +228,11 @@ def main():
99b6f7
 
99b6f7
     print "=============================================================================="
99b6f7
     print "This program will setup components needed to establish trust to AD domains for"
99b6f7
-    print "the FreeIPA Server."
99b6f7
+    print "the IPA Server."
99b6f7
     print ""
99b6f7
     print "This includes:"
99b6f7
     print "  * Configure Samba"
99b6f7
-    print "  * Add trust related objects to FreeIPA LDAP server"
99b6f7
+    print "  * Add trust related objects to IPA LDAP server"
99b6f7
     #TODO:
99b6f7
     #print "  * Add a SID to all users and Posix groups"
99b6f7
     print ""
99b6f7
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
e3ffab
index 22348fc2158e59afc2e1aa51e3d3f51e90b99e39..e26e878c5b82b4e1e8a172a217b3225dcea642c4 100755
99b6f7
--- a/install/tools/ipa-replica-conncheck
99b6f7
+++ b/install/tools/ipa-replica-conncheck
e3ffab
@@ -252,7 +252,7 @@ class PortResponder(threading.Thread):
99b6f7
                 ipautil.bind_port_responder(self.port,
99b6f7
                         self.port_type,
99b6f7
                         socket_timeout=self.socket_timeout,
99b6f7
-                        responder_data="FreeIPA")
99b6f7
+                        responder_data="IPA")
99b6f7
             except socket.timeout:
99b6f7
                 pass
99b6f7
             except socket.error, e:
99b6f7
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
590d18
index 2658f1957d1161963bf6af75e5a086a01b95c52f..7639a0b8e94c64180a05777c1cb117c74c49806b 100644
99b6f7
--- a/install/tools/man/ipa-adtrust-install.1
99b6f7
+++ b/install/tools/man/ipa-adtrust-install.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Sumit Bose <sbose@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-adtrust-install" "1" "Aug 23 2011" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-adtrust-install" "1" "Aug 23 2011" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-adtrust\-install \- Prepare an IPA server to be able to establish trust relationships with AD domains
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-advise.1 b/install/tools/man/ipa-advise.1
99b6f7
index 4c494aab90fe307bf0a2bf82677efda4b5e67e3e..515bbddbe4de8a38a2797d6aa5e95c1ae76fb718 100644
99b6f7
--- a/install/tools/man/ipa-advise.1
99b6f7
+++ b/install/tools/man/ipa-advise.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Tomas Babej <tbabej@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-advise" "1" "Jun 10 2013" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-advise" "1" "Jun 10 2013" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-advise \- Provide configurations advice for various use cases.
99b6f7
 .SH "SYNOPSIS"
99b6f7
@@ -41,4 +41,4 @@ Log to the given file
99b6f7
 .SH "EXIT STATUS"
99b6f7
 0 if the command was successful
99b6f7
 
99b6f7
-1 if an error occurred
99b6f7
\ No newline at end of file
99b6f7
+1 if an error occurred
99b6f7
diff --git a/install/tools/man/ipa-backup.1 b/install/tools/man/ipa-backup.1
99b6f7
index ff9759ec77d54f32532c4ececfa5081daab9ec15..476f9b534d514b03200369212807fc6d001c70b8 100644
99b6f7
--- a/install/tools/man/ipa-backup.1
99b6f7
+++ b/install/tools/man/ipa-backup.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-backup" "1" "Mar 22 2013" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-backup" "1" "Mar 22 2013" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-backup \- Back up an IPA master
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-ca-install.1 b/install/tools/man/ipa-ca-install.1
e3ffab
index aa186987a15b5203607ac76e63751f01811c4bd7..c110db03ff48fd80b4dc70cf9d1c32d53d58b57b 100644
99b6f7
--- a/install/tools/man/ipa-ca-install.1
99b6f7
+++ b/install/tools/man/ipa-ca-install.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-ca-install" "1" "Jun 17 2011" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-ca-install" "1" "Jun 17 2011" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
e3ffab
 ipa\-ca\-install \- Install a CA on a server
99b6f7
 .SH "SYNOPSIS"
590d18
diff --git a/install/tools/man/ipa-cacert-manage.1 b/install/tools/man/ipa-cacert-manage.1
590d18
index 1f37788336048e412eee71757f236c9944860514..0b927716797068ab4f5632292615a43748eee35c 100644
590d18
--- a/install/tools/man/ipa-cacert-manage.1
590d18
+++ b/install/tools/man/ipa-cacert-manage.1
590d18
@@ -16,7 +16,7 @@
590d18
 .\"
590d18
 .\" Author: Jan Cholasta <jcholast@redhat.com>
590d18
 .\"
590d18
-.TH "ipa-cacert-manage" "1" "Aug 12 2013" "FreeIPA" "FreeIPA Manual Pages"
590d18
+.TH "ipa-cacert-manage" "1" "Aug 12 2013" "IPA" "IPA Manual Pages"
590d18
 .SH "NAME"
590d18
 ipa\-cacert\-manage \- Manage CA certificates in IPA
590d18
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-compat-manage.1 b/install/tools/man/ipa-compat-manage.1
99b6f7
index f22b1743e31c3b07132acfcfdd8600544f9ace6c..26470331a127af9445c4473525434c237e23dbcf 100644
99b6f7
--- a/install/tools/man/ipa-compat-manage.1
99b6f7
+++ b/install/tools/man/ipa-compat-manage.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Simo Sorce <ssorce@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-compat-manage" "1" "Dec 2 2008" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-compat-manage" "1" "Dec 2 2008" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-compat\-manage \- Enables or disables the schema compatibility plugin
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-csreplica-manage.1 b/install/tools/man/ipa-csreplica-manage.1
e3ffab
index 3164ea60d67db99445dac168fad967cb48be428e..bdf70302e1743d0d94c0acad7e83b5a16026c643 100644
99b6f7
--- a/install/tools/man/ipa-csreplica-manage.1
99b6f7
+++ b/install/tools/man/ipa-csreplica-manage.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-csreplica-manage" "1" "Jul 14 2011" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-csreplica-manage" "1" "Jul 14 2011" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-csreplica\-manage \- Manage an IPA CS replica
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1
590d18
index 23427b1b15ddf21ff1aba5617adab395d2f25112..b05c328e31b8672a22d060bd23d8e8d2a79353ba 100644
99b6f7
--- a/install/tools/man/ipa-dns-install.1
99b6f7
+++ b/install/tools/man/ipa-dns-install.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-dns-install" "1" "Jun 28, 2012" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-dns-install" "1" "Jun 28, 2012" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-dns\-install \- Add DNS as a service to an IPA server
99b6f7
 .SH "SYNOPSIS"
590d18
diff --git a/install/tools/man/ipa-kra-install.1 b/install/tools/man/ipa-kra-install.1
590d18
index e3133eee188af0b613fca76b51d2f5b4f8d1ba7d..4a34e46fa7e5c7bf65e7cb41c011dc19e751434d 100644
590d18
--- a/install/tools/man/ipa-kra-install.1
590d18
+++ b/install/tools/man/ipa-kra-install.1
590d18
@@ -16,7 +16,7 @@
590d18
 .\"
590d18
 .\" Author: Ade Lee <alee@redhat.com>
590d18
 .\"
590d18
-.TH "ipa-kra-install" "1" "Aug 24 2014" "FreeIPA" "FreeIPA Manual Pages"
590d18
+.TH "ipa-kra-install" "1" "Aug 24 2014" "IPA" "IPA Manual Pages"
590d18
 .SH "NAME"
590d18
 ipa\-kra\-install \- Install a KRA on a server
590d18
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-ldap-updater.1 b/install/tools/man/ipa-ldap-updater.1
590d18
index 4893802c2f73af177857e61135626753289ce35f..7ead55bd9708ed322083abd6c3cb9e7694850c27 100644
99b6f7
--- a/install/tools/man/ipa-ldap-updater.1
99b6f7
+++ b/install/tools/man/ipa-ldap-updater.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-ldap-updater" "1" "Sep 12 2008" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-ldap-updater" "1" "Sep 12 2008" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-ldap\-updater \- Update the IPA LDAP configuration
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-managed-entries.1 b/install/tools/man/ipa-managed-entries.1
99b6f7
index 3d5ca22b87846d2b46122c7171016019aa07028e..edaa0a90d1a6b123d32cbbdceb30b68c736fe8cb 100644
99b6f7
--- a/install/tools/man/ipa-managed-entries.1
99b6f7
+++ b/install/tools/man/ipa-managed-entries.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Jr Aquino <jr.aquino@citrix.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-managed-entries" "1" "Feb 06 2012" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-managed-entries" "1" "Feb 06 2012" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-managed\-entries \- Enables or disables the schema Managed Entry plugins
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-nis-manage.1 b/install/tools/man/ipa-nis-manage.1
99b6f7
index fa02cfc76fa6bd076ebddde702036fa0b36f1413..e25f53eddca6cf1da1b631c1bf4ae275efb5a2b1 100644
99b6f7
--- a/install/tools/man/ipa-nis-manage.1
99b6f7
+++ b/install/tools/man/ipa-nis-manage.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-nis-manage" "1" "May 6 2009" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-nis-manage" "1" "May 6 2009" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-nis\-manage \- Enables or disables the NIS listener plugin
99b6f7
 .SH "SYNOPSIS"
e3ffab
diff --git a/install/tools/man/ipa-otptoken-import.1 b/install/tools/man/ipa-otptoken-import.1
e3ffab
index 920a08ca2c2f996d6281483f5c65bac6b412d6d5..fe91040fabd1cad7c395aafd6afc68ed816a1951 100644
e3ffab
--- a/install/tools/man/ipa-otptoken-import.1
e3ffab
+++ b/install/tools/man/ipa-otptoken-import.1
e3ffab
@@ -16,7 +16,7 @@
e3ffab
 .\"
e3ffab
 .\" Author: Nathaniel McCallum <npmccallum@redhat.com>
e3ffab
 .\"
e3ffab
-.TH "ipa-otptoken-import" "1" "Jun 12 2014" "FreeIPA" "FreeIPA Manual Pages"
e3ffab
+.TH "ipa-otptoken-import" "1" "Jun 12 2014" "IPA" "IPA Manual Pages"
e3ffab
 .SH "NAME"
e3ffab
 ipa\-otptoken\-import \- Imports OTP tokens from RFC 6030 XML file
e3ffab
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-replica-conncheck.1 b/install/tools/man/ipa-replica-conncheck.1
99b6f7
index 566322cf035bbb51d1ba8b14166a1b61375015da..7f220de96cc03a1f883f585740a82bff062f0ce9 100644
99b6f7
--- a/install/tools/man/ipa-replica-conncheck.1
99b6f7
+++ b/install/tools/man/ipa-replica-conncheck.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Martin Kosek <mkosek@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-replica-conncheck" "1" "Jun 2 2011" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-replica-conncheck" "1" "Jun 2 2011" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-replica\-conncheck \- Check a replica\-master network connection before installation
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
590d18
index ab8a428da4047db4655dbe8b3c5488f1292f8982..e00aae357ad3dc7a97a0b516bf5e005953824d1b 100644
99b6f7
--- a/install/tools/man/ipa-replica-install.1
99b6f7
+++ b/install/tools/man/ipa-replica-install.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-replica-install" "1" "May 16 2012" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-replica-install" "1" "May 16 2012" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-replica\-install \- Create an IPA replica
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
590d18
index c09ed362f3143e6e38716e1b3a96e90001a64674..2cdaf59984868c98e02321cf73eed016b4e478a6 100644
99b6f7
--- a/install/tools/man/ipa-replica-manage.1
99b6f7
+++ b/install/tools/man/ipa-replica-manage.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-replica-manage" "1" "Mar 1 2013" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-replica-manage" "1" "Mar 1 2013" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-replica\-manage \- Manage an IPA replica
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-replica-prepare.1 b/install/tools/man/ipa-replica-prepare.1
590d18
index afc5408ef87ec5cf967d00dd21aa848584c7eb1e..fb68af5e1dc311ec7a6aa1e53b616bd3b4273e3f 100644
99b6f7
--- a/install/tools/man/ipa-replica-prepare.1
99b6f7
+++ b/install/tools/man/ipa-replica-prepare.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-replica-prepare" "1" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-replica-prepare" "1" "Mar 14 2008" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-replica\-prepare \- Create an IPA replica file
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-restore.1 b/install/tools/man/ipa-restore.1
590d18
index 5f401818a47b64854c2f25fcab4ebb8f96cd3b9e..80a1e70bff1871678259c8436915420c70d475b1 100644
99b6f7
--- a/install/tools/man/ipa-restore.1
99b6f7
+++ b/install/tools/man/ipa-restore.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-restore" "1" "Mar 22 2013" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-restore" "1" "Mar 22 2013" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-restore \- Restore an IPA master
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-server-certinstall.1 b/install/tools/man/ipa-server-certinstall.1
e3ffab
index d23bbd490e2b0454b8fb908e22f33c7a611c8874..d87b6bc16cfbea8f260d2767bf20eaac3562b050 100644
99b6f7
--- a/install/tools/man/ipa-server-certinstall.1
99b6f7
+++ b/install/tools/man/ipa-server-certinstall.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\" 
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\" 
99b6f7
-.TH "ipa-server-certinstall" "1" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-server-certinstall" "1" "Mar 14 2008" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-server\-certinstall \- Install new SSL server certificates
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
590d18
index 3cea9fd66c133a25a611fa72a00d60a279da1b2a..a1fd6ea76926cae8db9ebeb6c92b03b8087eb3a2 100644
99b6f7
--- a/install/tools/man/ipa-server-install.1
99b6f7
+++ b/install/tools/man/ipa-server-install.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-server-install" "1" "Jun 28 2012" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-server-install" "1" "Jun 28 2012" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-server\-install \- Configure an IPA server
99b6f7
 .SH "SYNOPSIS"
590d18
diff --git a/install/tools/man/ipa-server-upgrade.1 b/install/tools/man/ipa-server-upgrade.1
590d18
index cbbdc590171bff0a88b67bcf1de961fd783ac35c..3db19b0f13da1f5a36bd6e8df23fc916d0401a6d 100644
590d18
--- a/install/tools/man/ipa-server-upgrade.1
590d18
+++ b/install/tools/man/ipa-server-upgrade.1
590d18
@@ -2,7 +2,7 @@
590d18
 .\" Copyright (C) 2015  FreeIPA Contributors see COPYING for license
590d18
 .\"
590d18
 
590d18
-.TH "ipa-server-upgrade" "1" "April 02 2015" "FreeIPA" "FreeIPA Manual Pages"
590d18
+.TH "ipa-server-upgrade" "1" "April 02 2015" "IPA" "IPA Manual Pages"
590d18
 .SH "NAME"
590d18
 ipa\-server\-upgrade \- upgrade IPA server
590d18
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/tools/man/ipactl.8 b/install/tools/man/ipactl.8
590d18
index 136fe9ac6fe7dbff5618543c1958565bab87502a..88dad986330c327a3f1c1f8be114f7d3e158ea9c 100644
99b6f7
--- a/install/tools/man/ipactl.8
99b6f7
+++ b/install/tools/man/ipactl.8
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\" 
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\" 
99b6f7
-.TH "ipactl" "8" "Mar 14 2008" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipactl" "8" "Mar 14 2008" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipactl \- IPA Server Control Interface
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/install/ui/index.html b/install/ui/index.html
590d18
index f4fe06d0bf25cad1f68e8450d4cc2787eaf0de4e..cbdf97aa59f7b9ed01ff11de17e1f9f2a868b65b 100644
99b6f7
--- a/install/ui/index.html
99b6f7
+++ b/install/ui/index.html
99b6f7
@@ -2,7 +2,7 @@
99b6f7
 <html>
99b6f7
 <head>
99b6f7
     <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
99b6f7
 
e3ffab
     
e3ffab
     <meta id="ie-detector">
e3ffab
diff --git a/install/ui/reset_password.html b/install/ui/reset_password.html
e3ffab
index ec09bbfafc1670df4bdb082c4f337be1ea81213f..998d796b7c1e6b8d3eb2e5273a897e99f1f56ca7 100644
e3ffab
--- a/install/ui/reset_password.html
e3ffab
+++ b/install/ui/reset_password.html
99b6f7
@@ -2,7 +2,7 @@
e3ffab
 <html class="login-pf">
99b6f7
 <head>
99b6f7
     <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
e3ffab
     <script type="text/javascript" src="js/libs/loader.js"></script>
e3ffab
     <script type="text/javascript">
e3ffab
         (function() {
e3ffab
diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js
e3ffab
index b70b14a94eadc3788ed6c31132476e53986b3e77..164b499e7ef43508af7a1c423ed9ab9f30217c16 100644
e3ffab
--- a/install/ui/src/freeipa/widgets/App.js
e3ffab
+++ b/install/ui/src/freeipa/widgets/App.js
e3ffab
@@ -188,7 +188,7 @@ define(['dojo/_base/declare',
99b6f7
 
e3ffab
             construct.create('img', {
e3ffab
                 src: 'images/header-logo.png',
e3ffab
-                alt: 'FreeIPA' // TODO: replace with configuration value
e3ffab
+                alt: 'Identity Management' // TODO: replace with configuration value
e3ffab
             }, this.brand_node);
99b6f7
 
e3ffab
             return this.brand_node;
e3ffab
diff --git a/install/ui/sync_otp.html b/install/ui/sync_otp.html
e3ffab
index 5814b6c578c250d253c8eabeff7a787f1b24f10b..36a51ca62899790da3b8788fcd8a32ffc7407375 100644
e3ffab
--- a/install/ui/sync_otp.html
e3ffab
+++ b/install/ui/sync_otp.html
99b6f7
@@ -2,7 +2,7 @@
99b6f7
 <html>
99b6f7
 <head>
99b6f7
     <meta charset="utf-8">
99b6f7
-    <title>IPA: Identity Policy Audit</title>
99b6f7
+    <title>Identity Management</title>
99b6f7
 
e3ffab
     
e3ffab
     <meta id="ie-detector">
99b6f7
diff --git a/ipa-client/man/default.conf.5 b/ipa-client/man/default.conf.5
590d18
index 75b9f86bcf4fe065c65f0a1b115976fc1cec13bd..6c13b9d1f288f337924f8e2251c4efbe513bdaf6 100644
99b6f7
--- a/ipa-client/man/default.conf.5
99b6f7
+++ b/ipa-client/man/default.conf.5
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "default.conf" "5" "Feb 21 2011" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "default.conf" "5" "Feb 21 2011" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 default.conf \- IPA configuration file
99b6f7
 .SH "SYNOPSIS"
590d18
diff --git a/ipa-client/man/ipa-certupdate.1 b/ipa-client/man/ipa-certupdate.1
590d18
index d95790a366aac4635e32bbc6bc81773bb9a52e68..431b395a907b6978d9e0dba9870ed0bd0c54f07b 100644
590d18
--- a/ipa-client/man/ipa-certupdate.1
590d18
+++ b/ipa-client/man/ipa-certupdate.1
590d18
@@ -16,7 +16,7 @@
590d18
 .\"
590d18
 .\" Author: Jan Cholasta <jcholast@redhat.com>
590d18
 .\"
590d18
-.TH "ipa-certupdate" "1" "Jul 2 2014" "FreeIPA" "FreeIPA Manual Pages"
590d18
+.TH "ipa-certupdate" "1" "Jul 2 2014" "IPA" "IPA Manual Pages"
590d18
 .SH "NAME"
590d18
 ipa\-certupdate \- Update local IPA certificate databases with certificates from the server
590d18
 .SH "SYNOPSIS"
99b6f7
diff --git a/ipa-client/man/ipa-client-automount.1 b/ipa-client/man/ipa-client-automount.1
99b6f7
index 5b60503f1304d0a0b03a8862708ba126c50c7eff..2e6f78aa659e90f879f66431c4e52e303a4c9b15 100644
99b6f7
--- a/ipa-client/man/ipa-client-automount.1
99b6f7
+++ b/ipa-client/man/ipa-client-automount.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-client-automount" "1" "May 25 2012" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-client-automount" "1" "May 25 2012" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-client\-automount \- Configure automount and NFS for IPA
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/ipa-client/man/ipa-client-install.1 b/ipa-client/man/ipa-client-install.1
590d18
index 0fafd8a3f2ee24b400b1cbeada4ddf7cea9493b0..46362345de78c5f107a806be0ee3a1176df790f5 100644
99b6f7
--- a/ipa-client/man/ipa-client-install.1
99b6f7
+++ b/ipa-client/man/ipa-client-install.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-client-install" "1" "Jan 31 2013" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-client-install" "1" "Jan 31 2013" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-client\-install \- Configure an IPA client
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/ipa-client/man/ipa-getkeytab.1 b/ipa-client/man/ipa-getkeytab.1
e3ffab
index bb84ad8f2b29f0753d48f480fc571ed6122ba539..349da64c82cfc53549ef666074e89d83a24d74e0 100644
99b6f7
--- a/ipa-client/man/ipa-getkeytab.1
99b6f7
+++ b/ipa-client/man/ipa-getkeytab.1
99b6f7
@@ -17,7 +17,7 @@
99b6f7
 .\" Author: Karl MacMillan <kmacmill@redhat.com>
99b6f7
 .\" Author: Simo Sorce <ssorce@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-getkeytab" "1" "Oct 10 2007" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-getkeytab" "1" "Oct 10 2007" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-getkeytab \- Get a keytab for a Kerberos principal
99b6f7
 .SH "SYNOPSIS"
e3ffab
@@ -99,7 +99,7 @@ The LDAP password to use when not binding with Kerberos.
e3ffab
 \fB\-r\fR
e3ffab
 Retrieve mode. Retrieve an existing key from the server instead of generating a
e3ffab
 new one. This is incompatibile with the \-\-password option, and will work only
e3ffab
-against a FreeIPA server more recent than version 3.3. The user requesting the
e3ffab
+against a IPA server more recent than version 3.3. The user requesting the
e3ffab
 keytab must have access to the keys for this operation to succeed.
e3ffab
 .SH "EXAMPLES"
e3ffab
 Add and retrieve a keytab for the NFS service principal on
99b6f7
diff --git a/ipa-client/man/ipa-join.1 b/ipa-client/man/ipa-join.1
e3ffab
index d881607842bb0227c2da863bd1674db01530e910..30b667558ba3105cf320896ef40b0661a18066f5 100644
99b6f7
--- a/ipa-client/man/ipa-join.1
99b6f7
+++ b/ipa-client/man/ipa-join.1
99b6f7
@@ -16,7 +16,7 @@
99b6f7
 .\"
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
-.TH "ipa-join" "1" "Oct 8 2009" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-join" "1" "Oct 8 2009" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-join \- Join a machine to an IPA realm and get a keytab for the host service principal
99b6f7
 .SH "SYNOPSIS"
99b6f7
diff --git a/ipa-client/man/ipa-rmkeytab.1 b/ipa-client/man/ipa-rmkeytab.1
590d18
index 53f775439dbdb5a4b9dfee7fe6c7277fce10893c..2c8218c94996b1411637a7c53f2f5bc5612f3ea3 100644
99b6f7
--- a/ipa-client/man/ipa-rmkeytab.1
99b6f7
+++ b/ipa-client/man/ipa-rmkeytab.1
99b6f7
@@ -17,7 +17,7 @@
99b6f7
 .\" Author: Rob Crittenden <rcritten@redhat.com>
99b6f7
 .\"
99b6f7
 .\"
99b6f7
-.TH "ipa-rmkeytab" "1" "Oct 30 2009" "FreeIPA" "FreeIPA Manual Pages"
99b6f7
+.TH "ipa-rmkeytab" "1" "Oct 30 2009" "IPA" "IPA Manual Pages"
99b6f7
 .SH "NAME"
99b6f7
 ipa\-rmkeytab \- Remove a kerberos principal from a keytab
99b6f7
 .SH "SYNOPSIS"
e3ffab
diff --git a/ipa.1 b/ipa.1
e3ffab
index ec7e5da7077a41095fdaa75babb1b680f3522f7f..f53e815d26e5a3f4843a220012240a775387195e 100644
e3ffab
--- a/ipa.1
e3ffab
+++ b/ipa.1
e3ffab
@@ -16,7 +16,7 @@
e3ffab
 .\"
e3ffab
 .\" Author: Pavel Zuna <pzuna@redhat.com>
e3ffab
 .\"
e3ffab
-.TH "ipa" "1" "Jan 24 2012" "FreeIPA" "FreeIPA Manual Pages"
e3ffab
+.TH "ipa" "1" "Jan 24 2012" "IPA" "IPA Manual Pages"
e3ffab
 .SH "NAME"
e3ffab
 ipa \- IPA command\-line interface
e3ffab
 .SH "SYNOPSIS"
e3ffab
diff --git a/ipaserver/advise/plugins/legacy_clients.py b/ipaserver/advise/plugins/legacy_clients.py
590d18
index e673cb45f58901ddee70a0ec6cea62531bba965b..d026fb0a356d7ac49d26ef96fe602f2b8cb82230 100644
e3ffab
--- a/ipaserver/advise/plugins/legacy_clients.py
e3ffab
+++ b/ipaserver/advise/plugins/legacy_clients.py
590d18
@@ -89,7 +89,7 @@ class config_redhat_sssd_before_1_9(config_base_legacy_client):
e3ffab
     Legacy client configuration for Red Hat based systems, using SSSD.
e3ffab
     """
e3ffab
     description = ('Instructions for configuring a system with an old version '
e3ffab
-                   'of SSSD (1.5-1.8) as a FreeIPA client. This set of '
e3ffab
+                   'of SSSD (1.5-1.8) as a IPA client. This set of '
e3ffab
                    'instructions is targeted for platforms that include '
e3ffab
                    'the authconfig utility, which are all Red Hat based '
e3ffab
                    'platforms.')
590d18
@@ -124,7 +124,7 @@ class config_generic_linux_sssd_before_1_9(config_base_legacy_client):
e3ffab
     using SSSD.
e3ffab
     """
e3ffab
     description = ('Instructions for configuring a system with an old version '
e3ffab
-                   'of SSSD (1.5-1.8) as a FreeIPA client. This set of '
e3ffab
+                   'of SSSD (1.5-1.8) as a IPA client. This set of '
e3ffab
                    'instructions is targeted for linux systems that do not '
e3ffab
                    'include the authconfig utility.')
e3ffab
 
e3ffab
@@ -179,7 +179,7 @@ class config_redhat_nss_pam_ldapd(config_base_legacy_client):
e3ffab
     using nss-pam-ldapd.
e3ffab
     """
e3ffab
     description = ('Instructions for configuring a system with nss-pam-ldapd '
e3ffab
-                   'as a FreeIPA client. This set of instructions is targeted '
e3ffab
+                   'as a IPA client. This set of instructions is targeted '
e3ffab
                    'for platforms that include the authconfig utility, which '
e3ffab
                    'are all Red Hat based platforms.')
e3ffab
 
590d18
@@ -347,7 +347,7 @@ class config_redhat_nss_ldap(config_base_legacy_client):
e3ffab
     using nss-ldap.
e3ffab
     """
e3ffab
     description = ('Instructions for configuring a system with nss-ldap '
e3ffab
-                   'as a FreeIPA client. This set of instructions is targeted '
e3ffab
+                   'as a IPA client. This set of instructions is targeted '
e3ffab
                    'for platforms that include the authconfig utility, which '
e3ffab
                    'are all Red Hat based platforms.')
e3ffab
 
590d18
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
590d18
index 099e35dc331722607c8ca02cdbc7a0e66f8c4754..d2d611e4d0662c6475bcacfcbbd768ee07e25bba 100644
590d18
--- a/ipaserver/install/dns.py
590d18
+++ b/ipaserver/install/dns.py
590d18
@@ -104,7 +104,7 @@ def install_check(standalone, replica, options, hostname):
590d18
 
590d18
     if standalone:
590d18
         print "=============================================================================="
590d18
-        print "This program will setup DNS for the FreeIPA Server."
590d18
+        print "This program will setup DNS for the IPA Server."
590d18
         print ""
590d18
         print "This includes:"
590d18
         print "  * Configure DNS (bind)"
590d18
diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py
590d18
index d75a2427352851fecc045707a8cf73f99d05843b..2a42272ef433a1ddb7a040143ff63a31c12f03d0 100644
590d18
--- a/ipaserver/install/ipa_kra_install.py
590d18
+++ b/ipaserver/install/ipa_kra_install.py
590d18
@@ -108,7 +108,7 @@ class KRAInstaller(KRAInstall):
590d18
 
590d18
     INSTALLER_START_MESSAGE = '''
590d18
         ===================================================================
590d18
-        This program will setup Dogtag KRA for the FreeIPA Server.
590d18
+        This program will setup Dogtag KRA for the IPA Server.
590d18
 
590d18
     '''
590d18
 
590d18
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
aa60fb
index a2a22c6334edf442e07ff3a1b4b9b309de2bc8a5..0534be818ecf950d9a9dab8f8a1797209d2dfc7d 100644
590d18
--- a/ipaserver/install/server/install.py
590d18
+++ b/ipaserver/install/server/install.py
aa60fb
@@ -366,7 +366,7 @@ def install_check(installer):
590d18
 
590d18
     print("======================================="
590d18
           "=======================================")
590d18
-    print "This program will set up the FreeIPA Server."
590d18
+    print "This program will set up the IPA Server."
590d18
     print ""
590d18
     print "This includes:"
590d18
     if setup_ca:
590d18
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
aa60fb
index b000e8ce84df3cb2a6bc90520cb4713ab416f4da..3c13a3e743074e01ca952e114c2374205bdd68f8 100644
590d18
--- a/ipaserver/install/server/replicainstall.py
590d18
+++ b/ipaserver/install/server/replicainstall.py
aa60fb
@@ -467,7 +467,7 @@ def install_check(installer):
590d18
         above_upper_bound = current > constants.MAX_DOMAIN_LEVEL
590d18
 
590d18
         if under_lower_bound or above_upper_bound:
590d18
-            message = ("This version of FreeIPA does not support "
590d18
+            message = ("This version of IPA does not support "
590d18
                        "the Domain Level which is currently set for "
590d18
                        "this domain. The Domain Level needs to be "
590d18
                        "raised before installing a replica with "
99b6f7
-- 
aa60fb
2.5.0
99b6f7