diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 4c3a8d0287..c0dd04cf47 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -16,7 +16,7 @@
 %>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><%=intl._("I2P Tunnel Manager - Edit Client Tunnel")%></title>
+    <title><%=intl._("Hidden Services Manager")%> - <%=intl._("Edit Client Tunnel")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 16d2bf9c00..fa752e00f0 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -16,7 +16,7 @@
 %>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><%=intl._("I2P Tunnel Manager - Edit Server Tunnel")%></title>
+    <title><%=intl._("Hidden Services Manager")%> - <%=intl._("Edit Hidden Service")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 0b63e98f31..feff5539cb 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -19,7 +19,7 @@
 <jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" />
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><%=intl._("I2P Tunnel Manager - List")%></title>
+    <title><%=intl._("Hidden Services Manager")%></title>
     
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
@@ -83,7 +83,7 @@
     <div id="localServerTunnelList" class="panel">
         <div class="header">
             
-    <h4><%=intl._("I2P Server Tunnels")%></h4>
+    <h4><%=intl._("I2P Hidden Services")%></h4>
         </div>
 
         
@@ -187,10 +187,10 @@
             <form id="addNewServerTunnelForm" action="edit"> 
             <div class="toolbox">
                     
-        <label><%=intl._("New server tunnel")%>:</label>
+        <label><%=intl._("New hidden service")%>:</label>
                     <select name="type">
-                        <option value="server"><%=intl._("Standard")%></option>
                         <option value="httpserver">HTTP</option>
+                        <option value="server"><%=intl._("Standard")%></option>
                         <option value="httpbidirserver">HTTP bidir</option>
                         <option value="ircserver">IRC</option>
                         <option value="streamrserver">Streamr</option>
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 cc31ad48f9..180ca01744 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -40,7 +40,7 @@ public class SummaryBarRenderer {
         aMap.put("Tunnels", "Tunnels");
         aMap.put("Congestion", "Congestion");
         aMap.put("TunnelStatus", "Tunnel Status");
-        aMap.put("Destinations", "Local Destinations");
+        aMap.put("Destinations", "Hidden Services and Clients");
         aMap.put("NewsHeadings", "News &amp; Updates");
         SECTION_NAMES = Collections.unmodifiableMap(aMap);
     }
@@ -219,9 +219,9 @@ public class SummaryBarRenderer {
            .append("</a>\n" +
 
                     "<a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
-           .append(_("Local Destinations"))
+           .append(_("Hidden Services and Clients"))
            .append("\">")
-           .append(nbsp(_("I2PTunnel")))
+           .append(nbsp(_("Hidden Services Manager")))
            .append("</a>\n" +
 
                    "<a href=\"/dns\" target=\"_top\" title=\"")
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 953fdb34f7..3025087c74 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -416,7 +416,10 @@ public class SummaryHelper extends HelperBase {
         List<Destination> clients = new ArrayList<Destination>(_context.clientManager().listClients());
         
         StringBuilder buf = new StringBuilder(512);
-        buf.append("<h3><a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"").append(_("Add/remove/edit &amp; control your client and server tunnels")).append("\">").append(_("Local Destinations")).append("</a></h3><hr class=\"b\"><div class=\"tunnels\">");
+        buf.append("<h3><a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
+           .append(_("Add/remove/edit &amp; control your client and server tunnels"))
+           .append("\">").append(_("Hidden Services and Clients"))
+           .append("</a></h3><hr class=\"b\"><div class=\"tunnels\">");
         if (!clients.isEmpty()) {
             Collections.sort(clients, new AlphaComparator());
             buf.append("<table>");
@@ -427,7 +430,7 @@ public class SummaryHelper extends HelperBase {
                 
                 buf.append("<tr><td align=\"right\"><img src=\"/themes/console/images/");
                 if (_context.clientManager().shouldPublishLeaseSet(h))
-                    buf.append("server.png\" alt=\"Server\" title=\"").append(_("Server")).append("\">");
+                    buf.append("server.png\" alt=\"Server\" title=\"").append(_("Hidden Service")).append("\">");
                 else
                     buf.append("client.png\" alt=\"Client\" title=\"").append(_("Client")).append("\">");
                 buf.append("</td><td align=\"left\"><b><a href=\"tunnels#").append(h.toBase64().substring(0,4));
diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp
index 6be2d9d2e9..e2fe98b877 100644
--- a/apps/routerconsole/jsp/confighome.jsp
+++ b/apps/routerconsole/jsp/confighome.jsp
@@ -55,7 +55,7 @@ input.default {
    }  // shouldShowSearch()
 %>
 
-<h3><%=intl._("Recommended Eepsites")%></h3>
+<h3><%=intl._("Hidden Services of Interest")%></h3>
 <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
  <input type="hidden" name="group" value="1">
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index cbad4cb643..5dd70f2e19 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -111,7 +111,7 @@
    }  // shouldShowSearch()
 %>
   <div class="ag2">
-    <h4 class="app"><%=intl._("Eepsites of Interest")%></h4>
+    <h4 class="app"><%=intl._("Hidden Services of Interest")%></h4>
     <jsp:getProperty name="homehelper" property="favorites" /><br>
   </div>
   <div class="ag2">
diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
index c5b20d676a..45ff895a6c 100644
--- a/apps/routerconsole/jsp/i2ptunnelmgr.jsp
+++ b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
@@ -15,7 +15,7 @@
 
 <html><head>
 <%@include file="css.jsi" %>
-<%=intl.title("i2p tunnel manager")%>
+<%=intl.title("Hidden Services Manager")%>
 <script src="/js/ajax.js" type="text/javascript"></script>
 <script src="/js/iframed.js" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
@@ -52,7 +52,7 @@
 
 <%@include file="summary.jsi" %>
 
-<h1><%=intl._("I2P Tunnel Manager")%> <span class="newtab"><a href="/i2ptunnel/" target="_blank" title="<%=intl._("Open in new tab")%>"><img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/newtab.png" /></a></span></h1>
+<h1><%=intl._("Hidden Services Manager")%> <span class="newtab"><a href="/i2ptunnel/" target="_blank" title="<%=intl._("Open in new tab")%>"><img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/newtab.png" /></a></span></h1>
 <div class="main" id="main">
 <iframe src="/i2ptunnel/" width="100%" height="100%" frameborder="0" border="0" name="i2ptunnelframe" id="i2ptunnelframe" onload="setupFrame()" allowtransparency="true">
 <%=intl._("Your browser does not support iFrames.")%>
diff --git a/history.txt b/history.txt
index 8dd4cdb7e4..52bec45356 100644
--- a/history.txt
+++ b/history.txt
@@ -4,10 +4,14 @@
    - Include in update, use version in base dir too
    - Increase limits
    - Bug fixes
+ * EepGet: Change command line default to 0 retries
  * Latency reduction all over:
    - SSU: Reduce ack delay
    - Streaming: Reduce min RTO and flusher delay
    - Tunnels: Reduce GW batching time
+ * Streaming:
+   - Add API for sending/receiving payload in ping/pong
+   - Fix PcapWriter
  * UrlLauncher:
    - Configure browser with routerconsole.browser (ticket #1159)
    - Convert to ClientApp interface
diff --git a/installer/resources/eepsite/docroot/help/index.html b/installer/resources/eepsite/docroot/help/index.html
index 1a8d0e9bb5..d9900bb4ea 100644
--- a/installer/resources/eepsite/docroot/help/index.html
+++ b/installer/resources/eepsite/docroot/help/index.html
@@ -1,6 +1,6 @@
 <html>
  <head>
-  <title>I2P Anonymous Webserver | Welcome to your eepsite</title>
+  <title>I2P Hidden Service Website</title>
   <link rel="shortcut icon" href="favicon.ico" />
     <link rel="stylesheet" type="text/css" href="lib/eepsite.css" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -8,7 +8,7 @@
  <body>
 <div class="fairylights">
 <div class="main">
- <h1>I2P Anonymous Webserver</h1>
+ <h1>I2P Hidden Service Website</h1>
 <div class="langbar">
 <!-- Some of these languages listed here are yet to be translated -->
 <a href="index.html"><img src="lib/us.png" title="English" alt="English"></a>
@@ -24,58 +24,58 @@
 </div>
 <h2>Quick Guide to Anonymous Webserving on I2P</h2>
 
- <p>This is your eepsite, your own anonymous I2P webserver - simply edit the files under <code>~/.i2p/eepsite/docroot/</code> (Linux) or <code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows)  
+ <p>This is your own anonymous I2P webserver ("eepsite") - simply edit the files under <code>~/.i2p/eepsite/docroot/</code> (Linux) or <code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows)  
  and they'll be reachable by others once you follow the instructions below.
- In I2P, eepsites are addressed using a 'key', which is represented as a really long Base64 string.
+ In I2P, hidden services are addressed using a 'key', which is represented as a really long Base64 string.
  (The 'key' is somewhat analogous to an IP address, and
- is shown on the eepsite's I2PTunnel
+ is shown on the hidden service
  <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">configuration page</a>).
- The instructions below detail how to assign a name like "mysite.i2p" to your key and start up your eepsite.</p>
- <p>You can reach your eepsite locally via 
+ The instructions below detail how to assign a name like "mysite.i2p" to your key and start up your website.</p>
+ <p>You can reach your site locally via 
  <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>.
 </p>
 
- <h2>How to set up and announce your eepsite</h2>
- Your eepsite is stopped by default.
+ <h2>How to set up and announce your hidden service website</h2>
+ Your website is stopped by default.
  After you start it, it will be difficult for other people to find because it
  doesn't have a name and they don't have your really long Base64 key.
  You could just tell people that really long key, but thankfully I2P has an address book
- and several easy ways to tell people about your eepsite. Here's detailed instructions.
+ and several easy ways to tell people about your website. Here's detailed instructions.
  <ul>
- <li>Pick a name for your eepsite (<i>something</i>.i2p). Use all lower-case.
+ <li>Pick a name for your website (<i>something</i>.i2p). Use all lower-case.
      You may wish to check first in your own router's address book
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router&amp;filter=none">here</a>,
      or the file <code>i2p/hosts.txt</code> to see if your name is already taken.
-     Enter the new name for your eepsite on the
-     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>
+     Enter the new name for your website on the
+     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">hidden service configuration page</a>
      where it says "Website name". This will replace the default "mysite.i2p".
-     Also, check the "Auto Start" box. Your eepsite will now start every time you start your router.
+     Also, check the "Auto Start" box. Your website will now start every time you start your router.
      Be sure to click "Save".</li>
- <li>Click the start button for your eepsite on the
+ <li>Click the start button for your website on the
      <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">main i2ptunnel configuration page</a>.
-     You should now see "eepsite" listed under "Local Destinations" on the left side of the
+     You should now see it listed under "Hidden Services and Clients" on the left side of the
      <a href="http://127.0.0.1:7657/index.jsp">I2P Router Console</a>.
-     Your eepsite is now running.</li>
+     Your website is now running.</li>
  <li>Highlight the entire "Local destination" key on the
-     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>.
+     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">hidden service configuration page</a>.
      and copy it for
      later pasting. Make sure you get the whole thing - it's over 500 characters.</li>
  <li>Enter the name and paste in the destination key into your
      <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">master address book</a>.
      Click "Add" to add the destination to your address book.</li>
- <li>In your browser, enter in your eepsite name (<i>something</i>.i2p) and you should
+ <li>In your browser, enter in your website name (<i>something</i>.i2p) and you should
  be right back here. Hopefully it worked.</li>
- <li>Before you tell the world about your new eepsite, you should add some content.
+ <li>Before you tell the world about your new website, you should add some content.
  Go to <code>~/.i2p/eepsite/docroot/</code> (Linux) or <code>%APPDATA%\I2P\eepsite\docroot\</code> (Windows) and replace the index.html redirect page with your own content. Virtual folders work, so you can host files from a sub directory without explicitly needing to provide a page with links to files. If you need a template for a basic site, feel free to borrow and adapt <a href="pagetemplate.html">this page</a> and <a href="lib/">content</a>!</li>
 </ul>
 <h2>Register your own .I2P Domain</h2><ul>
- <li>Now it's time to add your eepsite to an I2P address book hosted by a site
+ <li>Now it's time to add your website to an I2P address book hosted by a site
      such as <a href="http://stats.i2p/">stats.i2p</a> or <a href="http://no.i2p/">no.i2p</a>.
      That is, you must enter
-     your eepsite name and key into a web interface on one or more of these sites.
+     your website name and key into a web interface on one or more of these sites.
      Here is <a href="http://stats.i2p/i2p/addkey.html">the key entry form at stats.i2p</a>.
      Again, your key is the entire "Local destination" key on the
-     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>.
+     <a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">hidden service configuration page</a>.
      Be sure you get the whole thing.
      Don't forget to click "add a key".
      Check to see if it reports the key was added.
@@ -83,7 +83,6 @@
 </ul><h2>Adding Addressbook Subscriptions</h2><ul>
  <li>Speaking of address book updates, this would be a good time to add some more addressbooks
      to your own <a href="http://127.0.0.1:7657/susidns/subscriptions.jsp">subscription list</a>. Go to your subscriptions configuration page and add a couple of these for an automatically updated list of new hosts:<ul>
-     <li><a href="http://tino.i2p/hosts.txt">http://tino.i2p/hosts.txt</a></li>
      <li><a href="http://stats.i2p/cgi-bin/newhosts.txt">http://stats.i2p/cgi-bin/newhosts.txt</a></li>
      <li><a href="http://i2host.i2p/cgi-bin/i2hostetag">http://i2host.i2p/cgi-bin/i2hostetag</a></li>
      <li><a href="http://no.i2p/export/alive-hosts.txt">http://no.i2p/export/alive-hosts.txt</a></li></ul>
@@ -94,7 +93,7 @@
      or <code>http://i2host.i2p/cgi-bin/i2hostjump?<i>something</i>.i2p</code>
      into your browser.
      Once it's working, then you can tell others to use it.</li>
- <li>Some people check eepsite lists such as
+ <li>Some people check website lists such as
  <a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p/status.php</a> or <a href="http://perv.i2p">perv.i2p</a> for new eepsites, so you may start getting a few visitors. But there are plenty of other ways to tell people. Here are a few ideas:
      <ul>
      <li>Post a message on the <a href="http://forum.i2p/viewforum.php?f=16">Eepsite announce forum</a>
diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html
index 351ce8911e..8fd39f406b 100644
--- a/installer/resources/readme/readme.html
+++ b/installer/resources/readme/readme.html
@@ -7,7 +7,7 @@
 <h3>Services on I2P</h3>
 <ul class="links">
 
-<li class="tidylist"><b>Invisible Internet &amp; Public Web Browsing</b><br>On I2P you can access anonymous websites (eepsites) and other services (e.g. ssh over I2P, IRC, Jabber etc.) in addition to being able to host your own services. You can also access the normal web anonymously via I2P's built-in web proxy (outproxy). <a href="https://geti2p.net/en/about/browser-config" target="_blank">Configure your browser</a> to use the HTTP proxy at <code>127.0.0.1 port 4444</code>, then browse to an eepsite or a normal, unencrypted <code>http://</code> address. If you wish to disable or change outproxy access to the normal internet, remove or modify the outproxy entry for <code>false.i2p</code> under the <i>Outproxies</i> option in the <a href="/i2ptunnel/edit?tunnel=0" target="_blank">I2P HTTP Proxy  Tunnel Editor</a>. In the "Sites of Interest" section <a href="#eepsites">below</a>, we list a few of the sites hosted on I2P.</li>
+<li class="tidylist"><b>Invisible Internet &amp; Public Web Browsing</b><br>On I2P you can access hidden service websites ("eepsites") and other services (e.g. ssh over I2P, IRC, Jabber etc.) in addition to being able to host your own services. You can also access the normal web anonymously via I2P's built-in web proxy (outproxy). <a href="https://geti2p.net/en/about/browser-config" target="_blank">Configure your browser</a> to use the HTTP proxy at <code>127.0.0.1 port 4444</code>, then browse to a hidden service website or a normal, unencrypted <code>http://</code> address. If you wish to disable or change outproxy access to the normal internet, remove or modify the outproxy entry for <code>false.i2p</code> under the <i>Outproxies</i> option in the <a href="/i2ptunnel/edit?tunnel=0" target="_blank">I2P HTTP Proxy  Tunnel Editor</a>. In the "Sites of Interest" section <a href="#eepsites">below</a>, we list a few of the sites hosted on I2P.</li>
 
 <li class="tidylist"><b>Anonymous E-Mail</b><br>Postman's I2P-based mail system can be accessed either via <a href="/webmail">I2P's built-in mail client</a>
   (susimail) or using any mail client that supports smtp and pop3.
@@ -35,18 +35,18 @@
 <h3>Anonymous Encrypted Web Hosting on I2P</h3>
 <ul class="links">
 
-<li class="tidylist"><b>Ready to Roll!</b><br>I2P comes with a built-in, ready-to-go web server for hosting your own anonymous website (eepsite) on the I2P network: a <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> instance listening on <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. To host your own content,
+<li class="tidylist"><b>Ready to Roll!</b><br>I2P comes with a built-in, ready-to-go web server for hosting your own hidden service website ("eepsite") on the I2P network: a <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> instance listening on <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. To host your own content,
   simply place your files in the <code>eepsite/docroot/</code> directory (or place 
   any standard JSP/Servlet .war files under <code>eepsite/webapps</code>, 
   or standard CGI scripts under <code>eepsite/cgi-bin</code>) and they'll show 
   up. You can also run any alternative web server platform over I2P and replace the built-in server, or run it on another tunnel.</li>
 <li class="tidylist"><b>Start Your Tunnel</b><br>  
   After starting up, your pre-configured <a href="/i2ptunnel/" target="_blank">I2P Webserver Tunnel</a>,  
-  your eepsite will be visible (but not discoverable) to others. Detailed instructions for starting 
-  your eepsite, registering an .i2p domain and promoting your site to others are accessible via your own I2P webserver on <a href="http://127.0.0.1:7658/help/" target="_blank">http://127.0.0.1:7658/help/</a>.</li></ul>
+  your website will be visible (but not discoverable) to others. Detailed instructions for starting 
+  your website, registering an .i2p domain and promoting your site to others are accessible via your own I2P webserver on <a href="http://127.0.0.1:7658/help/" target="_blank">http://127.0.0.1:7658/help/</a>.</li></ul>
     
 <a name="eepsites"></a>    
-    <h3>I2P-Hosted Sites of Interest</h3>
+    <h3>I2P-Hidden Services of Interest</h3>
     <ul class="links">
       <li class="tidylist"><b>Invisible Internet Project (I2P) Official Website</b><br><a href="http://i2p-projekt.i2p" target="_blank">i2p-projekt.i2p</a>: Secure and
         anonymous connections to <a href="https://geti2p.net/en/" target="_blank">geti2p.net</a>. If you want to know more about how I2P works or how you can participate, this is your first port of call!</li>
@@ -57,10 +57,10 @@
         archive  with  source code (where permissible), information about I2P, including a <a href="http://echelon.i2p/I2Pguide/index.html" target="_blank">beginner's guide</a> and pre-release developer builds of I2P for the adventurous to try.</li>
         <li class="tidylist"><b>Ugha's Wiki</b><br><a href="http://ugha.i2p/" target="_blank">ugha.i2p</a>: An open wiki that anyone can edit with plenty of information  about I2P, help for beginners, additional links into the network, and more.</li>
         <li class="tidylist"><b>The Planet (on I2P)</b><br><a href="http://planet.i2p/" target="_blank">planet.i2p</a>: An RSS aggregator site that takes news and events from around I2P and publishes them all in one place. A good site to visit to see the community at work!</li>
-        <li class="tidylist"><b>Eepsite Search Engine</b><br><a href="http://eepsites.i2p/" target="_blank">eepsites.i2p</a>: An 
-        anonymously-hosted eepsite search engine.</li>
+        <li class="tidylist"><b>Website Search Engine</b><br><a href="http://eepsites.i2p/" target="_blank">eepsites.i2p</a>: An 
+        anonymously-hosted hidden service search engine.</li>
       <li class="tidylist"><b>I2P Network Health</b><br><a href="http://stats.i2p/cgi-bin/dashboard.cgi" target="_blank">stats.i2p</a>: Check out various aspects of network performance with this I2P network monitoring site run by zzz.</li> 
-      <li class="tidylist"><b>Discover I2P</b><br>There are many more eepsites - just follow the links from the ones you see, 
+      <li class="tidylist"><b>Discover I2P</b><br>There are many more hidden services - just follow the links from the ones you see, 
       bookmark your favourites, and visit them often!<br></li>     
     </ul>
 
@@ -80,7 +80,7 @@
    </li>
   
 <li class="tidylist"><b>Check Your Proxy Setttings</b><br>If 
-  you cannot see any eepsites at all (not even <a href="http://i2p-projekt.i2p/" target="_blank">i2p-projekt.i2p</a>), 
+  you cannot see any websites at all (not even <a href="http://i2p-projekt.i2p/" target="_blank">i2p-projekt.i2p</a>), 
   make sure your browser's proxy is set to access http traffic (<i>not</i> https, <i>not</i> socks) via <code>127.0.0.1 port 4444</code>. If you need some help, there's <a href="https://geti2p.net/en/about/browser-config" target="_blank">a guide</a> to configuring your browser for I2P use.
   </li>
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4e28a2c8d2..c10128fe62 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
     public final static String EXTRA = "";
