diff --git a/client/core/src/components.js b/client/core/src/components.js
index 074434bd90..2c8a096300 100644
--- a/client/core/src/components.js
+++ b/client/core/src/components.js
@@ -1,19 +1,19 @@
 import './mdl-override.css';
 import './styles/fonts/mdi-override.css';
 
-import './textfield/index';
-import './watcher/index';
-import './paging/index';
+import './textfield/textfield';
+import './watcher/watcher';
+import './paging/paging';
 import './icon/icon';
 import './autocomplete/autocomplete';
-import './popover/index';
+import './popover/popover';
 import './dialog/dialog';
 
 import './confirm/confirm';
-import './title/index';
-import './subtitle/index';
-import './spinner/index';
-import './snackbar/index';
+import './title/title';
+import './subtitle/subtitle';
+import './spinner/spinner';
+import './snackbar/snackbar';
 
 export {NAME as BUTTON, directive as ButtonDirective} from './button/button';
 export {NAME as BUTTON_MDL, factory as buttonMdl} from './button/button.mdl';
diff --git a/client/core/src/paging/index.html b/client/core/src/paging/paging.html
similarity index 100%
rename from client/core/src/paging/index.html
rename to client/core/src/paging/paging.html
diff --git a/client/core/src/paging/index.js b/client/core/src/paging/paging.js
similarity index 96%
rename from client/core/src/paging/index.js
rename to client/core/src/paging/paging.js
index fd17b994ee..8e0b86aa17 100644
--- a/client/core/src/paging/index.js
+++ b/client/core/src/paging/paging.js
@@ -36,7 +36,7 @@ Paging.$inject = ['$http', '$scope'];
 
 export const NAME = 'vnPaging';
 export const COMPONENT = {
-    template: require('./index.html'),
+    template: require('./paging.html'),
     bindings: {
         index: '<',
         total: '<'
diff --git a/client/core/src/popover/index.js b/client/core/src/popover/popover.js
similarity index 100%
rename from client/core/src/popover/index.js
rename to client/core/src/popover/popover.js
diff --git a/client/core/src/snackbar/index.html b/client/core/src/snackbar/snackbar.html
similarity index 100%
rename from client/core/src/snackbar/index.html
rename to client/core/src/snackbar/snackbar.html
diff --git a/client/core/src/snackbar/index.js b/client/core/src/snackbar/snackbar.js
similarity index 93%
rename from client/core/src/snackbar/index.js
rename to client/core/src/snackbar/snackbar.js
index ce76c1ba30..20a7e93747 100644
--- a/client/core/src/snackbar/index.js
+++ b/client/core/src/snackbar/snackbar.js
@@ -20,6 +20,6 @@ export default class Controller {
 Controller.$inject = ['$element'];
 
 module.component('vnSnackbar', {
-    template: require('./index.html'),
+    template: require('./snackbar.html'),
     controller: Controller
 });
diff --git a/client/core/src/spinner/index.html b/client/core/src/spinner/spinner.html
similarity index 100%
rename from client/core/src/spinner/index.html
rename to client/core/src/spinner/spinner.html
diff --git a/client/core/src/spinner/index.js b/client/core/src/spinner/spinner.js
similarity index 96%
rename from client/core/src/spinner/index.js
rename to client/core/src/spinner/spinner.js
index daf694e1de..ae6a69ede3 100644
--- a/client/core/src/spinner/index.js
+++ b/client/core/src/spinner/spinner.js
@@ -49,7 +49,7 @@ export default class Spinner extends Component {
 Spinner.$inject = ['$element', '$scope'];
 
 export const component = {
-    template: require('./index.html'),
+    template: require('./spinner.html'),
     bindings: {
         enable: '='
     },
diff --git a/client/core/src/subtitle/index.html b/client/core/src/subtitle/subtitle.html
similarity index 100%
rename from client/core/src/subtitle/index.html
rename to client/core/src/subtitle/subtitle.html
diff --git a/client/core/src/subtitle/index.js b/client/core/src/subtitle/subtitle.js
similarity index 68%
rename from client/core/src/subtitle/index.js
rename to client/core/src/subtitle/subtitle.js
index 941e8eb546..c98c259941 100644
--- a/client/core/src/subtitle/index.js
+++ b/client/core/src/subtitle/subtitle.js
@@ -1,6 +1,6 @@
 import {module} from '../module';
 
 module.component('vnSubtitle', {
-    template: require('./index.html'),
+    template: require('./subtitle.html'),
     transclude: true
 });
diff --git a/client/core/src/textfield/index.js b/client/core/src/textfield/textfield.js
similarity index 98%
rename from client/core/src/textfield/index.js
rename to client/core/src/textfield/textfield.js
index af4d7c4ab4..e278c13a53 100644
--- a/client/core/src/textfield/index.js
+++ b/client/core/src/textfield/textfield.js
@@ -3,7 +3,7 @@ import Component from '../lib/component';
 import * as resolveFactory from '../lib/resolveDefaultComponents';
 import * as normalizerFactory from '../lib/inputAttrsNormalizer';
 import './style.scss';
-import './index.mdl';
+import './textfield.mdl';
 
 export default class Textfield extends Component {
     constructor($element, $scope, $attrs) {
diff --git a/client/core/src/textfield/index.mdl.html b/client/core/src/textfield/textfield.mdl.html
similarity index 100%
rename from client/core/src/textfield/index.mdl.html
rename to client/core/src/textfield/textfield.mdl.html
diff --git a/client/core/src/textfield/index.mdl.js b/client/core/src/textfield/textfield.mdl.js
similarity index 85%
rename from client/core/src/textfield/index.mdl.js
rename to client/core/src/textfield/textfield.mdl.js
index 64e156885f..e97d38d28a 100644
--- a/client/core/src/textfield/index.mdl.js
+++ b/client/core/src/textfield/textfield.mdl.js
@@ -4,7 +4,7 @@ export const NAME = 'vnTextfieldMdlFactory';
 
 export function factory() {
     return {
-        template: require('./index.mdl.html'),
+        template: require('./textfield.mdl.html'),
         default: {
             label: 'text',
             className: 'mdl-textfield--floating-label',
diff --git a/client/core/src/title/index.html b/client/core/src/title/title.html
similarity index 100%
rename from client/core/src/title/index.html
rename to client/core/src/title/title.html
diff --git a/client/core/src/title/index.js b/client/core/src/title/title.js
similarity index 69%
rename from client/core/src/title/index.js
rename to client/core/src/title/title.js
index 3fb71f567c..3420738e12 100644
--- a/client/core/src/title/index.js
+++ b/client/core/src/title/title.js
@@ -1,6 +1,6 @@
 import {module} from '../module';
 
 module.component('vnTitle', {
-    template: require('./index.html'),
+    template: require('./title.html'),
     transclude: true
 });
diff --git a/client/core/src/watcher/index.html b/client/core/src/watcher/watcher.html
similarity index 100%
rename from client/core/src/watcher/index.html
rename to client/core/src/watcher/watcher.html
diff --git a/client/core/src/watcher/index.js b/client/core/src/watcher/watcher.js
similarity index 99%
rename from client/core/src/watcher/index.js
rename to client/core/src/watcher/watcher.js
index d421405df5..aec3bc0a8d 100644
--- a/client/core/src/watcher/index.js
+++ b/client/core/src/watcher/watcher.js
@@ -149,7 +149,7 @@ export default class Watcher extends Component {
 Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnAppLogger', '$translate'];
 
 module.component('vnWatcher', {
-    template: require('./index.html'),
+    template: require('./watcher.html'),
     bindings: {
         url: '@?',
         idField: '@?',