diff --git a/bin/hbase b/bin/hbase
index 377a0b3f3df..ea88d531b98 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -302,7 +302,7 @@ elif [ "$COMMAND" = "thrift2" ] ; then
     HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
   fi
 elif [ "$COMMAND" = "rest" ] ; then
-  CLASS='org.apache.hadoop.hbase.rest.Main'
+  CLASS='org.apache.hadoop.hbase.rest.RESTServer'
   if [ "$1" != "stop" ] ; then
     HBASE_OPTS="$HBASE_OPTS $HBASE_REST_OPTS"
   fi
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/Main.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
similarity index 99%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/Main.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
index 3de06525654..22a5781684d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/Main.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
@@ -57,7 +57,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer;
  * </ul>
  */
 @InterfaceAudience.Private
-public class Main implements Constants {
+public class RESTServer implements Constants {
 
   private static void printUsageAndExit(Options options, int exitCode) {
     HelpFormatter formatter = new HelpFormatter();