diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index e379b239f..7acd361e5 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -3458,9 +3458,9 @@ public class I2PSnarkServlet extends BasicServlet {
             if (esc && _manager.util().getCommentsName().length() == 0) {
                 buf.append("&nbsp;&nbsp;&nbsp;<span id=\"nameRequired\">");
                 buf.append(_t("Author name required to rate or comment"));
-                buf.append("&nbsp;&nbsp;<a href=\"").append(_contextPath).append("/configure#configureAuthor\">");
-                buf.append(_t("[Configure]"));
-                buf.append("</a></span>");
+                buf.append("&nbsp;&nbsp;<a href=\"").append(_contextPath).append("/configure#configureAuthor\">[");
+                buf.append(_t("Configure"));
+                buf.append("]</a></span>");
             } else {
                 buf.append("&nbsp;&nbsp;&nbsp;<span id=\"nameRequired\"><span class=\"commentAuthorName\" title=\"")
                    .append(_t("Your author name for published comments and ratings"))
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index f3378be50..f4f74cf04 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -1370,7 +1370,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 "<input type=\"hidden\" name=\"dest\" value=\"" + ahelperKey + "\">\n" +
                 "<input type=\"hidden\" name=\"nonce\" value=\"" + _proxyNonce + "\">\n" +
 
-                "<h4>" + _t("Save {0} to Router address book and continue to website", destination) + "</h4>\n<p>" +
+                "<h4>" + _t("Save {0} to router address book and continue to website", destination) + "</h4>\n<p>" +
                 _t("This address will be saved to your Router address book where your subscription-based addresses are stored."));
         if(_context.namingService().getName().equals("BlockfileNamingService")) {
             out.write(" " + _t("If you want to keep track of sites you have added manually, add to your Master or Private address book instead."));
@@ -1381,12 +1381,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
         if(_context.namingService().getName().equals("BlockfileNamingService")) {
             // only blockfile supports multiple books
 
-            out.write("<h4>" + _t("Save {0} to Master address book and continue to website", destination) + "</h4>\n<p>" +
+            out.write("<h4>" + _t("Save {0} to master address book and continue to website", destination) + "</h4>\n<p>" +
             _t("This address will be saved to your Master address book. Select this option for addresses you wish to keep separate from the main router address book, but don't mind publishing.") +
             "</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"master\" value=\"master\">" +
             _t("Save & continue") + "</button></div>\n");
 
-            out.write("<h4>" + _t("Save {0} to Private address book and continue to website", destination) + "</h4>\n<p>" +
+            out.write("<h4>" + _t("Save {0} to private address book and continue to website", destination) + "</h4>\n<p>" +
             _t("This address will be saved to your Private address book, ensuring it is never published.") +
             "</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"private\" value=\"private\">" +
             _t("Save & continue") + "</button></div>\n");
diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 2425b2a05..2c10bb4a3 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -290,7 +290,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
          <% } // ircclient %>
     </table>
 
-    <h3><%=intl._t("Advanced Networking Options")%></h3>
+    <h3><%=intl._t("Advanced networking options")%></h3>
 
     <table class="tunnelConfig">
 
@@ -462,7 +462,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
         <tr>
             <td>
                 <b><%=intl._t("Reduced tunnel count")%>:</b>
-                <input type="text" id="reducedTunnelCount" name="reduceCount" size="1" maxlength="1" title="<%=intl._t("Reduced Tunnel Count")%>" value="<%=editBean.getReduceCount(curTunnel)%>" class="freetext quantity" />
+                <input type="text" id="reducedTunnelCount" name="reduceCount" size="1" maxlength="1" title="<%=intl._t("Reduced tunnel count")%>" value="<%=editBean.getReduceCount(curTunnel)%>" class="freetext quantity" />
             </td>
 
             <td>
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index cfc2f08ab..0185e9c77 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -295,7 +295,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
          %>
     </table>
 
-    <h3><%=intl._t("Advanced Networking Options")%></h3>
+    <h3><%=intl._t("Advanced networking options")%></h3>
 
     <table id="#advancedServerTunnelOptions" class="tunnelConfig">
         <tr>
diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp
index b4fcdc435..7f0e3a1a2 100644
--- a/apps/i2ptunnel/jsp/register.jsp
+++ b/apps/i2ptunnel/jsp/register.jsp
@@ -79,14 +79,14 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
     </tr>
     <tr>
         <td>
-            <b><%=intl._t("Tunnel Name")%>:</b> <%=editBean.getTunnelName(curTunnel)%>
+            <b><%=intl._t("Tunnel name")%>:</b> <%=editBean.getTunnelName(curTunnel)%>
         </td>
     </tr>
 
 <%
       if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) {
           %>
-    <tr><td><b><%=intl._t("Website Name")%>:</b> <%=editBean.getSpoofedHost(curTunnel)%></td></tr>
+    <tr><td><b><%=intl._t("Website name")%>:</b> <%=editBean.getSpoofedHost(curTunnel)%></td></tr>
 <%
        }
 %>
@@ -425,7 +425,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
           %>
     <tr>
         <td>
-            <b><%=intl._t("Old Hostname")%>:</b>
+            <b><%=intl._t("Old hostname")%>:</b>
             <input type="text" size="30" maxlength="50" name="oldname" id="oldName" value="<%=oldname%>" class="freetext" />
         </td>
     </tr>
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index 1eddd3259..69d44fd37 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -284,7 +284,7 @@ class SummaryBarRenderer {
         buf.append("<a title=\"")
            .append(_t("View active leasesets (debug mode)"))
            .append("\" href=\"/netdb?l=2\">")
-           .append(nbsp(_t("Leasesets")))
+           .append(nbsp(_t("LeaseSets")))
            .append("</a>\n")
 
            .append("<a title=\"")