summaryrefslogtreecommitdiffstats
path: root/pki/dogtag
diff options
context:
space:
mode:
Diffstat (limited to 'pki/dogtag')
-rwxr-xr-xpki/dogtag/ca-ui/shared/webapps/ca/404.html2
-rwxr-xr-xpki/dogtag/ca-ui/shared/webapps/ca/500.html2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html2
-rw-r--r--pki/dogtag/ca-ui/shared/webapps/ca/services.template2
-rwxr-xr-xpki/dogtag/kra-ui/shared/webapps/kra/404.html2
-rwxr-xr-xpki/dogtag/kra-ui/shared/webapps/kra/500.html2
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template2
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html2
-rw-r--r--pki/dogtag/kra-ui/shared/webapps/kra/services.template2
-rwxr-xr-xpki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html2
-rwxr-xr-xpki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html2
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template2
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html2
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template2
-rw-r--r--pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template2
-rwxr-xr-xpki/dogtag/ra-ui/shared/docroot/404.html2
-rwxr-xr-xpki/dogtag/ra-ui/shared/docroot/500.html2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/error.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/error.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm2
-rw-r--r--pki/dogtag/ra-ui/shared/docroot/index.vm2
-rwxr-xr-xpki/dogtag/tks-ui/shared/webapps/tks/404.html2
-rwxr-xr-xpki/dogtag/tks-ui/shared/webapps/tks/500.html2
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template4
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template2
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template2
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html2
-rw-r--r--pki/dogtag/tks-ui/shared/webapps/tks/services.template2
-rwxr-xr-xpki/dogtag/tps-ui/shared/docroot/404.html2
-rwxr-xr-xpki/dogtag/tps-ui/shared/docroot/500.html2
-rwxr-xr-xpki/dogtag/tps-ui/shared/docroot/index.vm2
-rw-r--r--pki/dogtag/tps-ui/shared/docroot/tokendb/error.template2
-rw-r--r--pki/dogtag/tps-ui/shared/docroot/tokendb/index.template2
-rw-r--r--pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template2
-rw-r--r--pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template2
118 files changed, 118 insertions, 198 deletions
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/404.html b/pki/dogtag/ca-ui/shared/webapps/ca/404.html
index c893ef378..6da3b4833 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/404.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/404.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>CA 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/500.html b/pki/dogtag/ca-ui/shared/webapps/ca/500.html
index 99cf190e4..535aa422f 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/500.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/500.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>CA 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
index c69aaad1f..1e51f85e9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>CA Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
index eb62f4206..7a47f2c2b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>CA Admin Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
index 62c9cfa60..840a16d89 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
@@ -20,7 +20,7 @@
<CMS_TEMPLATE>
<head>
- <title>Certificate System</title>
+ <title>CA Admin Security Domain Login</title>
<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/ca/admin/console/css/rhn-base.css" type="text/css" />
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
index 96053b7fd..a9a0a83e5 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<CMS_TEMPLATE>
-<title>Certificate System</title>
+<title>CA Admin Send Cookie</title>
<link rel="shortcut icon" href="/ca/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/ca/admin/console/css/rhn-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
index 36fd0477e..33133ce3d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
@@ -20,9 +20,7 @@
<HEAD>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>CA Agent Processing Error!</TITLE>
</HEAD>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
index f04c3ac9b..50d23ee31 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
@@ -20,9 +20,7 @@
<HEAD>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Pending
-</TITLE>
+<TITLE>CA Agent Request Pending</TITLE>
</HEAD>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
index 71b6d2d45..81d12641a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
@@ -20,9 +20,7 @@
<HEAD>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Rejected
-</TITLE>
+<TITLE>CA Agent Request Rejected</TITLE>
</HEAD>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
index f1f331f45..f3531f0b9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
@@ -21,9 +21,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Request Success
-</TITLE>
+<TITLE>CA Agent Generic Request Success</TITLE>
</HEAD>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
index 476890a52..584402c69 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Svc Pending
-</TITLE>
+<TITLE>CA Agent Request Svc Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
index c7daa9ac8..f0016cdfa 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
@@ -21,9 +21,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Unauthorized
-</TITLE>
+<TITLE>CA Agent Generic Unauthorized</TITLE>
</head>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
index 836fb006a..b00295c2f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>CA Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
index ea83e18c0..05756ed3a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<title>Certificate Authority</title>
+<title>CA Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="shortcut icon" href="/ca/agent/graphics/favicon.ico" />
</head>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
index 70d65f6f1..99ea3a090 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>CA Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
index 3b32ed7cc..46ab91d60 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>CA Agent Ports</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
index fa170aa61..729525afd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>CA End-Entity Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
index 0ff5f4383..15ab7316a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Pending
-</TITLE>
+<TITLE>CA End-Entity Request Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
index a5dd68f49..6e0ca836f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Rejected
-</TITLE>
+<TITLE>CA End-Entity Request Rejected</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
index 9a0ead814..5e17ecd64 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Request Success
-</TITLE>
+<TITLE>CA End-Entity Generic Request Success</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
index f639a39a9..e61acbe6c 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Svc Pending
-</TITLE>
+<TITLE>CA End-Entity Request Svc Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
index c29372843..b8526cb59 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Unauthorized
-</TITLE>
+<TITLE>CA End-Entity Generic Unauthorized</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
index 36f00f4c2..d93eb0fd6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>CA End-Entity Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
index 09dce41ab..4388c58c6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<title>Certificate System</title>
+<title>CA End-Entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
index b1f05c723..25fb5d05d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
@@ -17,7 +17,7 @@
--- END COPYRIGHT BLOCK --- -->
<html>
<head>
-<title>Certificate Management System</title>
+<title>CA End-Entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
index 5d5eccc6d..5f195b889 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
@@ -17,7 +17,7 @@
--- END COPYRIGHT BLOCK --- -->
<html>
<head>
-<title>Certificate Management System</title>
+<title>CA End-Entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="shortcut icon" href="/ca/ee/graphics/favicon.ico" />
<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
index 5ed1018d6..2cf6ee3be 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<title>Certificate System</title>
+<title>CA End-Entity</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
<SCRIPT LANGUAGE="JavaScript" SRC="/ca/ee/dynamicVars.js"></SCRIPT>
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/services.template b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
index d956367ef..f567d6dc7 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/services.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<CMS_TEMPLATE>
-<title>Certificate System</title>
+<title>CA Services</title>
<link rel="shortcut icon" href="admin/console/img/favicon.ico" />
<link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/404.html b/pki/dogtag/kra-ui/shared/webapps/kra/404.html
index 2f7b3893f..10eb1624a 100755
--- a/pki/dogtag/kra-ui/shared/webapps/kra/404.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/404.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>DRM 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/500.html b/pki/dogtag/kra-ui/shared/webapps/kra/500.html
index d080a84c2..dcce0e1b3 100755
--- a/pki/dogtag/kra-ui/shared/webapps/kra/500.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/500.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>DRM 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
index 9d2248d4c..a6ec193bc 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>DRM Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
index cab2c0167..2ecb08cf5 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>DRM Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
index 0ff5f4383..62d4316b1 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Pending
-</TITLE>
+<TITLE>DRM Agent Request Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
index a5dd68f49..d6c67f2c4 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Rejected
-</TITLE>
+<TITLE>DRM Agent Request Rejected</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
index 9a0ead814..dc3a9775f 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Request Success
-</TITLE>
+<TITLE>DRM Agent Generic Request Success</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
index f639a39a9..66a524912 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Svc Pending
-</TITLE>
+<TITLE>DRM Agent Request Svc Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
index c29372843..fc137d06b 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Unauthorized
-</TITLE>
+<TITLE>DRM Agent Generic Unauthorized</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
index 9d2248d4c..0af3aa15d 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>DRM Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
index 478834955..2a6c6b972 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>DRM Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
index d98d039dc..3ca0f8959 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<title>Key Recovery Authority</title>
+<title>DRM Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="shortcut icon" href="/kra/agent/graphics/favicon.ico" />
</head>
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/services.template b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
index 2b1361582..c7a83c941 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/services.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<CMS_TEMPLATE>
-<title>Certificate System</title>
+<title>DRM Services</title>
<link rel="shortcut icon" href="admin/console/img/favicon.ico" />
<link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
index 5fb3e1bd3..e062ecdd8 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>OCSP 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
index 65b2f3fb7..b012a7e9b 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>OCSP 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
index a69fa515a..b78424626 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>OCSP Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
index 128d5b319..c2b45826e 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>OCSP Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
index 0ff5f4383..9264d1bd0 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Pending
-</TITLE>
+<TITLE>OCSP Agent Request Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
index a5dd68f49..5e5155541 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Rejected
-</TITLE>
+<TITLE>OCSP Agent Request Rejected</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
index 9a0ead814..9d9022b2b 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Request Success
-</TITLE>
+<TITLE>OCSP Agent Generic Request Success</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
index f639a39a9..248f3e592 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Svc Pending
-</TITLE>
+<TITLE>OCSP Agent Request Svc Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
index c29372843..af2aede06 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Unauthorized
-</TITLE>
+<TITLE>OCSP Agent Generic Unauthorized</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
index a69fa515a..d68d10a19 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>OCSP Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
index ff9d11df6..79f6f592e 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>OCSP Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
index 54edf80fa..cd4ea326a 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<title>Online Certificate Status Authority</title>
+<title>OCSP Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="shortcut icon" href="/ocsp/agent/graphics/favicon.ico" />
</head>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
index e7ae222da..c4b21fca7 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>OCSP Agent Ports</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
index 3b0f3c50c..cda3e7330 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<CMS_TEMPLATE>
-<title>Certificate System</title>
+<title>OCSP Services</title>
<link rel="shortcut icon" href="admin/console/img/favicon.ico" />
<link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/404.html b/pki/dogtag/ra-ui/shared/docroot/404.html
index e2a0f9e44..ec42699f2 100755
--- a/pki/dogtag/ra-ui/shared/docroot/404.html
+++ b/pki/dogtag/ra-ui/shared/docroot/404.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>RA 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/ra-ui/shared/docroot/500.html b/pki/dogtag/ra-ui/shared/docroot/500.html
index 1f6dec603..f25ba430a 100755
--- a/pki/dogtag/ra-ui/shared/docroot/500.html
+++ b/pki/dogtag/ra-ui/shared/docroot/500.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>RA 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
index 31852c7bb..70d0d16ac 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Add New Group</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
index a73f450c2..6f25e3740 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Admin</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
index 70de91023..c780ab09a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Groups</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
index aff547b92..b14712e9d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Admin</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
index a1b6be903..2915c8ff3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Add New User</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
index f31d6bb60..a6ff73721 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Admin</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
index 49eb83527..1fb6358aa 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Users</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
index cad7ae608..77c73f69a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Agent</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
index 77f04eba3..f315dd7b0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Certificates</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
index 71f7802d9..14358b485 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Certificate Revocation</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
index 4a31059c0..6e7b90e2a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Certificate Revocation Submission</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm b/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
index d1a187e1d..9dd0f28ad 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Agent Error!</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
index 16933ac15..dd6b19fae 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Agent</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
index 78d462759..5785718b3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Agent</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
index f8d19f6cd..2d8963634 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Certificate Request Operations</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
index 3e0c843d1..dd5879ae3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Certificate Requests</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
index ddc9a8f68..a8dacbfbe 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Agent Certificate Enrollment</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
index d00cbaf33..003ce2ca2 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
index 94fdf7ec3..3cbf754b0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Agent Certificate Request</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
index 0d0719fa3..32adbb57f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Agent Certificate Request Using a One-Time Pin</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
index 6cc95e338..3bbdf9ad0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Agent Certificate Request Submission</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm b/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
index 7861fe9c8..1ca3a37ed 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity Error!</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
index 2402949f4..c63d186c5 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
index fdeaa6f37..44d5bd6b9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Import Certificate</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
index 99e85c1b9..003b0c8c3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
index 4dba3429a..0b76168ea 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Certificate Request Status</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
index 91948f5bd..0864f0aba 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>SCEP Router Enrollment</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
index d1d12b1fa..5c5b0db1a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
index edfb214b9..567544495 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>SCEP Router Request Using a One-Time Pin</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
index 6d4e38e08..a9b0717bb 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>SCEP Router Manager Request for a One-Time Pin</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
index cd43126b8..41a186a49 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>SCEP Router Request Submission</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
index 7bcef7521..7307aaf50 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Server Certificate Request</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
index b036cb5d5..7d3ca76d5 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
index 0c7df5e75..2afb4b891 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>Server Certificate Request Submission</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
index cdbfe333a..0a6766f1b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA End-Entity</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
index 55715dc9a..e8b0c90fc 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>User Certificate Renewal Notification</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
index 4c6c2f6d5..592468445 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>User Certificate Renewal</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
index be78c9acb..02edb6d58 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>User Certificate Request Submission</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
index f5d3fe0a6..2da3d3606 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
@@ -28,7 +28,7 @@
<OBJECT id='g_objClassFactory' CLASSID='clsid:884e2049-217d-11da-b2a4-000e7bbb2b09'>
</OBJECT>
-<title>Certificate System</title>
+<title>User Certificate Request</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/ra-ui/shared/docroot/index.vm b/pki/dogtag/ra-ui/shared/docroot/index.vm
index 0121c08f1..2b9677f20 100644
--- a/pki/dogtag/ra-ui/shared/docroot/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>RA Services</title>
<link rel="shortcut icon" href="/ra/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/404.html b/pki/dogtag/tks-ui/shared/webapps/tks/404.html
index 8ac09f4c4..f6fc24a77 100755
--- a/pki/dogtag/tks-ui/shared/webapps/tks/404.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/404.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>TKS 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/500.html b/pki/dogtag/tks-ui/shared/webapps/tks/500.html
index 6a43327ee..a82cbeab2 100755
--- a/pki/dogtag/tks-ui/shared/webapps/tks/500.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/500.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>TKS 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
index a8b9415df..53e975d14 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>TKS Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
index d82f790f9..e4a49ae07 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>TKS Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
index 0ff5f4383..a75a5ebdc 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Pending
-</TITLE>
+<TITLE>TKS Agent Request Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
index a5dd68f49..112717a7e 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Rejected
-</TITLE>
+<TITLE>TKS Agent Request Rejected</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
index 9a0ead814..02a9b9b8b 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Request Success
-</TITLE>
+<TITLE>TKS Agent Generic Request Success</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
index f639a39a9..cb36a5881 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Request Svc Pending
-</TITLE>
+<TITLE>TKS Agent Request Svc Pending</TITLE>
<BODY bgcolor="white">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
index c29372843..c6e62f841 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
@@ -20,9 +20,7 @@
<!-- This template is intended to be replaced by request specific results ! -->
<CMS_TEMPLATE>
-<TITLE>
-Generic Unauthorized
-</TITLE>
+<TITLE>TKS Agent Generic Unauthorized</TITLE>
<BODY BGCOLOR=white>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
index a8b9415df..53287a8a0 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
@@ -19,9 +19,7 @@
<HTML>
<CMS_TEMPLATE>
-<TITLE>
-CS Processing Error
-</TITLE>
+<TITLE>TKS Agent Processing Error!</TITLE>
<BODY BGCOLOR="white">
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
index 2b9a4d4e3..588712364 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>TKS Agent</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
index 6cb99831d..e1f1ee73e 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
@@ -19,7 +19,7 @@
<html>
<head>
<CMS_TEMPLATE>
-<title>Index</title>
+<title>TKS Agent Ports</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
index aea2145d5..615afae2c 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
@@ -21,7 +21,7 @@
<meta http-equiv="content-type"
content="text/html; charset=ISO-8859-1">
<link rel="shortcut icon" href="/tks/agent/graphics/favicon.ico" />
- <title>index.html</title>
+ <title>TKS Agent</title>
</head>
<body>
<div style="text-align: center;"><big><big><big><big><span
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/services.template b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
index 1bf087a6e..022c4c87d 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/services.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<CMS_TEMPLATE>
-<title>Certificate System</title>
+<title>TKS Services</title>
<link rel="shortcut icon" href="admin/console/img/favicon.ico" />
<link rel="stylesheet" href="admin/console/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/tps-ui/shared/docroot/404.html b/pki/dogtag/tps-ui/shared/docroot/404.html
index 39a526d7f..b4181fcf9 100755
--- a/pki/dogtag/tps-ui/shared/docroot/404.html
+++ b/pki/dogtag/tps-ui/shared/docroot/404.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>TPS 404 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/tps-ui/shared/docroot/500.html b/pki/dogtag/tps-ui/shared/docroot/500.html
index 20a00418f..b868922c7 100755
--- a/pki/dogtag/tps-ui/shared/docroot/500.html
+++ b/pki/dogtag/tps-ui/shared/docroot/500.html
@@ -25,7 +25,7 @@ var port = location.port;
</script>
<head>
-<title>Certificate System</title>
+<title>TPS 500 Error!</title>
<!-- always expand ALL relative paths -->
<script language=javascript>
document.write('<link rel="shortcut icon" href="');
diff --git a/pki/dogtag/tps-ui/shared/docroot/index.vm b/pki/dogtag/tps-ui/shared/docroot/index.vm
index 20fce0192..e9a3361e9 100755
--- a/pki/dogtag/tps-ui/shared/docroot/index.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/index.vm
@@ -18,7 +18,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<title>Certificate System</title>
+<title>TPS Services</title>
<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" />
<link rel="stylesheet" href="/css/pki-base.css" type="text/css" />
<META http-equiv=Content-Type content="text/html; charset=UTF-8">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
index 0d41c20fa..f698925d0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
@@ -20,7 +20,7 @@
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" />
<HEAD>
-<TITLE>TPS</Title>
+<TITLE>TPS Error!</Title>
</HEAD>
<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
index 4b341741f..3a9d6a607 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
@@ -20,7 +20,7 @@
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" />
<HEAD>
-<TITLE>TPS</Title>
+<TITLE>TPS Agent</Title>
</HEAD>
<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
index 7c665f83d..702d11d9b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
@@ -20,7 +20,7 @@
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" />
<HEAD>
-<TITLE>TPS</Title>
+<TITLE>TPS Admin</Title>
</HEAD>
<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
index b0d0571c1..184939c4c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
@@ -20,7 +20,7 @@
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" />
<HEAD>
-<TITLE>TPS</Title>
+<TITLE>TPS Operator</Title>
</HEAD>
<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">