diff --git a/src/datasource-zabbix/module.js b/src/datasource-zabbix/module.js
index a7cc1d9..35bb3af 100644
--- a/src/datasource-zabbix/module.js
+++ b/src/datasource-zabbix/module.js
@@ -2,13 +2,13 @@ import {ZabbixAPIDatasource} from './datasource';
 import {ZabbixQueryController} from './query.controller';
 
 class ZabbixConfigController {}
-ZabbixConfigController.templateUrl = 'partials/config.html';
+ZabbixConfigController.templateUrl = 'datasource-zabbix/partials/config.html';
 
 class ZabbixQueryOptionsController {}
-ZabbixQueryOptionsController.templateUrl = 'partials/query.options.html';
+ZabbixQueryOptionsController.templateUrl = 'datasource-zabbix/partials/query.options.html';
 
 class ZabbixAnnotationsQueryController {}
-ZabbixAnnotationsQueryController.templateUrl = 'partials/annotations.editor.html';
+ZabbixAnnotationsQueryController.templateUrl = 'datasource-zabbix/partials/annotations.editor.html';
 
 export {
   ZabbixAPIDatasource as Datasource,
diff --git a/src/datasource-zabbix/plugin.json b/src/datasource-zabbix/plugin.json
index cd456d8..c05751d 100644
--- a/src/datasource-zabbix/plugin.json
+++ b/src/datasource-zabbix/plugin.json
@@ -1,7 +1,7 @@
 {
   "type": "datasource",
-  "name": "Zabbix Datasource",
-  "id": "zabbix",
+  "name": "Zabbix",
+  "id": "zabbix-datasource",
 
   "metrics": true,
   "annotations": true,
diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index c2c2bd5..928cb57 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -270,7 +270,7 @@ export class ZabbixQueryController extends QueryCtrl {
 }
 
 // Set templateUrl as static property
-ZabbixQueryController.templateUrl = 'partials/query.editor.html';
+ZabbixQueryController.templateUrl = 'datasource-zabbix/partials/query.editor.html';
 
 // Get list of metric names for bs-typeahead directive
 function getMetricNames(scope, metricList) {
diff --git a/src/panel-triggers/editor.js b/src/panel-triggers/editor.js
index 186307e..4a04205 100644
--- a/src/panel-triggers/editor.js
+++ b/src/panel-triggers/editor.js
@@ -150,7 +150,7 @@ class TriggerPanelEditorCtrl{
     this.popoverSrv.show({
       element: el,
       placement: 'top',
-      templateUrl:  'public/plugins/triggers/trigger.colorpicker.html',
+      templateUrl:  'public/plugins/zabbix-triggers-panel/trigger.colorpicker.html',
       scope: popoverScope
     });
   }
@@ -167,7 +167,7 @@ class TriggerPanelEditorCtrl{
     this.popoverSrv.show({
       element: el,
       placement: 'top',
-      templateUrl:  'public/plugins/triggers/trigger.colorpicker.html',
+      templateUrl:  'public/plugins/zabbix-triggers-panel/trigger.colorpicker.html',
       scope: popoverScope
     });
   }
@@ -192,7 +192,7 @@ export function triggerPanelEditor() {
   return {
     restrict: 'E',
     scope: true,
-    templateUrl: 'public/plugins/triggers/editor.html',
+    templateUrl: 'public/plugins/zabbix-triggers-panel/editor.html',
     controller: TriggerPanelEditorCtrl,
   };
 }
diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js
index 1019dbe..dd2c737 100644
--- a/src/panel-triggers/module.js
+++ b/src/panel-triggers/module.js
@@ -202,7 +202,7 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
   }
 }
 
-TriggerPanelCtrl.templateUrl = 'module.html';
+TriggerPanelCtrl.templateUrl = 'panel-triggers/module.html';
 
 function filterTriggers(triggers, triggerFilter) {
   if (isRegex(triggerFilter)) {
diff --git a/src/panel-triggers/plugin.json b/src/panel-triggers/plugin.json
index 5cb617e..4e22da5 100644
--- a/src/panel-triggers/plugin.json
+++ b/src/panel-triggers/plugin.json
@@ -1,7 +1,7 @@
 {
   "type": "panel",
   "name": "Zabbix Triggers",
-  "id": "triggers",
+  "id": "zabbix-triggers-panel",
 
   "info": {
     "author": {