diff --git a/src/datasource-zabbix/config.controller.js b/src/datasource-zabbix/config.controller.js
index fcd77e9..fe9815f 100644
--- a/src/datasource-zabbix/config.controller.js
+++ b/src/datasource-zabbix/config.controller.js
@@ -2,6 +2,7 @@ import _ from 'lodash';
 import { migrateDSConfig } from './migrations';
 
 const SUPPORTED_SQL_DS = ['mysql', 'postgres', 'influxdb'];
+
 const zabbixVersions = [
   { name: '2.x', value: 2 },
   { name: '3.x', value: 3 },
@@ -27,12 +28,12 @@ export class ZabbixDSConfigController {
 
     this.current.jsonData = migrateDSConfig(this.current.jsonData);
     _.defaults(this.current.jsonData, defaultConfig);
-    this.sqlDataSources = this.getSupportedSQLDataSources();
+    this.dbDataSources = this.getSupportedDBDataSources();
     this.zabbixVersions = _.cloneDeep(zabbixVersions);
     this.autoDetectZabbixVersion();
   }
 
-  getSupportedSQLDataSources() {
+  getSupportedDBDataSources() {
     let datasources = this.datasourceSrv.getAll();
     return _.filter(datasources, ds => {
       return _.includes(SUPPORTED_SQL_DS, ds.type);
diff --git a/src/datasource-zabbix/partials/config.html b/src/datasource-zabbix/partials/config.html
index 1530d2f..043c7c7 100644
--- a/src/datasource-zabbix/partials/config.html
+++ b/src/datasource-zabbix/partials/config.html
@@ -91,20 +91,20 @@
     checked="ctrl.current.jsonData.dbConnectionEnable">
   </gf-form-switch>
   <div ng-if="ctrl.current.jsonData.dbConnectionEnable">
-    <div class="gf-form max-width-20">
+    <div class="gf-form max-width-30">
     <span class="gf-form-label width-12">
-      SQL Data Source
+      Data Source
       <info-popover mode="right-normal">
-        Select SQL Data Source for Zabbix database.
-        In order to use this feature you should <a href="/datasources/new" target="_blank">create</a> and
-        configure it first. Zabbix plugin uses this data source for querying history data directly from database.
+        Select Data Source for Zabbix history database.
+        In order to use this feature it should be <a href="/datasources/new" target="_blank">created</a> and
+        configured first. Zabbix plugin uses this data source for querying history data directly from the database.
         This way usually faster than pulling data from Zabbix API, especially on the wide time ranges, and reduces
         amount of data transfered.
       </info-popover>
     </span>
     <div class="gf-form-select-wrapper max-width-16">
       <select class="gf-form-input" ng-model="ctrl.current.jsonData.dbConnectionDatasourceId"
-        ng-options="ds.id as ds.name for ds in ctrl.sqlDataSources">
+        ng-options="ds.id as ds.name for ds in ctrl.dbDataSources">
       </select>
     </div>
   </div>