diff --git a/docs/document/content/dev-manual/sql-parser.cn.md b/docs/document/content/dev-manual/sql-parser.cn.md
index 859d9285abcd6..d850d2c085a25 100644
--- a/docs/document/content/dev-manual/sql-parser.cn.md
+++ b/docs/document/content/dev-manual/sql-parser.cn.md
@@ -9,7 +9,7 @@ chapter = true
 
 ### 全限定类名
 
-[`org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade`](https://github.com/apache/shardingsphere/blob/master/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java)
+[`org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade`](https://github.com/apache/shardingsphere/blob/master/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java)
 
 ### 定义
 
diff --git a/docs/document/content/dev-manual/sql-parser.en.md b/docs/document/content/dev-manual/sql-parser.en.md
index f3e9fa6657770..fe3068945cea7 100644
--- a/docs/document/content/dev-manual/sql-parser.en.md
+++ b/docs/document/content/dev-manual/sql-parser.en.md
@@ -9,7 +9,7 @@ chapter = true
 
 ### Fully-qualified class name
 
-[`org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade`](https://github.com/apache/shardingsphere/blob/master/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java)
+[`org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade`](https://github.com/apache/shardingsphere/blob/master/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java)
 
 ### Definition
 
diff --git a/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLStatementParserFacade.java b/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLParserFacade.java
similarity index 90%
rename from features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLStatementParserFacade.java
rename to features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLParserFacade.java
index d0faa6f526dad..4bad82d6dd2af 100644
--- a/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLStatementParserFacade.java
+++ b/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLParserFacade.java
@@ -20,7 +20,7 @@
 import org.apache.shardingsphere.broadcast.distsql.parser.core.BroadcastDistSQLLexer;
 import org.apache.shardingsphere.broadcast.distsql.parser.core.BroadcastDistSQLParser;
 import org.apache.shardingsphere.broadcast.distsql.parser.core.BroadcastDistSQLStatementVisitor;
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for broadcast DistSQL statement.
  */
-public final class BroadcastDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class BroadcastDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 96%
rename from features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 0acacd948c08a..37449453760f6 100644
--- a/features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.broadcast.distsql.parser.facade.BroadcastDistSQLStatementParserFacade
+org.apache.shardingsphere.broadcast.distsql.parser.facade.BroadcastDistSQLParserFacade
diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLParserFacade.java
similarity index 90%
rename from features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java
rename to features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLParserFacade.java
index 63d500c84a0a2..4824caff2d97f 100644
--- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLStatementParserFacade.java
+++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/facade/EncryptDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.encrypt.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.encrypt.distsql.parser.core.EncryptDistSQLLexer;
 import org.apache.shardingsphere.encrypt.distsql.parser.core.EncryptDistSQLParser;
 import org.apache.shardingsphere.encrypt.distsql.parser.core.EncryptDistSQLStatementVisitor;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for encrypt DistSQL statement.
  */
-public final class EncryptDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class EncryptDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/features/encrypt/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/features/encrypt/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 96%
rename from features/encrypt/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to features/encrypt/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index febbc6db89a41..f75c32c89b0df 100644
--- a/features/encrypt/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/features/encrypt/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.encrypt.distsql.parser.facade.EncryptDistSQLStatementParserFacade
+org.apache.shardingsphere.encrypt.distsql.parser.facade.EncryptDistSQLParserFacade
diff --git a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLStatementParserFacade.java b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLParserFacade.java
similarity index 90%
rename from features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLStatementParserFacade.java
rename to features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLParserFacade.java
index 867ab92cfd4c6..d1cbdee756653 100644
--- a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLStatementParserFacade.java
+++ b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/facade/MaskDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.mask.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.mask.distsql.parser.core.MaskDistSQLLexer;
 import org.apache.shardingsphere.mask.distsql.parser.core.MaskDistSQLParser;
 import org.apache.shardingsphere.mask.distsql.parser.core.MaskDistSQLStatementVisitor;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for mask DistSQL statement.
  */
-public final class MaskDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class MaskDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/features/mask/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/features/mask/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 97%
rename from features/mask/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to features/mask/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index ed5fe776af16f..1b2642605b45f 100644
--- a/features/mask/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/features/mask/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.mask.distsql.parser.facade.MaskDistSQLStatementParserFacade
+org.apache.shardingsphere.mask.distsql.parser.facade.MaskDistSQLParserFacade
diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLParserFacade.java
similarity index 90%
rename from features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java
rename to features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLParserFacade.java
index 65b56e39e49ae..c1cc1229c2f02 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLStatementParserFacade.java
+++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/facade/ReadwriteSplittingDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.readwritesplitting.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.readwritesplitting.distsql.parser.core.ReadwriteSplittingDistSQLStatementVisitor;
 import org.apache.shardingsphere.readwritesplitting.distsql.parser.core.ReadwriteSplittingDistSQLLexer;
 import org.apache.shardingsphere.readwritesplitting.distsql.parser.core.ReadwriteSplittingDistSQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for readwrite-splitting DistSQL statement.
  */
-public final class ReadwriteSplittingDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class ReadwriteSplittingDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/features/readwrite-splitting/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/features/readwrite-splitting/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 94%
rename from features/readwrite-splitting/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to features/readwrite-splitting/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 686c5bd826ae7..64efe2e5409b7 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/features/readwrite-splitting/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.readwritesplitting.distsql.parser.facade.ReadwriteSplittingDistSQLStatementParserFacade
+org.apache.shardingsphere.readwritesplitting.distsql.parser.facade.ReadwriteSplittingDistSQLParserFacade
diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLParserFacade.java
similarity index 90%
rename from features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java
rename to features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLParserFacade.java
index afd3483f0bc36..a89a517fe83b8 100644
--- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLStatementParserFacade.java
+++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/facade/ShadowDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.shadow.distsql.parser.core.ShadowDistSQLLexer;
 import org.apache.shardingsphere.shadow.distsql.parser.core.ShadowDistSQLParser;
 import org.apache.shardingsphere.shadow.distsql.parser.core.ShadowDistSQLStatementVisitor;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for shadow DistSQL statement.
  */
-public final class ShadowDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class ShadowDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/features/shadow/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/features/shadow/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 97%
rename from features/shadow/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to features/shadow/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 311856cf05bb5..eb8f390d30003 100644
--- a/features/shadow/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/features/shadow/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.shadow.distsql.parser.facade.ShadowDistSQLStatementParserFacade
+org.apache.shardingsphere.shadow.distsql.parser.facade.ShadowDistSQLParserFacade
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
index 0587782c7d6d9..e91abf35d34bf 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
@@ -19,7 +19,7 @@
 
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DistSQLException;
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
 import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
 import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
@@ -35,7 +35,7 @@
 import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
 import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
 import org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingTableRuleStatementUpdater;
-import org.apache.shardingsphere.sharding.distsql.parser.facade.ShardingDistSQLStatementParserFacade;
+import org.apache.shardingsphere.sharding.distsql.parser.facade.ShardingDistSQLParserFacade;
 import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment;
 import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment;
 import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment;
@@ -288,9 +288,9 @@ private Map<String, DataSource> createDataSource() {
     @SneakyThrows(ReflectiveOperationException.class)
     @SuppressWarnings("rawtypes")
     private DistSQLStatement getDistSQLStatement(final String sql) {
-        ShardingDistSQLStatementParserFacade facade = new ShardingDistSQLStatementParserFacade();
+        ShardingDistSQLParserFacade facade = new ShardingDistSQLParserFacade();
         ParseASTNode parseASTNode = (ParseASTNode) SQLParserFactory.newInstance(sql, facade.getLexerClass(), facade.getParserClass()).parse();
-        SQLVisitor visitor = TypedSPILoader.getService(FeaturedDistSQLStatementParserFacade.class, facade.getType()).getVisitorClass().getDeclaredConstructor().newInstance();
+        SQLVisitor visitor = TypedSPILoader.getService(DistSQLParserFacade.class, facade.getType()).getVisitorClass().getDeclaredConstructor().newInstance();
         return (DistSQLStatement) visitor.visit(parseASTNode.getRootNode());
     }
     
diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLParserFacade.java
similarity index 90%
rename from features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java
rename to features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLParserFacade.java
index cc1b5c90ca599..25fc63be72146 100644
--- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLStatementParserFacade.java
+++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/facade/ShardingDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sharding.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sharding.distsql.parser.core.ShardingDistSQLStatementVisitor;
 import org.apache.shardingsphere.sharding.distsql.parser.core.ShardingDistSQLLexer;
 import org.apache.shardingsphere.sharding.distsql.parser.core.ShardingDistSQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for sharding DistSQL statement.
  */
-public final class ShardingDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class ShardingDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/features/sharding/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/features/sharding/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 96%
rename from features/sharding/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to features/sharding/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index d28e042f287d5..55db4912e113e 100644
--- a/features/sharding/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/features/sharding/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.sharding.distsql.parser.facade.ShardingDistSQLStatementParserFacade
+org.apache.shardingsphere.sharding.distsql.parser.facade.ShardingDistSQLParserFacade
diff --git a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLParserFacade.java
similarity index 90%
rename from kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java
rename to kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLParserFacade.java
index 66f32895c7fa2..e80238fa08387 100644
--- a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLStatementParserFacade.java
+++ b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/facade/AuthorityDistSQLParserFacade.java
@@ -20,7 +20,7 @@
 import org.apache.shardingsphere.authority.distsql.parser.core.AuthorityDistSQLLexer;
 import org.apache.shardingsphere.authority.distsql.parser.core.AuthorityDistSQLParser;
 import org.apache.shardingsphere.authority.distsql.parser.core.AuthorityDistSQLStatementVisitor;
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for authority DistSQL statement.
  */
-public final class AuthorityDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class AuthorityDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/authority/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/authority/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 96%
rename from kernel/authority/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/authority/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 6764787713885..b02366657f2f4 100644
--- a/kernel/authority/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/authority/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.authority.distsql.parser.facade.AuthorityDistSQLStatementParserFacade
+org.apache.shardingsphere.authority.distsql.parser.facade.AuthorityDistSQLParserFacade
diff --git a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLStatementParserFacade.java b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLParserFacade.java
similarity index 90%
rename from kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLStatementParserFacade.java
rename to kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLParserFacade.java
index ed54b55fda945..aa5ff2e7e7814 100644
--- a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLStatementParserFacade.java
+++ b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/facade/CDCDistSQLParserFacade.java
@@ -20,7 +20,7 @@
 import org.apache.shardingsphere.data.pipeline.cdc.distsql.parser.core.CDCDistSQLLexer;
 import org.apache.shardingsphere.data.pipeline.cdc.distsql.parser.core.CDCDistSQLParser;
 import org.apache.shardingsphere.data.pipeline.cdc.distsql.parser.core.CDCDistSQLStatementVisitor;
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for CDC DistSQL statement.
  */
-public final class CDCDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class CDCDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLParserFacade.java
similarity index 90%
rename from kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java
rename to kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLParserFacade.java
index fc81b71c16465..8aaf50dec5680 100644
--- a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLStatementParserFacade.java
+++ b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/facade/MigrationDistSQLParserFacade.java
@@ -19,7 +19,7 @@
 
 import org.apache.shardingsphere.data.pipeline.migration.distsql.parser.core.MigrationDistSQLParser;
 import org.apache.shardingsphere.data.pipeline.migration.distsql.parser.core.MigrationDistSQLStatementVisitor;
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.data.pipeline.migration.distsql.parser.core.MigrationDistSQLLexer;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for migration DistSQL statement.
  */
-public final class MigrationDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class MigrationDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/data-pipeline/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/data-pipeline/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 91%
rename from kernel/data-pipeline/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/data-pipeline/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 732ba3cb7deb2..3a7c6af2d3309 100644
--- a/kernel/data-pipeline/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/data-pipeline/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,5 +15,5 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.data.pipeline.migration.distsql.parser.facade.MigrationDistSQLStatementParserFacade
-org.apache.shardingsphere.data.pipeline.cdc.distsql.parser.facade.CDCDistSQLStatementParserFacade
+org.apache.shardingsphere.data.pipeline.migration.distsql.parser.facade.MigrationDistSQLParserFacade
+org.apache.shardingsphere.data.pipeline.cdc.distsql.parser.facade.CDCDistSQLParserFacade
diff --git a/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLStatementParserFacade.java b/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLParserFacade.java
similarity index 90%
rename from kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLStatementParserFacade.java
rename to kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLParserFacade.java
index d9840dc1c2d3d..e773206aeff1d 100644
--- a/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLStatementParserFacade.java
+++ b/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/facade/GlobalClockDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.globalclock.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.globalclock.distsql.parser.core.GlobalClockDistSQLLexer;
 import org.apache.shardingsphere.globalclock.distsql.parser.core.GlobalClockDistSQLParser;
 import org.apache.shardingsphere.globalclock.distsql.parser.core.GlobalClockDistSQLStatementVisitor;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for global clock DistSQL statement.
  */
-public final class GlobalClockDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class GlobalClockDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/global-clock/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/global-clock/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 95%
rename from kernel/global-clock/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/global-clock/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 222552393470a..eef6c313d3582 100644
--- a/kernel/global-clock/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/global-clock/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.globalclock.distsql.parser.facade.GlobalClockDistSQLStatementParserFacade
+org.apache.shardingsphere.globalclock.distsql.parser.facade.GlobalClockDistSQLParserFacade
diff --git a/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLStatementParserFacade.java b/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLParserFacade.java
similarity index 90%
rename from kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLStatementParserFacade.java
rename to kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLParserFacade.java
index 556a9ad4672da..7dd52b1143c03 100644
--- a/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLStatementParserFacade.java
+++ b/kernel/single/distsql/parser/src/main/java/org/apache/shardingsphere/single/distsql/parser/facade/SingleDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.single.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for single DistSQL statement.
  */
-public final class SingleDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class SingleDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/single/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/single/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 97%
rename from kernel/single/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/single/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index eb114384dc1fb..75266934ae127 100644
--- a/kernel/single/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/single/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.single.distsql.parser.facade.SingleDistSQLStatementParserFacade
+org.apache.shardingsphere.single.distsql.parser.facade.SingleDistSQLParserFacade
diff --git a/kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLStatementParserFacade.java b/kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLParserFacade.java
similarity index 90%
rename from kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLStatementParserFacade.java
rename to kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLParserFacade.java
index 3f7ac9c722362..e4b92823b44a3 100644
--- a/kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLStatementParserFacade.java
+++ b/kernel/sql-federation/distsql/parser/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/parser/facade/SQLFederationDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sqlfederation.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sqlfederation.distsql.parser.core.SQLFederationDistSQLLexer;
 import org.apache.shardingsphere.sqlfederation.distsql.parser.core.SQLFederationDistSQLParser;
 import org.apache.shardingsphere.sqlfederation.distsql.parser.core.SQLFederationDistSQLStatementVisitor;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for SQL federation DistSQL statement.
  */
-public final class SQLFederationDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class SQLFederationDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/sql-federation/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/sql-federation/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 95%
rename from kernel/sql-federation/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/sql-federation/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 8a6b68181b6a1..ed3ebfe6bae05 100644
--- a/kernel/sql-federation/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/sql-federation/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.sqlfederation.distsql.parser.facade.SQLFederationDistSQLStatementParserFacade
+org.apache.shardingsphere.sqlfederation.distsql.parser.facade.SQLFederationDistSQLParserFacade
diff --git a/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java b/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLParserFacade.java
similarity index 90%
rename from kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java
rename to kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLParserFacade.java
index 0d3caf10be921..ca91f629ca0fa 100644
--- a/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLStatementParserFacade.java
+++ b/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/facade/SQLParserDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.parser.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.parser.distsql.parser.core.SQLParserDistSQLLexer;
 import org.apache.shardingsphere.parser.distsql.parser.core.SQLParserDistSQLParser;
 import org.apache.shardingsphere.parser.distsql.parser.core.SQLParserDistSQLStatementVisitor;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for SQL parser DistSQL statement.
  */
-public final class SQLParserDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class SQLParserDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/sql-parser/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/sql-parser/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 96%
rename from kernel/sql-parser/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/sql-parser/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 31fd97ace59bc..7538b37d74ece 100644
--- a/kernel/sql-parser/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/sql-parser/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.parser.distsql.parser.facade.SQLParserDistSQLStatementParserFacade
+org.apache.shardingsphere.parser.distsql.parser.facade.SQLParserDistSQLParserFacade
diff --git a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLParserFacade.java
similarity index 90%
rename from kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java
rename to kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLParserFacade.java
index 9b9608f303186..ecfd52c439e6b 100644
--- a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLStatementParserFacade.java
+++ b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/facade/SQLTranslatorDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sqltranslator.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for SQL translator DistSQL statement.
  */
-public final class SQLTranslatorDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class SQLTranslatorDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/sql-translator/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/sql-translator/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 95%
rename from kernel/sql-translator/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/sql-translator/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 2692af6c84a4c..f9be46f0ee8db 100644
--- a/kernel/sql-translator/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/sql-translator/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.sqltranslator.distsql.parser.facade.SQLTranslatorDistSQLStatementParserFacade
+org.apache.shardingsphere.sqltranslator.distsql.parser.facade.SQLTranslatorDistSQLParserFacade
diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLParserFacade.java
similarity index 90%
rename from kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java
rename to kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLParserFacade.java
index fb90609189db2..1a8bc2d05dceb 100644
--- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLStatementParserFacade.java
+++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/facade/TrafficDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.traffic.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for traffic DistSQL statement.
  */
-public final class TrafficDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class TrafficDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/traffic/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/traffic/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 96%
rename from kernel/traffic/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/traffic/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 400af555850d0..f0aeb2b42b0ec 100644
--- a/kernel/traffic/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/traffic/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.traffic.distsql.parser.facade.TrafficDistSQLStatementParserFacade
+org.apache.shardingsphere.traffic.distsql.parser.facade.TrafficDistSQLParserFacade
diff --git a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLParserFacade.java
similarity index 90%
rename from kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java
rename to kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLParserFacade.java
index ee0a929d7d3bc..e5cb18dfdafc5 100644
--- a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLStatementParserFacade.java
+++ b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/facade/TransactionDistSQLParserFacade.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.transaction.distsql.parser.facade;
 
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
@@ -29,7 +29,7 @@
 /**
  * SQL parser facade for transaction DistSQL statement.
  */
-public final class TransactionDistSQLStatementParserFacade implements FeaturedDistSQLStatementParserFacade {
+public final class TransactionDistSQLParserFacade implements DistSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/kernel/transaction/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade b/kernel/transaction/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
similarity index 95%
rename from kernel/transaction/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
rename to kernel/transaction/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
index 1b2f37dc1b7d4..664ebe2026b32 100644
--- a/kernel/transaction/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
+++ b/kernel/transaction/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.transaction.distsql.parser.facade.TransactionDistSQLStatementParserFacade
+org.apache.shardingsphere.transaction.distsql.parser.facade.TransactionDistSQLParserFacade
diff --git a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
index f62b6a0ec6fff..666bfbc67c169 100644
--- a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
+++ b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/featured/FeaturedDistSQLStatementParserEngine.java
@@ -20,7 +20,7 @@
 import lombok.SneakyThrows;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.ErrorNode;
-import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade;
+import org.apache.shardingsphere.distsql.parser.engine.spi.DistSQLParserFacade;
 import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
@@ -46,7 +46,7 @@ public SQLStatement parse(final String sql) {
     }
     
     private FeaturedDistSQLParseASTNode parseToASTNode(final String sql) {
-        for (FeaturedDistSQLStatementParserFacade each : ShardingSphereServiceLoader.getServiceInstances(FeaturedDistSQLStatementParserFacade.class)) {
+        for (DistSQLParserFacade each : ShardingSphereServiceLoader.getServiceInstances(DistSQLParserFacade.class)) {
             try {
                 ParseASTNode parseASTNode = (ParseASTNode) SQLParserFactory.newInstance(sql, each.getLexerClass(), each.getParserClass()).parse();
                 return new FeaturedDistSQLParseASTNode(each.getType(), parseASTNode);
@@ -62,7 +62,7 @@ private SQLStatement getSQLStatement(final String sql, final String featureType,
         if (parseASTNode.getRootNode() instanceof ErrorNode) {
             throw new SQLParsingException(sql);
         }
-        SQLVisitor visitor = TypedSPILoader.getService(FeaturedDistSQLStatementParserFacade.class, featureType).getVisitorClass().getDeclaredConstructor().newInstance();
+        SQLVisitor visitor = TypedSPILoader.getService(DistSQLParserFacade.class, featureType).getVisitorClass().getDeclaredConstructor().newInstance();
         return (SQLStatement) visitor.visit(parseASTNode.getRootNode());
     }
 }
diff --git a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/DistSQLParserFacade.java
similarity index 69%
rename from parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
rename to parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/DistSQLParserFacade.java
index 6b7dd360cd4f0..13026a20df3ef 100644
--- a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/FeaturedDistSQLStatementParserFacade.java
+++ b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/engine/spi/DistSQLParserFacade.java
@@ -18,15 +18,31 @@
 package org.apache.shardingsphere.distsql.parser.engine.spi;
 
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
 import org.apache.shardingsphere.sql.parser.api.ASTNode;
+import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
+import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
-import org.apache.shardingsphere.sql.parser.spi.SQLParserFacade;
 
 /**
- * Featured DistSQL statement parser facade.
+ * DistSQL parser facade.
  */
 @SingletonSPI
-public interface FeaturedDistSQLStatementParserFacade extends SQLParserFacade {
+public interface DistSQLParserFacade extends TypedSPI {
+    
+    /**
+     * Get SQL lexer class type.
+     *
+     * @return SQL lexer class type
+     */
+    Class<? extends SQLLexer> getLexerClass();
+    
+    /**
+     * Get SQL parser class type.
+     *
+     * @return SQL parser class type
+     */
+    Class<? extends SQLParser> getParserClass();
     
     /**
      * Get visitor class.
diff --git a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/parser/MySQLParserFacade.java b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/parser/MySQLParserFacade.java
index 49b888a279e73..c0fd0c40a931d 100644
--- a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/parser/MySQLParserFacade.java
+++ b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/parser/MySQLParserFacade.java
@@ -19,12 +19,12 @@
 
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser facade for MySQL.
  */
-public final class MySQLParserFacade implements SQLDialectParserFacade {
+public final class MySQLParserFacade implements DialectSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/parser/sql/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade b/parser/sql/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
similarity index 100%
rename from parser/sql/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade
rename to parser/sql/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
diff --git a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/parser/OpenGaussParserFacade.java b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/parser/OpenGaussParserFacade.java
index ffe761f250e4b..a507f9de65de6 100644
--- a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/parser/OpenGaussParserFacade.java
+++ b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/parser/OpenGaussParserFacade.java
@@ -19,12 +19,12 @@
 
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser facade for openGauss.
  */
-public final class OpenGaussParserFacade implements SQLDialectParserFacade {
+public final class OpenGaussParserFacade implements DialectSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/parser/sql/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade b/parser/sql/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
similarity index 100%
rename from parser/sql/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade
rename to parser/sql/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
diff --git a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/parser/OracleParserFacade.java b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/parser/OracleParserFacade.java
index b4ec6e8fc479c..77da370e35ec8 100644
--- a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/parser/OracleParserFacade.java
+++ b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/parser/OracleParserFacade.java
@@ -19,12 +19,12 @@
 
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser facade for Oracle.
  */
-public final class OracleParserFacade implements SQLDialectParserFacade {
+public final class OracleParserFacade implements DialectSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/parser/sql/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade b/parser/sql/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
similarity index 100%
rename from parser/sql/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade
rename to parser/sql/dialect/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
diff --git a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/parser/PostgreSQLParserFacade.java b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/parser/PostgreSQLParserFacade.java
index 31c2fd4441b83..732351d37a1d6 100644
--- a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/parser/PostgreSQLParserFacade.java
+++ b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/parser/PostgreSQLParserFacade.java
@@ -19,12 +19,12 @@
 
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser facade for PostgreSQL.
  */
-public final class PostgreSQLParserFacade implements SQLDialectParserFacade {
+public final class PostgreSQLParserFacade implements DialectSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/parser/sql/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade b/parser/sql/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
similarity index 100%
rename from parser/sql/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade
rename to parser/sql/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
diff --git a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/parser/SQL92ParserFacade.java b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/parser/SQL92ParserFacade.java
index b4e3e60c72cf1..12994cb2d46e0 100644
--- a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/parser/SQL92ParserFacade.java
+++ b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/parser/SQL92ParserFacade.java
@@ -19,12 +19,12 @@
 
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser facade for SQL92.
  */
-public final class SQL92ParserFacade implements SQLDialectParserFacade {
+public final class SQL92ParserFacade implements DialectSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/parser/sql/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade b/parser/sql/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
similarity index 100%
rename from parser/sql/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade
rename to parser/sql/dialect/sql92/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
diff --git a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/parser/SQLServerParserFacade.java b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/parser/SQLServerParserFacade.java
index 30764d28e9e87..2440f6c44b6ec 100644
--- a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/parser/SQLServerParserFacade.java
+++ b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/parser/SQLServerParserFacade.java
@@ -19,12 +19,12 @@
 
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser facade for SQLServer.
  */
-public final class SQLServerParserFacade implements SQLDialectParserFacade {
+public final class SQLServerParserFacade implements DialectSQLParserFacade {
     
     @Override
     public Class<? extends SQLLexer> getLexerClass() {
diff --git a/parser/sql/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade b/parser/sql/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
similarity index 100%
rename from parser/sql/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade
rename to parser/sql/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade
diff --git a/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/parser/SQLParserExecutor.java b/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/parser/SQLParserExecutor.java
index a47feb92dadec..5a641f247f4d2 100644
--- a/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/parser/SQLParserExecutor.java
+++ b/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/parser/SQLParserExecutor.java
@@ -28,7 +28,7 @@
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 import org.apache.shardingsphere.sql.parser.core.SQLParserFactory;
 import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
-import org.apache.shardingsphere.sql.parser.spi.SQLDialectParserFacade;
+import org.apache.shardingsphere.sql.parser.spi.DialectSQLParserFacade;
 
 /**
  * SQL parser executor.
@@ -54,7 +54,7 @@ public ParseASTNode parse(final String sql) {
     }
     
     private ParseASTNode twoPhaseParse(final String sql) {
-        SQLDialectParserFacade sqlParserFacade = DatabaseTypedSPILoader.getService(SQLDialectParserFacade.class, databaseType);
+        DialectSQLParserFacade sqlParserFacade = DatabaseTypedSPILoader.getService(DialectSQLParserFacade.class, databaseType);
         SQLParser sqlParser = SQLParserFactory.newInstance(sql, sqlParserFacade.getLexerClass(), sqlParserFacade.getParserClass());
         try {
             ((Parser) sqlParser).getInterpreter().setPredictionMode(PredictionMode.SLL);
diff --git a/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLParserFacade.java b/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/DialectSQLParserFacade.java
similarity index 88%
rename from parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLParserFacade.java
rename to parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/DialectSQLParserFacade.java
index a352f7c6b7f03..5860ba0f39568 100644
--- a/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLParserFacade.java
+++ b/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/DialectSQLParserFacade.java
@@ -17,16 +17,16 @@
 
 package org.apache.shardingsphere.sql.parser.spi;
 
+import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLLexer;
 import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
 
 /**
- * SQL parser facade.
+ * Dialect SQL parser facade.
  */
 @SingletonSPI
-public interface SQLParserFacade extends TypedSPI {
+public interface DialectSQLParserFacade extends DatabaseTypedSPI {
     
     /**
      * Get SQL lexer class type.
@@ -37,7 +37,7 @@ public interface SQLParserFacade extends TypedSPI {
     
     /**
      * Get SQL parser class type.
-     * 
+     *
      * @return SQL parser class type
      */
     Class<? extends SQLParser> getParserClass();
diff --git a/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java b/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java
deleted file mode 100644
index 29a8c19565f74..0000000000000
--- a/parser/sql/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLDialectParserFacade.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sql.parser.spi;
-
-import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
-import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
-
-/**
- * Database type based SQL parser facade.
- */
-@SingletonSPI
-public interface SQLDialectParserFacade extends SQLParserFacade, DatabaseTypedSPI {
-}