diff --git a/lib/java/src/protocol/TJSONProtocol.java b/lib/java/src/protocol/TSimpleJSONProtocol.java
similarity index 96%
rename from lib/java/src/protocol/TJSONProtocol.java
rename to lib/java/src/protocol/TSimpleJSONProtocol.java
index fefa65c..8cb3b69 100644
--- a/lib/java/src/protocol/TJSONProtocol.java
+++ b/lib/java/src/protocol/TSimpleJSONProtocol.java
@@ -16,17 +16,21 @@
 /**
  * JSON protocol implementation for thrift.
  *
+ * This protocol is write-only and produces a simple output format
+ * suitable for parsing by scripting languages.  It should not be
+ * confused with the full-featured TJSONProtocol.
+ *
  * @author Joydeep Sen Sarma <jssarma@facebook.com>
  * @author Mark Slee <mcslee@facebook.com>
  */
-public class TJSONProtocol extends TProtocol {
+public class TSimpleJSONProtocol extends TProtocol {
 
   /**
    * Factory
    */
   public static class Factory implements TProtocolFactory {
     public TProtocol getProtocol(TTransport trans) {
-      return new TJSONProtocol(trans);
+      return new TSimpleJSONProtocol(trans);
     }
   }
 
@@ -99,7 +103,7 @@
   /**
    * Constructor
    */
-  public TJSONProtocol(TTransport trans) {
+  public TSimpleJSONProtocol(TTransport trans) {
     super(trans);
   }