diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
new file mode 100644
index 0000000000..3c79253f7d
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
@@ -0,0 +1,9 @@
+package com.alibaba.druid.hbase.hbql.ast;
+
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+
+public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement {
+
+    private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HCreateTableStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java
similarity index 70%
rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HCreateTableStatement.java
rename to src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java
index 38fa1ed678..bd222ec73a 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HCreateTableStatement.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java
@@ -2,7 +2,7 @@ package com.alibaba.druid.hbase.hbql.ast;
 
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 
-public class HCreateTableStatement extends SQLCreateTableStatement {
+public class HBQLCreateTableStatement extends SQLCreateTableStatement {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HFamilyDefinition.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java
similarity index 96%
rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HFamilyDefinition.java
rename to src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java
index 535ea75385..8b31cc32fd 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HFamilyDefinition.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java
@@ -4,7 +4,7 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl;
 import com.alibaba.druid.sql.ast.statement.SQLTableElement;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
-public class HFamilyDefinition extends SQLObjectImpl implements SQLTableElement {
+public class HBQLFamilyDefinition extends SQLObjectImpl implements SQLTableElement {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HSelectQueryBlock.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java
similarity index 74%
rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HSelectQueryBlock.java
rename to src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java
index a4e75171e7..ee446bd071 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HSelectQueryBlock.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java
@@ -2,7 +2,7 @@ package com.alibaba.druid.hbase.hbql.ast;
 
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 
-public class HSelectQueryBlock extends SQLSelectQueryBlock {
+public class HBQLSelectQueryBlock extends SQLSelectQueryBlock {
 
     /**
      * 
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java
new file mode 100644
index 0000000000..af1ecf8f6a
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java
@@ -0,0 +1,8 @@
+package com.alibaba.druid.hbase.hbql.ast;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+
+
+public interface HBQLStatement extends SQLStatement {
+
+}
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
similarity index 58%
rename from src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java
rename to src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
index 204c5dfbc8..b318458c26 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HStatementParser.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java
@@ -1,6 +1,6 @@
 package com.alibaba.druid.hbase.hbql.parser;
 
 
-public class HStatementParser {
+public class HBQLStatementParser {
 
 }
diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java b/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java
new file mode 100644
index 0000000000..4c4ac97c8e
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java
@@ -0,0 +1,8 @@
+package com.alibaba.druid.hbase.hbql.visitor;
+
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+
+public interface HBQLVisitor extends SQLASTVisitor {
+
+}