From 6d7f1bc43437e8a876eef1a3e36a17fbd5805cb1 Mon Sep 17 00:00:00 2001
From: AhyoungRyu <fbdkdud93@hanmail.net>
Date: Wed, 1 Jun 2016 11:56:52 -0700
Subject: [PATCH 1/3] ZEPPELIN-931: fix interpreter listing bug

---
 .../java/org/apache/zeppelin/interpreter/Interpreter.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
index 5ad0980cd26..62155eed004 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
@@ -225,11 +225,11 @@ public static enum FormType {
    * Represent registered interpreter class
    */
   public static class RegisteredInterpreter {
-    @SerializedName("interpreterGroup")
+    //@SerializedName("interpreterGroup")
     private String group;
-    @SerializedName("interpreterName")
+    //@SerializedName("interpreterName")
     private String name;
-    @SerializedName("interpreterClassName")
+    //@SerializedName("interpreterClassName")
     private String className;
     private Map<String, InterpreterProperty> properties;
     private String path;

From fed1b40b5ac40c9b8538db2835839a703099ddb7 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Thu, 2 Jun 2016 10:54:35 +0900
Subject: [PATCH 2/3] - Fixed fieldName in interpreter-setting.json

---
 .../main/resources/interpreter-setting.json   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/spark/src/main/resources/interpreter-setting.json b/spark/src/main/resources/interpreter-setting.json
index ee7a1925781..1d36a2949c2 100644
--- a/spark/src/main/resources/interpreter-setting.json
+++ b/spark/src/main/resources/interpreter-setting.json
@@ -1,8 +1,8 @@
 [
   {
-    "interpreterGroup": "spark",
-    "interpreterName": "spark",
-    "interpreterClassName": "org.apache.zeppelin.spark.SparkInterpreter",
+    "group": "spark",
+    "name": "spark",
+    "className": "org.apache.zeppelin.spark.SparkInterpreter",
     "properties": {
       "spark.executor.memory": {
         "envName": null,
@@ -56,9 +56,9 @@
     }
   },
   {
-    "interpreterGroup": "spark",
-    "interpreterName": "sql",
-    "interpreterClassName": "org.apache.zeppelin.spark.SparkSqlInterpreter",
+    "group": "spark",
+    "name": "sql",
+    "className": "org.apache.zeppelin.spark.SparkSqlInterpreter",
     "properties": {
       "zeppelin.spark.concurrentSQL": {
         "envName": "ZEPPELIN_SPARK_CONCURRENTSQL",
@@ -81,9 +81,9 @@
     }
   },
   {
-    "interpreterGroup": "spark",
-    "interpreterName": "dep",
-    "interpreterClassName": "org.apache.zeppelin.spark.DepInterpreter",
+    "group": "spark",
+    "name": "dep",
+    "className": "org.apache.zeppelin.spark.DepInterpreter",
     "properties": {
       "zeppelin.dep.localrepo": {
         "envName": "ZEPPELIN_DEP_LOCALREPO",
@@ -100,9 +100,9 @@
     }
   },
   {
-    "interpreterGroup": "spark",
-    "interpreterName": "pyspark",
-    "interpreterClassName": "org.apache.zeppelin.spark.PySparkInterpreter",
+    "group": "spark",
+    "name": "pyspark",
+    "className": "org.apache.zeppelin.spark.PySparkInterpreter",
     "properties": {
       "zeppelin.pyspark.python": {
         "envName": "PYSPARK_PYTHON",
@@ -113,9 +113,9 @@
     }
   },
   {
-    "interpreterGroup": "spark",
-    "interpreterName": "r",
-    "interpreterClassName": "org.apache.zeppelin.spark.SparkRInterpreter",
+    "group": "spark",
+    "name": "r",
+    "className": "org.apache.zeppelin.spark.SparkRInterpreter",
     "properties": {
       "zeppelin.R.knitr": {
         "envName": "ZEPPELIN_R_KNITR",

From 6121f9b5da1cd2edd17ab8c6d46857a9be54ed80 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Thu, 2 Jun 2016 13:48:59 +0900
Subject: [PATCH 3/3] - Fixed documentation

---
 docs/development/writingzeppelininterpreter.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md
index e7bf6359a81..04b2bb9e9e8 100644
--- a/docs/development/writingzeppelininterpreter.md
+++ b/docs/development/writingzeppelininterpreter.md
@@ -47,9 +47,9 @@ Here is an example of `interpareter-setting.json` on your own interpreter.
 ```json
 [
   {
-    "interpreterGroup": "your-group",
-    "interpreterName": "your-name",
-    "interpreterClassName": "your.own.interpreter.class",
+    "group": "your-group",
+    "name": "your-name",
+    "className": "your.own.interpreter.class",
     "properties": {
       "propertiies1": {
         "envName": null,