diff --git a/package.json b/package.json
index 725e997..c590768 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hastic-grafana-app",
+  "name": "grafana-hastic-app",
   "version": "0.2.8",
   "description": "Hastic app: labeling and rendeting analytics from hastic-server",
   "main": "dist/module",
diff --git a/src/panel/graph_panel/plugin.json b/src/panel/graph_panel/plugin.json
index ef0e63b..b9853ea 100644
--- a/src/panel/graph_panel/plugin.json
+++ b/src/panel/graph_panel/plugin.json
@@ -1,11 +1,11 @@
-{
-  "type": "panel",
-  "name": "Hastic Graph",
-  "id": "hastic-graph-panel",
-  "info": {
-    "logos": {
-      "small": "../hastic-app/img/icn-graph-panel.png",
-      "large": "../hastic-app/img/icn-graph-panel.png"
-    }
-  }
+{
+  "type": "panel",
+  "name": "Hastic Graph",
+  "id": "corpglory-hastic-graph-panel",
+  "info": {
+    "logos": {
+      "small": "../hastic-app/img/icn-graph-panel.png",
+      "large": "../hastic-app/img/icn-graph-panel.png"
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/plugin.json b/src/plugin.json
index 1992df8..fd96340 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -1,8 +1,7 @@
 {
   "type": "app",
   "name": "Hastic",
-  "id": "hastic-app",
-
+  "id": "corpglory-hastic-app",
   "info": {
     "author": {
       "name": "CorpGlory Inc.",
@@ -15,7 +14,7 @@
     "version": "0.2.8"
   },
   "includes": [
-    {"type": "panel", "name": "Hastic Graph Panel"}
+    { "type": "panel", "name": "Hastic Graph Panel" }
   ],
   "dependencies": {
     "grafanaVersion": "5.4.x"