diff --git a/markdown/src/main/java/org/apache/zeppelin/markdown/MarkdownInterpreter.java b/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
similarity index 93%
rename from markdown/src/main/java/org/apache/zeppelin/markdown/MarkdownInterpreter.java
rename to markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
index ca2eb7356e1..a811eabaa62 100644
--- a/markdown/src/main/java/org/apache/zeppelin/markdown/MarkdownInterpreter.java
+++ b/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
@@ -34,8 +34,8 @@
 import org.slf4j.LoggerFactory;
 
 /** MarkdownInterpreter interpreter for Zeppelin. */
-public class MarkdownInterpreter extends Interpreter {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MarkdownInterpreter.class);
+public class Markdown extends Interpreter {
+  private static final Logger LOGGER = LoggerFactory.getLogger(Markdown.class);
 
   private MarkdownParser parser;
 
@@ -60,7 +60,7 @@ public String toString() {
   public static final String PARSER_TYPE_PEGDOWN = "pegdown";
   public static final String PARSER_TYPE_MARKDOWN4J = "markdown4j";
 
-  public MarkdownInterpreter(Properties property) {
+  public Markdown(Properties property) {
     super(property);
   }
 
@@ -114,7 +114,7 @@ public int getProgress(InterpreterContext context) {
   @Override
   public Scheduler getScheduler() {
     return SchedulerFactory.singleton()
-        .createOrGetParallelScheduler(MarkdownInterpreter.class.getName() + this.hashCode(), 5);
+        .createOrGetParallelScheduler(Markdown.class.getName() + this.hashCode(), 5);
   }
 
   @Override
diff --git a/markdown/src/main/resources/interpreter-setting.json b/markdown/src/main/resources/interpreter-setting.json
index 78ad7359117..b720a5832e2 100644
--- a/markdown/src/main/resources/interpreter-setting.json
+++ b/markdown/src/main/resources/interpreter-setting.json
@@ -2,7 +2,7 @@
   {
     "group": "md",
     "name": "md",
-    "className": "org.apache.zeppelin.markdown.MarkdownInterpreter",
+    "className": "org.apache.zeppelin.markdown.Markdown",
     "properties": {
       "markdown.parser.type": {
         "envName": "MARKDOWN_PARSER_TYPE",
diff --git a/markdown/src/test/java/org/apache/zeppelin/markdown/Markdown4jParserTest.java b/markdown/src/test/java/org/apache/zeppelin/markdown/Markdown4jParserTest.java
index 6da2757149a..54448a24366 100644
--- a/markdown/src/test/java/org/apache/zeppelin/markdown/Markdown4jParserTest.java
+++ b/markdown/src/test/java/org/apache/zeppelin/markdown/Markdown4jParserTest.java
@@ -28,13 +28,13 @@
 
 public class Markdown4jParserTest {
 
-  MarkdownInterpreter md;
+  Markdown md;
 
   @Before
   public void setUp() throws Exception {
     Properties props = new Properties();
-    props.put(MarkdownInterpreter.MARKDOWN_PARSER_TYPE, MarkdownInterpreter.PARSER_TYPE_MARKDOWN4J);
-    md = new MarkdownInterpreter(props);
+    props.put(Markdown.MARKDOWN_PARSER_TYPE, Markdown.PARSER_TYPE_MARKDOWN4J);
+    md = new Markdown(props);
     md.open();
   }
 
diff --git a/markdown/src/test/java/org/apache/zeppelin/markdown/PegdownParserTest.java b/markdown/src/test/java/org/apache/zeppelin/markdown/PegdownParserTest.java
index 66d6d7681a0..3b60155077d 100644
--- a/markdown/src/test/java/org/apache/zeppelin/markdown/PegdownParserTest.java
+++ b/markdown/src/test/java/org/apache/zeppelin/markdown/PegdownParserTest.java
@@ -29,13 +29,13 @@
 
 public class PegdownParserTest {
 
-  MarkdownInterpreter md;
+  Markdown md;
 
   @Before
   public void setUp() throws Exception {
     Properties props = new Properties();
-    props.put(MarkdownInterpreter.MARKDOWN_PARSER_TYPE, MarkdownInterpreter.PARSER_TYPE_PEGDOWN);
-    md = new MarkdownInterpreter(props);
+    props.put(Markdown.MARKDOWN_PARSER_TYPE, Markdown.PARSER_TYPE_PEGDOWN);
+    md = new Markdown(props);
     md.open();
   }