diff --git a/src/partials/annotations.editor.html b/src/partials/annotations.editor.html
index ea1a61c..c045481 100755
--- a/src/partials/annotations.editor.html
+++ b/src/partials/annotations.editor.html
@@ -3,10 +3,10 @@
 	<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/tags.editor.html'"></ng-include>
 	<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/metric.time.override.html'"
 				ng-if="ctrl.datasource.type === 'grafana-skyminer-datasource'"></ng-include>
-	<kairosdb-enhanced-feature ng-if="ctrl.showFeatures()"
+	<skyminer-feature ng-if="ctrl.showFeatures()"
 			 ng-repeat="feature in ctrl.features track by $index"
 			 template="feature"
 			 feature="ctrl.target.query.features[$index]"
 			 variables="ctrl.templateVariables"
-	></kairosdb-enhanced-feature>
+	></skyminer-feature>
 </div>
diff --git a/src/partials/feature.component.editor.html b/src/partials/feature.component.editor.html
index f73b1fb..1ce50a6 100644
--- a/src/partials/feature.component.editor.html
+++ b/src/partials/feature.component.editor.html
@@ -35,5 +35,5 @@
         </bootstrap-tagsinput>
     </div>
 
-    <kairosdb-enhanced-feature-component-editor class="gf-form-inline" component="parameter" ng-switch-when="object"></kairosdb-enhanced-feature-component-editor>
+    <skyminer-feature-component-editor class="gf-form-inline" component="parameter" ng-switch-when="object"></skyminer-feature-component-editor>
 </div>
diff --git a/src/partials/feature.html b/src/partials/feature.html
index 8e41333..e82cde8 100644
--- a/src/partials/feature.html
+++ b/src/partials/feature.html
@@ -21,7 +21,7 @@
             <gf-form-switch class="gf-form" label="Show optional parameters" checked="ctrl.showOptional"></gf-form-switch>
         </div>
         <div class="separator"></div>
-        <kairosdb-enhanced-feature-component-editor class="gf-form-inline" component="pickedComponent"></kairosdb-enhanced-feature-component-editor>
+        <skyminer-feature-component-editor class="gf-form-inline" component="pickedComponent"></skyminer-feature-component-editor>
         <div class="separator"></div>
         <div class="gf-form" ng-if="pickedComponent">
             <label class="gf-form-label">
@@ -41,11 +41,11 @@
         </div>
     </div>
     <!-- List of all component -->
-    <kairosdb-enhanced-feature-component class="gf-form-inline"
+    <skyminer-feature-component class="gf-form-inline"
                        ng-repeat="component in ctrl.feature.components track by $index"
                        component="component"
                        on-remove="ctrl.remove(component)"
                        on-edit="ctrl.edit(component)"
                        on-move-up="ctrl.moveUp(component)"
-                       on-move-down="ctrl.moveDown(component)"></kairosdb-enhanced-feature-component>
+                       on-move-down="ctrl.moveDown(component)"></skyminer-feature-component>
 </div>
diff --git a/src/partials/metric.name.row.html b/src/partials/metric.name.row.html
index fd173b7..95f2f05 100644
--- a/src/partials/metric.name.row.html
+++ b/src/partials/metric.name.row.html
@@ -10,7 +10,7 @@
         </div>
     </div>
 
-    <kairosdb-enhanced-metric-name-field value="ctrl.target.query.metricName" alias="ctrl.target.query.alias" metric-names="ctrl.datasource.metricNamesStore.metricNames"></kairosdb-enhanced-metric-name-field>
+    <skyminer-metric-name-field value="ctrl.target.query.metricName" alias="ctrl.target.query.alias" metric-names="ctrl.datasource.metricNamesStore.metricNames"></skyminer-metric-name-field>
 
     <div class="gf-form">
         <label class="gf-form-label" bs-tooltip="'Refresh metric names'" ng-click="ctrl.loadMetricNames()">
diff --git a/src/partials/query.editor.html b/src/partials/query.editor.html
index 0416388..90182b6 100644
--- a/src/partials/query.editor.html
+++ b/src/partials/query.editor.html
@@ -4,10 +4,10 @@
     <ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/tags.editor.html'"></ng-include>
     <ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/metric.time.override.html'"
                 ng-if="ctrl.datasource.type === 'grafana-skyminer-datasource'"></ng-include>
-    <kairosdb-enhanced-feature ng-if="ctrl.showFeatures()"
+    <skyminer-feature ng-if="ctrl.showFeatures()"
              ng-repeat="feature in ctrl.features track by $index"
              template="feature"
              feature="ctrl.target.query.features[$index]"
              variables="ctrl.templateVariables"
-    ></kairosdb-enhanced-feature>
+    ></skyminer-feature>
 </query-editor-row>
diff --git a/src/partials/tags.editor.html b/src/partials/tags.editor.html
index 164e608..f4a660a 100644
--- a/src/partials/tags.editor.html
+++ b/src/partials/tags.editor.html
@@ -32,13 +32,13 @@
         </div>
     </div>
     <!-- tags from controls -->
-    <kairosdb-enhanced-tags-select
+    <skyminer-tags-select
             ng-if="!ctrl.isMetricNameTemplateVariable"
             selected-values="ctrl.target.query.tags[tagName]"
             tag-name="tagName"
             tag-values="tagValues"
             ng-repeat="(tagName, tagValues) in ctrl.tags.tags">
-    </kairosdb-enhanced-tags-select>
+    </skyminer-tags-select>
     <!-- added filters -->
     <ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/filters.editor.html'"></ng-include>
 </div>
diff --git a/src/partials/tags.select.html b/src/partials/tags.select.html
index 55404a5..cb8cdf8 100644
--- a/src/partials/tags.select.html
+++ b/src/partials/tags.select.html
@@ -11,7 +11,7 @@
 
     <div class="tags-container">
         <div class="gf-form" ng-repeat="segment in ctrl.segments">
-            <kairosdb-enhanced-tag-input segment="segment" tag-values="ctrl.availableValues" on-change="ctrl.onChange()"></kairosdb-enhanced-tag-input>
+            <skyminer-tag-input segment="segment" tag-values="ctrl.availableValues" on-change="ctrl.onChange()"></skyminer-tag-input>
             <div class="gf-form-label" ng-if="!$last">
                 <a ng-click="ctrl.remove(segment)">
                     <i class="fa fa-times"></i>