diff --git a/edqs/pom.xml b/edqs/pom.xml
index 9faf022d17..5a70f8d0b0 100644
--- a/edqs/pom.xml
+++ b/edqs/pom.xml
@@ -36,7 +36,7 @@
         <pkg.disabled>false</pkg.disabled>
         <pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
         <pkg.package.phase>package</pkg.package.phase>
-        <pkg.name>edqs</pkg.name>
+        <pkg.name>tb-edqs</pkg.name>
         <pkg.win.dist>${project.build.directory}/windows</pkg.win.dist>
         <pkg.copyInstallScripts>true</pkg.copyInstallScripts>
         <pkg.implementationTitle>ThingsBoard Entity Data Query Service</pkg.implementationTitle>
diff --git a/edqs/src/main/conf/edqs.conf b/edqs/src/main/conf/tb-edqs.conf
similarity index 100%
rename from edqs/src/main/conf/edqs.conf
rename to edqs/src/main/conf/tb-edqs.conf
diff --git a/msa/edqs/pom.xml b/msa/edqs/pom.xml
index 49d6fa71c9..b790cc0802 100644
--- a/msa/edqs/pom.xml
+++ b/msa/edqs/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
-        <pkg.name>edqs</pkg.name>
+        <pkg.name>tb-edqs</pkg.name>
         <docker.name>tb-edqs</docker.name>
         <pkg.logFolder>/var/log/${pkg.name}</pkg.logFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>