diff --git a/application/pom.xml b/application/pom.xml
index 4f1d75cde2..34218956fc 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -130,7 +130,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>service-info-api</artifactId>
+            <artifactId>discovery-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.thingsboard</groupId>
diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml
index 44f16f7329..b5ca9c1b9c 100644
--- a/common/coap-server/pom.xml
+++ b/common/coap-server/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>service-info-api</artifactId>
+            <artifactId>discovery-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
index 19eb4b510f..2a9991a1cc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
@@ -30,10 +30,10 @@ public enum LimitedApi {
     REST_REQUESTS_PER_TENANT(DefaultTenantProfileConfiguration::getTenantServerRestLimitsConfiguration, "REST API requests", true),
     REST_REQUESTS_PER_CUSTOMER(DefaultTenantProfileConfiguration::getCustomerServerRestLimitsConfiguration, "REST API requests per customer", false),
     WS_UPDATES_PER_SESSION(DefaultTenantProfileConfiguration::getWsUpdatesPerSessionRateLimit, "WS updates per session", true),
-    CASSANDRA_WRITE_QUERIES_CORE(DefaultTenantProfileConfiguration::getCassandraReadQueryTenantCoreRateLimits, "Rest API Cassandra write queries", true),
-    CASSANDRA_READ_QUERIES_CORE(DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantCoreRateLimits, "Rest API and WS telemetry Cassandra read queries", true),
-    CASSANDRA_WRITE_QUERIES_RULE_ENGINE(DefaultTenantProfileConfiguration::getCassandraReadQueryTenantRuleEngineRateLimits, "Rule Engine telemetry Cassandra write queries", true),
-    CASSANDRA_READ_QUERIES_RULE_ENGINE(DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantRuleEngineRateLimits, "Rule Engine telemetry Cassandra read queries", true),
+    CASSANDRA_WRITE_QUERIES_CORE(DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantCoreRateLimits, "Rest API Cassandra write queries", true),
+    CASSANDRA_READ_QUERIES_CORE(DefaultTenantProfileConfiguration::getCassandraReadQueryTenantCoreRateLimits, "Rest API and WS telemetry Cassandra read queries", true),
+    CASSANDRA_WRITE_QUERIES_RULE_ENGINE(DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantRuleEngineRateLimits, "Rule Engine telemetry Cassandra write queries", true),
+    CASSANDRA_READ_QUERIES_RULE_ENGINE(DefaultTenantProfileConfiguration::getCassandraReadQueryTenantRuleEngineRateLimits, "Rule Engine telemetry Cassandra read queries", true),
     CASSANDRA_READ_QUERIES_MONOLITH(
             LimitedApiUtil.merge(
                     DefaultTenantProfileConfiguration::getCassandraReadQueryTenantCoreRateLimits,
diff --git a/common/service-info-api/pom.xml b/common/discovery-api/pom.xml
similarity index 98%
rename from common/service-info-api/pom.xml
rename to common/discovery-api/pom.xml
index c1eff7c468..5852761c4a 100644
--- a/common/service-info-api/pom.xml
+++ b/common/discovery-api/pom.xml
@@ -24,7 +24,7 @@
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
-    <artifactId>service-info-api</artifactId>
+    <artifactId>discovery-api</artifactId>
     <packaging>jar</packaging>
 
     <name>Thingsboard Server Service Info Provider API</name>
diff --git a/common/service-info-api/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java b/common/discovery-api/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
similarity index 100%
rename from common/service-info-api/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
rename to common/discovery-api/src/main/java/org/thingsboard/server/queue/discovery/TbServiceInfoProvider.java
diff --git a/common/edqs/pom.xml b/common/edqs/pom.xml
index 3b72a26442..e349ae3087 100644
--- a/common/edqs/pom.xml
+++ b/common/edqs/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>service-info-api</artifactId>
+            <artifactId>discovery-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 514e3eea38..0915f47f1a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -50,7 +50,7 @@
         <module>version-control</module>
         <module>script</module>
         <module>edqs</module>
-        <module>service-info-api</module>
+        <module>discovery-api</module>
     </modules>
 
 </project>
diff --git a/common/queue/pom.xml b/common/queue/pom.xml
index e689cb3dc5..f2f3091999 100644
--- a/common/queue/pom.xml
+++ b/common/queue/pom.xml
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>service-info-api</artifactId>
+            <artifactId>discovery-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml
index 064c5f8ea2..7f54dcbc85 100644
--- a/common/transport/transport-api/pom.xml
+++ b/common/transport/transport-api/pom.xml
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>service-info-api</artifactId>
+            <artifactId>discovery-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/dao/pom.xml b/dao/pom.xml
index a11e4e4fe3..9f411f8302 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
-            <artifactId>service-info-api</artifactId>
+            <artifactId>discovery-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
diff --git a/pom.xml b/pom.xml
index f8137196e4..334be1850e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -966,7 +966,7 @@
             </dependency>
             <dependency>
                 <groupId>org.thingsboard.common</groupId>
-                <artifactId>service-info-api</artifactId>
+                <artifactId>discovery-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>