diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index f87068f3affc9905fcc2eb29f8dcff39b354d70c..4813fa2a17a9504fff0cc9bc7e4bdf8cb48ac437 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -646,7 +646,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
 
     /**
      *  @param jumpServers comma- or space-separated list, or null
-     *  @param msg extra message
+     *  @param extraMessage extra message
      *  @since 0.9.14
      */
     protected void writeErrorMessage(byte[] errMessage, String extraMessage,
diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java
index 2d535c25af71f15effb077bd251ec9390ad31eb5..da67e2c02c0bf9601736f84c3abf353155cb6e2f 100644
--- a/core/java/src/net/i2p/client/I2PSession.java
+++ b/core/java/src/net/i2p/client/I2PSession.java
@@ -132,7 +132,7 @@ public interface I2PSession {
      * @since 0.7.1
      */
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
-                               int proto, int fromport, int toport) throws I2PSessionException;
+                               int proto, int fromPort, int toPort) throws I2PSessionException;
 
     /**
      * See I2PSessionMuxedImpl for proto/port details.
@@ -151,7 +151,7 @@ public interface I2PSession {
      * @since 0.7.1
      */
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
-                               int proto, int fromport, int toport) throws I2PSessionException;
+                               int proto, int fromPort, int toPort) throws I2PSessionException;
 
     /**
      * See I2PSessionMuxedImpl for proto/port details.
@@ -170,7 +170,7 @@ public interface I2PSession {
      * @since 0.8.4
      */
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
-                               int proto, int fromport, int toport, int flags) throws I2PSessionException;
+                               int proto, int fromPort, int toPort, int flags) throws I2PSessionException;
 
     /**
      * See I2PSessionMuxedImpl for proto/port details.
@@ -188,7 +188,7 @@ public interface I2PSession {
      * @since 0.9.2
      */
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size,
-                               int proto, int fromport, int toport, SendMessageOptions options) throws I2PSessionException;
+                               int proto, int fromPort, int toPort, SendMessageOptions options) throws I2PSessionException;
 
     /**
      * Send a message and request an asynchronous notification of delivery status.
@@ -211,7 +211,7 @@ public interface I2PSession {
      * @since 0.9.14
      */
     public long sendMessage(Destination dest, byte[] payload, int offset, int size,
-                               int proto, int fromport, int toport,
+                               int proto, int fromPort, int toPort,
                                SendMessageOptions options, SendMessageStatusListener listener) throws I2PSessionException;
 
     /** Receive a message that the router has notified the client about, returning
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index e84df4a38e348f69a82db9db193f3cafdad463ed..efc66a2c64381ac6af9a4e8ddfc7ff0eacd55ad0 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -554,7 +554,7 @@ public class DataHelper {
 
     /**
      *  Positive decimal without leading zeros.
-     *  @param data may be null (returns "0")
+     *  @param buf may be null (returns "0")
      *  @param len unused
      *  @return (new BigInteger(1, buf)).toString()
      *  @deprecated unused