diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc
index ba66127a7..47ea19819 100644
--- a/java/rocksjni/options.cc
+++ b/java/rocksjni/options.cc
@@ -1084,7 +1084,7 @@ jboolean Java_org_rocksdb_Options_enableWriteThreadAdaptiveYield(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_Options_setWriteThreadMaxYieldUsec(
-    JNIEnv* env, jobject jobject, jlong jhandle, jlong max) {
+    JNIEnv* env, jobject jobj, jlong jhandle, jlong max) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->
       write_thread_max_yield_usec = static_cast<int64_t>(max);
 }
@@ -4425,7 +4425,7 @@ jboolean Java_org_rocksdb_DBOptions_enableWriteThreadAdaptiveYield(
  * Signature: (JJ)V
  */
 void Java_org_rocksdb_DBOptions_setWriteThreadMaxYieldUsec(
-    JNIEnv* env, jobject jobject, jlong jhandle, jlong max) {
+    JNIEnv* env, jobject jobj, jlong jhandle, jlong max) {
   reinterpret_cast<rocksdb::DBOptions*>(jhandle)->
       write_thread_max_yield_usec = static_cast<int64_t>(max);
 }
diff --git a/java/rocksjni/rocksjni.cc b/java/rocksjni/rocksjni.cc
index 7b810f10f..53a5b8548 100644
--- a/java/rocksjni/rocksjni.cc
+++ b/java/rocksjni/rocksjni.cc
@@ -1603,13 +1603,13 @@ void Java_org_rocksdb_RocksDB_setOptions(JNIEnv* env, jobject jdb,
     jobject jobj_key = env->GetObjectArrayElement(jkeys, i);
     jobject jobj_value = env->GetObjectArrayElement(jvalues, i);
     jstring jkey = reinterpret_cast<jstring>(jobj_key);
-    jstring jvalue = reinterpret_cast<jstring>(jobj_value);
+    jstring jval = reinterpret_cast<jstring>(jobj_value);
     const char* key = env->GetStringUTFChars(jkey, NULL);
-    const char* value = env->GetStringUTFChars(jvalue, NULL);
+    const char* value = env->GetStringUTFChars(jval, NULL);
     std::string s_key(key);
     std::string s_value(value);
     env->ReleaseStringUTFChars(jkey, key);
-    env->ReleaseStringUTFChars(jvalue, value);
+    env->ReleaseStringUTFChars(jval, value);
     env->DeleteLocalRef(jobj_key);
     env->DeleteLocalRef(jobj_value);
     options_map[s_key] = s_value;
diff --git a/java/src/main/java/org/rocksdb/MutableColumnFamilyOptionsInterface.java b/java/src/main/java/org/rocksdb/MutableColumnFamilyOptionsInterface.java
index d08d7fbe8..5d3225476 100644
--- a/java/src/main/java/org/rocksdb/MutableColumnFamilyOptionsInterface.java
+++ b/java/src/main/java/org/rocksdb/MutableColumnFamilyOptionsInterface.java
@@ -101,7 +101,7 @@ public interface MutableColumnFamilyOptionsInterface {
   double memtablePrefixBloomSizeRatio();
 
   /**
-   * Page size for huge page TLB for bloom in memtable. If <=0, not allocate
+   * Page size for huge page TLB for bloom in memtable. If &le; 0, not allocate
    * from huge page TLB but from malloc.
    * Need to reserve huge pages for it to be allocated. For example:
    *     sysctl -w vm.nr_hugepages=20
@@ -115,7 +115,7 @@ public interface MutableColumnFamilyOptionsInterface {
       long memtableHugePageSize);
 
   /**
-   * Page size for huge page TLB for bloom in memtable. If <=0, not allocate
+   * Page size for huge page TLB for bloom in memtable. If &le; 0, not allocate
    * from huge page TLB but from malloc.
    * Need to reserve huge pages for it to be allocated. For example:
    *     sysctl -w vm.nr_hugepages=20
@@ -321,7 +321,7 @@ public interface MutableColumnFamilyOptionsInterface {
   long hardPendingCompactionBytesLimit();
 
   /**
-   * Number of files to trigger level-0 compaction. A value <0 means that
+   * Number of files to trigger level-0 compaction. A value &lt; 0 means that
    * level-0 compaction will not be triggered by number of files at all.
    *
    * Default: 4
@@ -334,7 +334,7 @@ public interface MutableColumnFamilyOptionsInterface {
       int level0FileNumCompactionTrigger);
 
   /**
-   * Number of files to trigger level-0 compaction. A value <0 means that
+   * Number of files to trigger level-0 compaction. A value &lt; 0 means that
    * level-0 compaction will not be triggered by number of files at all.
    *
    * Default: 4
@@ -345,7 +345,7 @@ public interface MutableColumnFamilyOptionsInterface {
 
   /**
    * Soft limit on number of level-0 files. We start slowing down writes at this
-   * point. A value <0 means that no writing slow down will be triggered by
+   * point. A value &lt; 0 means that no writing slow down will be triggered by
    * number of files in level-0.
    *
    * @param level0SlowdownWritesTrigger The soft limit on the number of
@@ -357,7 +357,7 @@ public interface MutableColumnFamilyOptionsInterface {
 
   /**
    * Soft limit on number of level-0 files. We start slowing down writes at this
-   * point. A value <0 means that no writing slow down will be triggered by
+   * point. A value &lt; 0 means that no writing slow down will be triggered by
    * number of files in level-0.
    *
    * @return The soft limit on the number of