From 4ef7ef003efbb904af6d4bce0ea0ee1b5091b65f Mon Sep 17 00:00:00 2001
From: INOPIAE <m.maengel@inopiae.de>
Date: Sun, 8 May 2016 18:04:38 +0200
Subject: [PATCH] Replace "CAcert" with "SomeCA" on all user-exposed pages

---
 src/org/cacert/gigi/Gigi.java                 | 20 ++++++++---------
 src/org/cacert/gigi/Gigi.templ                |  2 +-
 .../cacert/gigi/dbObjects/Organisation.java   |  2 +-
 src/org/cacert/gigi/email/MailProbe.java      |  6 ++---
 src/org/cacert/gigi/email/Sendmail.java       |  2 +-
 .../gigi/output/ClientCSRGenerateIE.templ     |  2 +-
 src/org/cacert/gigi/pages/MainPage.templ      |  6 ++---
 .../cacert/gigi/pages/MainPageNotLogin.templ  | 22 +++++++++----------
 src/org/cacert/gigi/pages/PolicyIndex.java    |  2 +-
 .../account/certs/CertificateIssueForm.templ  |  8 +++----
 .../pages/account/domain/PingConfigForm.templ |  2 +-
 .../admin/support/SupportUserDetailsForm.java |  4 ++--
 .../cacert/gigi/pages/main/RegisterPage.templ |  4 ++--
 src/org/cacert/gigi/pages/main/Signup.java    |  2 +-
 src/org/cacert/gigi/pages/main/Signup.templ   |  2 +-
 .../cacert/gigi/pages/wot/AssuranceForm.java  |  6 ++---
 .../cacert/gigi/pages/wot/AssuranceForm.templ |  8 +++----
 .../gigi/pages/wot/RequestTTPPage.templ       | 12 +++++-----
 src/org/cacert/gigi/pages/wot/Rules.templ     |  8 +++----
 19 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index d080e290..36afac6f 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -110,27 +110,27 @@ public final class Gigi extends HttpServlet {
             putPage("/denied", new AccessDenied(), null);
             putPage("/error", new PageNotFound(), null);
             putPage("/login", new LoginPage("Password Login"), null);
-            getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") {
+            getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") {
 
                 @Override
                 public boolean isPermitted(AuthorizationContext ac) {
                     return ac == null;
                 }
             });
-            getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") {
+            getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") {
 
                 @Override
                 public boolean isPermitted(AuthorizationContext ac) {
                     return ac == null;
                 }
             });
-            putPage("/", new MainPage("CAcert - Home"), null);
-            putPage("/roots", new RootCertPage(truststore), "CAcert.org");
+            putPage("/", new MainPage("SomeCA - Home"), null);
+            putPage("/roots", new RootCertPage(truststore), "SomeCA.org");
 
             putPage("/secure", new TestSecure(), null);
             putPage(Verify.PATH, new Verify(), null);
             putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
-            putPage(RegisterPage.PATH, new RegisterPage(), "CAcert.org");
+            putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org");
             putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
             putPage(MailOverview.DEFAULT_PATH, new MailOverview("Email addresses"), "Certificates");
             putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates");
@@ -177,17 +177,17 @@ public final class Gigi extends HttpServlet {
             }
             baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
             rootMenu = new MenuCollector();
-            Menu about = new Menu("About CAcert.org");
+            Menu about = new Menu("About SomeCA.org");
             categories.add(about);
 
-            about.addItem(new SimpleMenuItem("//blog.cacert.org/", "CAcert News"));
+            about.addItem(new SimpleMenuItem("//blog.cacert.org/", "SomeCA News"));
             about.addItem(new SimpleMenuItem("//wiki.cacert.org/", "Wiki Documentation"));
-            putPage(PolicyIndex.DEFAULT_PATH, new PolicyIndex(), "About CAcert.org");
+            putPage(PolicyIndex.DEFAULT_PATH, new PolicyIndex(), "About SomeCA.org");
             about.addItem(new SimpleMenuItem("//wiki.cacert.org/FAQ/Privileges", "Point System"));
             about.addItem(new SimpleMenuItem("//bugs.cacert.org/", "Bug Database"));
-            about.addItem(new SimpleMenuItem("//wiki.cacert.org/Board", "CAcert Board"));
+            about.addItem(new SimpleMenuItem("//wiki.cacert.org/Board", "SomeCA Board"));
             about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists"));
-            about.addItem(new SimpleMenuItem("//blog.CAcert.org/feed", "RSS News Feed"));
+            about.addItem(new SimpleMenuItem("//blog.SomeCA.org/feed", "RSS News Feed"));
             about.addItem(new SimpleMenuItem("//wiki.cacert.org/Impress", "Impress"));
 
             Menu languages = new Menu("Translations");
diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index 5f103959..423be491 100644
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.CAcert.org/feed">
+        <link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.SomeCA.org/feed">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <title><?=$title?></title>
         <meta name="description" content="">
diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java
index 5da25068..f3bd822b 100644
--- a/src/org/cacert/gigi/dbObjects/Organisation.java
+++ b/src/org/cacert/gigi/dbObjects/Organisation.java
@@ -218,7 +218,7 @@ public class Organisation extends CertificateOwner {
         return isValidDomain(email.split("@", 2)[1]);
     }
 
-    public static final String SELF_ORG_NAME = "CAcert";
+    public static final String SELF_ORG_NAME = "SomeCA";
 
     public boolean isSelfOrganisation() {
         return SELF_ORG_NAME.equals(getName());
diff --git a/src/org/cacert/gigi/email/MailProbe.java b/src/org/cacert/gigi/email/MailProbe.java
index 8a0eaae1..41fc99a5 100644
--- a/src/org/cacert/gigi/email/MailProbe.java
+++ b/src/org/cacert/gigi/email/MailProbe.java
@@ -9,7 +9,7 @@ public class MailProbe {
 
     public static void sendMailProbe(Language l, String type, int id, String hash, String address) throws IOException {
         StringBuffer body = new StringBuffer();
-        body.append(l.getTranslation("Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"));
+        body.append(l.getTranslation("Thanks for signing up with SomeCA.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!"));
         body.append("\n\nhttps://");
         body.append(ServerConstants.getWwwHostNamePortSecure());
         body.append("/verify?type=");
@@ -21,8 +21,8 @@ public class MailProbe {
         body.append("\n\n");
         body.append(l.getTranslation("Best regards"));
         body.append("\n");
-        body.append(l.getTranslation("CAcert.org Support!"));
-        EmailProvider.getInstance().sendmail(address, "[CAcert.org] " + l.getTranslation("Mail Probe"), body.toString(), "support@cacert.org", null, null, null, null, false);
+        body.append(l.getTranslation("SomeCA.org Support!"));
+        EmailProvider.getInstance().sendmail(address, "[SomeCA.org] " + l.getTranslation("Mail Probe"), body.toString(), "support@cacert.org", null, null, null, null, false);
     }
 
 }
diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/Sendmail.java
index 78d5a0ba..a65b1326 100644
--- a/src/org/cacert/gigi/email/Sendmail.java
+++ b/src/org/cacert/gigi/email/Sendmail.java
@@ -52,7 +52,7 @@ public class Sendmail extends EmailProvider {
             out.print("DATA\r\n");
             out.flush();
             readSMTPResponse(in, 250);
-            out.print("X-Mailer: CAcert.org Website\r\n");
+            out.print("X-Mailer: SomeCA.org Website\r\n");
             // if (array_key_exists("REMOTE_ADDR", $_SERVER)) {
             // out.print("X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
             // }
diff --git a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
index e4b2ccab..164169f1 100644
--- a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
+++ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
@@ -37,7 +37,7 @@
 				<?=_Minimum Size?>: <span id="keySizeMin"></span>,
 				<?=_Maximum Size?>: <span id="keySizeMax"></span>,
 				<?=_Step?>: <span id="keySizeStep"></span></p>
-			<p style="color:red"><?=_Please note that RSA key sizes smaller than ${minsize} bit will not be accepted by CAcert?>
+			<p style="color:red"><?=_Please note that RSA key sizes smaller than ${minsize} bit will not be accepted by SomeCA?>
 			</p>
 		</fieldset>
 
diff --git a/src/org/cacert/gigi/pages/MainPage.templ b/src/org/cacert/gigi/pages/MainPage.templ
index 41c8522b..8ab6329b 100644
--- a/src/org/cacert/gigi/pages/MainPage.templ
+++ b/src/org/cacert/gigi/pages/MainPage.templ
@@ -1,5 +1,5 @@
 <p><?=_Welcome to your account section of the website. Below is a description of the different sections and what they're for.?></p>
-<H4><?=_CAcert.org?></H4>
+<H4><?=_ET?></H4>
 <p><?=_If you would like to view news items or change languages you can click the logout or go home links. Go home doesn't log you out of the system, just returns you to the front of the website. Logout logs you out of the system.?></p>
 <H4><?=_My Details?></H4>
 <p><?=_In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.?></p>
@@ -9,6 +9,6 @@
 <p><?=_Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 trust points, or 6 months for no trust points.?></p>
 <h4><?=_Org Client and Server Certificates?></h4>
 <p><?=_Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.?></p>
-<h4><?=_CAcert Web of Trust?></h4>
-<p><?=_The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.?></p>
+<h4><?=_ET Web of Trust?></h4>
+<p><?=_The Web of Trust system ET uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. ET differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.?></p>
 <p><b><?=_For information about the TTP-assisted-assurance program please read !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' and !'<a href="//wiki.cacert.org/TTP/TTPAL">	https://wiki.cacert.org/TTP/TTPAL</a>'.?></b></p>
diff --git a/src/org/cacert/gigi/pages/MainPageNotLogin.templ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ
index c2359c58..af8eeb96 100644
--- a/src/org/cacert/gigi/pages/MainPageNotLogin.templ
+++ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ
@@ -1,21 +1,21 @@
-<h3><?=_Are you new to CAcert??></h3>
+<h3><?=_Are you new to SomeCA??></h3>
 
-<p><?=_CAcert.org is a community-driven Certificate Authority that issues certificates to the public at large for free.?></p>
+<p><?=_SomeCA.org is a community-driven Certificate Authority that issues certificates to the public at large for free.?></p>
 
-<p><?=_CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.?></p>
+<p><?=_SomeCA's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by SomeCA, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.?></p>
 
-<p><?=_If you want to have free certificates issued to you, !'<a href="/register">'join the CAcert Community!'</a>'.?></p>
+<p><?=_If you want to have free certificates issued to you, !'<a href="/register">'join the SomeCA Community!'</a>'.?></p>
 
-<p><?=_If you want to use certificates issued by CAcert, read the CAcert !'<a href="/policy/RootDistributionLicense.html">'Root Distribution License!'</a>'.?>
-<?=_This license applies to using the CAcert !'<a href="/roots">'root keys!'</a>'.?></p>
+<p><?=_If you want to use certificates issued by SomeCA, read the SomeCA !'<a href="/policy/RootDistributionLicense.html">'Root Distribution License!'</a>'.?>
+<?=_This license applies to using the SomeCA !'<a href="/roots">'root keys!'</a>'.?></p>
 
 <hr/>
 
-<h3><?=_For CAcert Community Members?></h3>
+<h3><?=_For SomeCA Community Members?></h3>
 
-<p><?=_Have you passed the CAcert !'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">'Assurer Challenge!'</a>' yet??></p>
+<p><?=_Have you passed the SomeCA !'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">'Assurer Challenge!'</a>' yet??></p>
 
-<p><?=_Have you read the CAcert !'<a href="/policy/CAcertCommunityAgreement.html">'Community Agreement!'</a>' yet??></p>
+<p><?=_Have you read the SomeCA !'<a href="/policy/CAcertCommunityAgreement.html">'Community Agreement!'</a>' yet??></p>
 
-<p><?=_For general documentation and help, please visit the CAcert !'<a href="http://wiki.CAcert.org">'Wiki Documentation site!'</a>'.?>
-<?=_For specific policies, see the CAcert !'<a href="/policy/">'Approved Policies page!'</a>'.?></p>
+<p><?=_For general documentation and help, please visit the SomeCA !'<a href="http://wiki.SomeCA.org">'Wiki Documentation site!'</a>'.?>
+<?=_For specific policies, see the SomeCA !'<a href="/policy/">'Approved Policies page!'</a>'.?></p>
diff --git a/src/org/cacert/gigi/pages/PolicyIndex.java b/src/org/cacert/gigi/pages/PolicyIndex.java
index 25e69446..30c58856 100644
--- a/src/org/cacert/gigi/pages/PolicyIndex.java
+++ b/src/org/cacert/gigi/pages/PolicyIndex.java
@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 public class PolicyIndex extends Page {
 
     public PolicyIndex() {
-        super("CAcert.org Policies");
+        super("SomeCA.org Policies");
     }
 
     File root = new File("static/www/policy");
diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 48d504ad..0d807dec 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -1,9 +1,9 @@
 <h3><?=_CAcert Certificate Acceptable Use Policy?></h3>
-<p><?=_I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.?></p>
+<p><?=_I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to SomeCA Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.?></p>
 
-<p><?=_CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
+<p><?=_CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with SomeCA Inc.'s CPS and supporting documentation published at?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
 
-<p><?=_If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.?></p>
+<p><?=_If the Subscriber's name and/or domain name registration change the subscriber will immediately inform SomeCA Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.?></p>
 
 <table class="table">
   <thead>
@@ -69,7 +69,7 @@
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
     <td align="left">
-      <label for="CCA"><strong><?=_I accept the CAcert Community Agreement ($!{CCA}).?> </strong><br />
+      <label for="CCA"><strong><?=_I accept the SomeCA Community Agreement ($!{CCA}).?> </strong><br />
       <?=_Please note: You need to accept the CCA to proceed.?></label>
     </td>
   </tr>
diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
index 51a8f574..800c6835 100644
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
@@ -48,7 +48,7 @@
   <tr>
     <td></td>
     <td>
-        <?=_Please list up to four services using your certificate. You need to have one of them up and using a valid CAcert certificate or a specific self-signed certificate in order to pass this test?>:
+        <?=_Please list up to four services using your certificate. You need to have one of them up and using a valid SomeCA certificate or a specific self-signed certificate in order to pass this test?>:
         <?=_The self-signed certificate needs to contain your domain as CN and $tokenValue as organization unit, with -subj "/CN=<domain>/OU=$tokenValue"?>:
         <table>
         <? foreach($ssl-services){ ?>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index 74fb02bb..46b92995 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -85,8 +85,8 @@ public class SupportUserDetailsForm extends Form {
                 body.append("\n");
                 body.append(l.getTranslation("Best regards"));
                 body.append("\n");
-                body.append(l.getTranslation("CAcert.org Support!"));
-                Sendmail.getInstance().sendmail(user.getTargetUser().getEmail(), "[CAcert.org] " + l.getTranslation("Password reset by support."), body.toString(), "support@cacert.org", null, null, null, null, false);
+                body.append(l.getTranslation("SomeCA.org Support!"));
+                Sendmail.getInstance().sendmail(user.getTargetUser().getEmail(), "[SomeCA.org] " + l.getTranslation("Password reset by support."), body.toString(), "support@cacert.org", null, null, null, null, false);
                 out.println(Page.getLanguage(req).getTranslation("Password reset successful."));
             } catch (IOException e) {
                 e.printStackTrace();
diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.templ b/src/org/cacert/gigi/pages/main/RegisterPage.templ
index 4fbb41d5..327d4c84 100644
--- a/src/org/cacert/gigi/pages/main/RegisterPage.templ
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.templ
@@ -1,8 +1,8 @@
-<p><?=_By joining CAcert and becoming a member, you agree to the CAcert Community Agreement. Please take a moment now to read that and agree to it; this will be required to complete the process of joining.?></p>
+<p><?=_By joining SomeCA and becoming a member, you agree to the SomeCA Community Agreement. Please take a moment now to read that and agree to it; this will be required to complete the process of joining.?></p>
 <p><?=_Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.?></p>
 <p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
 <b><?=_Note: Please enter your date of birth and names as they are written in your official documents.?></b><br /><br />
-<?=_Because CAcert is a certificate authority (CA) people rely on us knowing about the identity of the users of our certificates. So even as we value privacy very much, we need to collect at least some basic information about our members. This is especially the case for everybody who wants to take part in our web of trust.?>
+<?=_Because SomeCA is a certificate authority (CA) people rely on us knowing about the identity of the users of our certificates. So even as we value privacy very much, we need to collect at least some basic information about our members. This is especially the case for everybody who wants to take part in our web of trust.?>
 <?=_Your private information will be used for internal procedures only and will not be shared with third parties.?>
 </p>
 <p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 52a6603f..27566aee 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -100,7 +100,7 @@ public class Signup extends Form {
             outputError(out, req, "Invalid date of birth");
         }
         if ( !"1".equals(req.getParameter("cca_agree"))) {
-            outputError(out, req, "You have to agree to the CAcert Community agreement.");
+            outputError(out, req, "You have to agree to the SomeCA Community agreement.");
         }
         if (email.equals("")) {
             outputError(out, req, "Email Address was blank");
diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index d549575a..c20ff062 100644
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -73,7 +73,7 @@
     <td colspan="3"><?=_When you click on next, we will send a confirmation email to the email address you have entered above.?></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="checkbox" name="cca_agree" value="1"><?=_I agree to the terms and conditions of the CAcert Community Agreement?>: <a href="/policy/CAcertCommunityAgreement.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td>
+    <td colspan="3"><input type="checkbox" name="cca_agree" value="1"><?=_I agree to the terms and conditions of the SomeCA Community Agreement?>: <a href="/policy/CAcertCommunityAgreement.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td>
   </tr>
 
   <tr>
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 919128ff..a840aa75 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -110,7 +110,7 @@ public class AssuranceForm extends Form {
         }
 
         if ( !"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules")) || !"1".equals(req.getParameter("CCAAgreed")) || !"1".equals(req.getParameter("assertion"))) {
-            outputError(out, req, "You failed to check all boxes to validate" + " your adherence to the rules and policies of CAcert");
+            outputError(out, req, "You failed to check all boxes to validate" + " your adherence to the rules and policies of SomeCA");
 
         }
         if ("1".equals(req.getParameter("passwordReset"))) {
@@ -164,8 +164,8 @@ public class AssuranceForm extends Form {
                     body.append("\n");
                     body.append(l.getTranslation("Best regards"));
                     body.append("\n");
-                    body.append(l.getTranslation("CAcert.org Support!"));
-                    Sendmail.getInstance().sendmail(assuree.getEmail(), "[CAcert.org] " + l.getTranslation("Password reset by assurance"), body.toString(), "support@cacert.org", null, null, null, null, false);
+                    body.append(l.getTranslation("SomeCA.org Support!"));
+                    Sendmail.getInstance().sendmail(assuree.getEmail(), "[SomeCA.org] " + l.getTranslation("Password reset by assurance"), body.toString(), "support@cacert.org", null, null, null, null, false);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 4b4fd7fe..73b102ec 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -3,7 +3,7 @@
 <tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
 </thead>
 <tbody>
-<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met ${name} in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance.?>
+<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met ${name} in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the SomeCA Arbitrator for any issues with this Assurance.?>
 </td></tr>
 
 	<tr>
@@ -20,7 +20,7 @@
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="CCAAgreed" value="1"></td>
-		<td><?=_I verify that ${name} has accepted the CAcert Community Agreement.?></td>
+		<td><?=_I verify that ${name} has accepted the SomeCA Community Agreement.?></td>
 	</tr>
 	<tr>
 		<td><?=_Location?></td>
@@ -32,11 +32,11 @@
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="assertion" value="1"></td>
-		<td><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
+		<td><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the SomeCA Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="rules" value="1"></td>
-		<td><?=_I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook.?></td>
+		<td><?=_I have read and understood the SomeCA Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook.?></td>
 	</tr>
 	<tr>
 		<td><?=_Policy?>: </td>
diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ
index a6898fec..212c4f1c 100644
--- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ
@@ -1,30 +1,30 @@
 <h3><?=_Trusted Third Parties?></h3>
 
-<p><?=_The Trusted Third Party (TTP) programme is intended to be used in areas without many CAcert Assurers.?></p>
+<p><?=_The Trusted Third Party (TTP) programme is intended to be used in areas without many SomeCA Assurers.?></p>
 
 <p><?=_A Trusted Third Party (TTP) is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on.?></p>
 
 <p><?=_With the TTP programme you can potentially gain assurance up to a maximum of 100 assurance points.?></p>
 
-<p><?=_Currently CAcert has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.?></p>
+<p><?=_Currently SomeCA has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.?></p>
 
 <p><?=_We are working to develop a process that will fill the gap of the missing 30 assurance points to allow you to get the maximum 100 assurance points.?> </p>
 
-<p><?=_In the meanwhile you would need to close this gap with face to face assurances with CAcert Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.?></p>
+<p><?=_In the meanwhile you would need to close this gap with face to face assurances with SomeCA Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.?></p>
 
 <p><?=_If you are interested in the TTP programme, read the pages !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' for the basic way how the TTP programme works for you, and !'<a href="//wiki.cacert.org/TTP/TTPAL">https://wiki.cacert.org/TTP/TTPAL</a>' whether the TTP programme affects the country where you are located.?> </p>
 
 <? if($ttp) { ?>
-<p><?=_If you want to ask for TTP assurances fill out the missing data and send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.?></p>
+<p><?=_If you want to ask for TTP assurances fill out the missing data and send the request to support@cacert.org to start the process. SomeCA will then inform you about the next steps.?></p>
 <?=$form?>
 <? } ?>
 
 <? if($topup) { ?>
-<p><?=_As you have already got 2 TTP assurances you can only take part in the TTP TOPUP programme. If you want to ask for the TTP TOPUP programme use the submit button to send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.?></p>
+<p><?=_As you have already got 2 TTP assurances you can only take part in the TTP TOPUP programme. If you want to ask for the TTP TOPUP programme use the submit button to send the request to support@cacert.org to start the process. SomeCA will then inform you about the next steps.?></p>
 <form method="post" action="ttp">
 	<input type="submit" name="ttptopup" value="<?=_I need a TTP TOPUP?>">
 </form>
-<p><?=_We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from CAcert Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.?></p>  
+<p><?=_We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from SomeCA Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.?></p>  
 <? } ?>
 
 <? if($nothing) { ?>
diff --git a/src/org/cacert/gigi/pages/wot/Rules.templ b/src/org/cacert/gigi/pages/wot/Rules.templ
index 9b61da68..43a87a44 100644
--- a/src/org/cacert/gigi/pages/wot/Rules.templ
+++ b/src/org/cacert/gigi/pages/wot/Rules.templ
@@ -1,6 +1,6 @@
 <h3><?=_CAcert Web of Trust Rules?></h3>
 
-<p><?=_It is essential that CAcert Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system.?></p>
+<p><?=_It is essential that SomeCA Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system.?></p>
 
 <p><?=_Contact?><br>
 <br>
@@ -10,7 +10,7 @@
 </p>
 
 <p><?=_Processing?><br>
-<?=_After the meeting, visit the CAcert Web site's make an Assurance page and:?><br>
+<?=_After the meeting, visit the SomeCA Web site's make an Assurance page and:?><br>
 <br>
 * <?=_Enter the applicant's email address;?><br>
 * <?=_Compare the online information to the information recorded on the paper form;?><br>
@@ -24,7 +24,7 @@
 <?=_You may charge a fee for your expenses if the applicant has been advised of the amount prior to the meeting.?></p>
 
 <p><?=_Liability?><br>
-<?=_A CAcert Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable.?></p>
+<?=_A SomeCA Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable.?></p>
 
 <p><?=_Assurance Points?><br>
-<?=_CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change.  We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of CAcert require this.?></p>
+<?=_CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change.  We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of SomeCA require this.?></p>
-- 
2.39.2