diff --git a/electron/src/components/keymap/edit/keymap-edit.component.ts b/electron/src/components/keymap/edit/keymap-edit.component.ts
index 089fc132..882393d6 100644
--- a/electron/src/components/keymap/edit/keymap-edit.component.ts
+++ b/electron/src/components/keymap/edit/keymap-edit.component.ts
@@ -9,8 +9,8 @@ import 'rxjs/add/operator/first';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/switchMap';
 
-import { Keymap } from '../../../shared/config-serializer/config-items/Keymap';
-import { UhkBuffer } from '../../../shared/config-serializer/UhkBuffer';
+import { Keymap } from '../../../shared/config-serializer/config-items/keymap';
+import { UhkBuffer } from '../../../shared/config-serializer/uhk-buffer';
 import { AppState } from '../../../shared/store';
 import { SvgKeyboardWrapComponent } from '../../../shared/components/svg/wrap';
 import { KeymapEditComponent as SharedKeymapEditComponent } from '../../../shared/components/keymap/edit';
diff --git a/electron/src/main-app/main-app.component.ts b/electron/src/main-app/main-app.component.ts
index 0eb7bf9d..521fa9cd 100644
--- a/electron/src/main-app/main-app.component.ts
+++ b/electron/src/main-app/main-app.component.ts
@@ -10,7 +10,7 @@ import 'rxjs/add/operator/takeWhile';
 import { AppState } from '../shared/store';
 import { getUserConfiguration } from '../shared/store/reducers/user-configuration';
 
-import { UhkBuffer } from '../shared/config-serializer/UhkBuffer';
+import { UhkBuffer } from '../shared/config-serializer/uhk-buffer';
 
 import { UhkDeviceService } from '../services/uhk-device.service';
 
diff --git a/electron/src/services/electron-datastorage-repository.service.ts b/electron/src/services/electron-datastorage-repository.service.ts
index 42c5449a..f2e1ea66 100644
--- a/electron/src/services/electron-datastorage-repository.service.ts
+++ b/electron/src/services/electron-datastorage-repository.service.ts
@@ -1,6 +1,6 @@
 import * as storage from 'electron-settings';
 
-import { UserConfiguration } from '../shared/config-serializer/config-items/UserConfiguration';
+import { UserConfiguration } from '../shared/config-serializer/config-items/user-configuration';
 import { DataStorageRepositoryService } from '../shared/services/datastorage-repository.service';
 import { AutoUpdateSettings } from '../shared/models/auto-update-settings';
 
diff --git a/electron/src/services/uhk-device.service.ts b/electron/src/services/uhk-device.service.ts
index 979eda71..8e9e8d79 100644
--- a/electron/src/services/uhk-device.service.ts
+++ b/electron/src/services/uhk-device.service.ts
@@ -23,8 +23,8 @@ import 'rxjs/add/operator/switchMap';
 
 import { Device, Interface, InEndpoint, OutEndpoint, findByIds, on } from 'usb';
 
-import { Layer } from '../shared/config-serializer/config-items/Layer';
-import { UhkBuffer } from '../shared/config-serializer/UhkBuffer';
+import { Layer } from '../shared/config-serializer/config-items/layer';
+import { UhkBuffer } from '../shared/config-serializer/uhk-buffer';
 
 const vendorId = 0x1d50;
 const productId = 0x6122;
diff --git a/shared/src/components/keyboard/slider/keyboard-slider.component.ts b/shared/src/components/keyboard/slider/keyboard-slider.component.ts
index 14b4dde5..14f2e347 100644
--- a/shared/src/components/keyboard/slider/keyboard-slider.component.ts
+++ b/shared/src/components/keyboard/slider/keyboard-slider.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { animate, keyframes, state, style, transition, trigger } from '@angular/animations';
 
-import { Layer } from '../../../config-serializer/config-items/Layer';
+import { Layer } from '../../../config-serializer/config-items/layer';
 
 type AnimationKeyboard =
     'leftIn' |
diff --git a/shared/src/components/keymap/add/keymap-add.component.ts b/shared/src/components/keymap/add/keymap-add.component.ts
index 1e92bccd..7de086e6 100644
--- a/shared/src/components/keymap/add/keymap-add.component.ts
+++ b/shared/src/components/keymap/add/keymap-add.component.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/combineLatest';
 import 'rxjs/add/operator/publishReplay';
 
-import { Keymap } from '../../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../../config-serializer/config-items/keymap';
 import { AppState } from '../../../store';
 import { KeymapActions } from '../../../store/actions';
 
diff --git a/shared/src/components/keymap/edit/keymap-edit-guard.service.ts b/shared/src/components/keymap/edit/keymap-edit-guard.service.ts
index 172d8fd5..502e32dd 100644
--- a/shared/src/components/keymap/edit/keymap-edit-guard.service.ts
+++ b/shared/src/components/keymap/edit/keymap-edit-guard.service.ts
@@ -10,7 +10,7 @@ import 'rxjs/add/operator/switchMap';
 
 import { Store } from '@ngrx/store';
 
-import { Keymap } from './../../../config-serializer/config-items/Keymap';
+import { Keymap } from './../../../config-serializer/config-items/keymap';
 import { AppState } from '../../../store/index';
 import { getKeymaps } from '../../../store/reducers/user-configuration';
 
diff --git a/shared/src/components/keymap/edit/keymap-edit.component.ts b/shared/src/components/keymap/edit/keymap-edit.component.ts
index 22adf8ad..f3777aa6 100644
--- a/shared/src/components/keymap/edit/keymap-edit.component.ts
+++ b/shared/src/components/keymap/edit/keymap-edit.component.ts
@@ -13,7 +13,7 @@ import 'rxjs/add/operator/switchMap';
 
 import { saveAs } from 'file-saver';
 
-import { Keymap } from '../../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../../config-serializer/config-items/keymap';
 import { AppState } from '../../../store';
 import { getKeymap, getKeymaps, getUserConfiguration } from '../../../store/reducers/user-configuration';
 
diff --git a/shared/src/components/keymap/header/keymap-header.component.ts b/shared/src/components/keymap/header/keymap-header.component.ts
index fde6edcd..008be348 100644
--- a/shared/src/components/keymap/header/keymap-header.component.ts
+++ b/shared/src/components/keymap/header/keymap-header.component.ts
@@ -13,7 +13,7 @@ import {
 
 import { Store } from '@ngrx/store';
 
-import { Keymap } from '../../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../../config-serializer/config-items/keymap';
 
 import { AppState } from '../../../store';
 import { KeymapActions } from '../../../store/actions';
diff --git a/shared/src/components/macro/edit/macro-edit.component.ts b/shared/src/components/macro/edit/macro-edit.component.ts
index c9908c9d..8f960947 100644
--- a/shared/src/components/macro/edit/macro-edit.component.ts
+++ b/shared/src/components/macro/edit/macro-edit.component.ts
@@ -5,8 +5,8 @@ import { Store } from '@ngrx/store';
 
 import { Subscription } from 'rxjs/Subscription';
 
-import { Macro } from '../../../config-serializer/config-items/Macro';
-import { MacroAction } from '../../../config-serializer/config-items/macro-action/MacroAction';
+import { Macro } from '../../../config-serializer/config-items/macro';
+import { MacroAction } from '../../../config-serializer/config-items/macro-action/macro-action';
 
 import { MacroActions } from '../../../store/actions';
 import { AppState } from '../../../store/index';
diff --git a/shared/src/components/macro/header/macro-header.component.ts b/shared/src/components/macro/header/macro-header.component.ts
index df76a7d5..3e038d99 100644
--- a/shared/src/components/macro/header/macro-header.component.ts
+++ b/shared/src/components/macro/header/macro-header.component.ts
@@ -5,7 +5,7 @@ import {
 
 import { Store } from '@ngrx/store';
 
-import { Macro } from '../../../config-serializer/config-items/Macro';
+import { Macro } from '../../../config-serializer/config-items/macro';
 
 import { MacroActions } from '../../../store/actions';
 import { AppState } from '../../../store/index';
diff --git a/shared/src/components/macro/item/macro-item.component.ts b/shared/src/components/macro/item/macro-item.component.ts
index c255927b..49f951a6 100644
--- a/shared/src/components/macro/item/macro-item.component.ts
+++ b/shared/src/components/macro/item/macro-item.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, Output, EventEmitter, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 
-import { KeyModifiers } from '../../../config-serializer/config-items/KeyModifiers';
+import { KeyModifiers } from '../../../config-serializer/config-items/key-modifiers';
 import {
     DelayMacroAction,
     KeyMacroAction,
diff --git a/shared/src/components/macro/list/macro-list.component.ts b/shared/src/components/macro/list/macro-list.component.ts
index c535813d..0a05ffda 100644
--- a/shared/src/components/macro/list/macro-list.component.ts
+++ b/shared/src/components/macro/list/macro-list.component.ts
@@ -3,7 +3,7 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
 
 import { DragulaService } from 'ng2-dragula/ng2-dragula';
 
-import { Macro } from '../../../config-serializer/config-items/Macro';
+import { Macro } from '../../../config-serializer/config-items/macro';
 import { MacroAction } from '../../../config-serializer/config-items/macro-action';
 import { MacroItemComponent } from './../index';
 
diff --git a/shared/src/components/macro/not-found/macro-not-found-guard.service.ts b/shared/src/components/macro/not-found/macro-not-found-guard.service.ts
index e6d02549..78fc768f 100644
--- a/shared/src/components/macro/not-found/macro-not-found-guard.service.ts
+++ b/shared/src/components/macro/not-found/macro-not-found-guard.service.ts
@@ -10,7 +10,7 @@ import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../store/index';
 import { getMacros } from '../../../store/reducers/user-configuration';
-import { Macro } from './../../../config-serializer/config-items/Macro';
+import { Macro } from './../../../config-serializer/config-items/macro';
 
 @Injectable()
 export class MacroNotFoundGuard implements CanActivate {
diff --git a/shared/src/components/popover/popover.component.ts b/shared/src/components/popover/popover.component.ts
index 5d987a65..7715734d 100644
--- a/shared/src/components/popover/popover.component.ts
+++ b/shared/src/components/popover/popover.component.ts
@@ -16,7 +16,7 @@ import {
     SwitchKeymapAction,
     SwitchLayerAction
 } from '../../config-serializer/config-items/key-action';
-import { Keymap } from '../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../config-serializer/config-items/keymap';
 
 import { Tab } from './tab/tab';
 
diff --git a/shared/src/components/popover/tab/keymap/keymap-tab.component.ts b/shared/src/components/popover/tab/keymap/keymap-tab.component.ts
index 089801eb..5ed5d7d2 100644
--- a/shared/src/components/popover/tab/keymap/keymap-tab.component.ts
+++ b/shared/src/components/popover/tab/keymap/keymap-tab.component.ts
@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit } from '@a
 import { Select2OptionData } from 'ng2-select2/ng2-select2';
 
 import { KeyAction, SwitchKeymapAction } from '../../../../config-serializer/config-items/key-action';
-import { Keymap } from '../../../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../../../config-serializer/config-items/keymap';
 import { Tab } from '../tab';
 
 @Component({
diff --git a/shared/src/components/popover/tab/macro/macro-tab.component.ts b/shared/src/components/popover/tab/macro/macro-tab.component.ts
index cac6c417..a89c3ff8 100644
--- a/shared/src/components/popover/tab/macro/macro-tab.component.ts
+++ b/shared/src/components/popover/tab/macro/macro-tab.component.ts
@@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription';
 import { Select2OptionData } from 'ng2-select2/ng2-select2';
 
 import { KeyAction, PlayMacroAction } from '../../../../config-serializer/config-items/key-action';
-import { Macro } from '../../../../config-serializer/config-items/Macro';
+import { Macro } from '../../../../config-serializer/config-items/macro';
 
 import { Tab } from '../tab';
 
diff --git a/shared/src/components/side-menu/side-menu.component.ts b/shared/src/components/side-menu/side-menu.component.ts
index 87a8707c..f9796434 100644
--- a/shared/src/components/side-menu/side-menu.component.ts
+++ b/shared/src/components/side-menu/side-menu.component.ts
@@ -8,8 +8,8 @@ import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/let';
 
-import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { Macro } from '../../config-serializer/config-items/Macro';
+import { Keymap } from '../../config-serializer/config-items/keymap';
+import { Macro } from '../../config-serializer/config-items/macro';
 
 import { AppState } from '../../store';
 import { MacroActions } from '../../store/actions';
diff --git a/shared/src/components/svg/keyboard/svg-keyboard.component.ts b/shared/src/components/svg/keyboard/svg-keyboard.component.ts
index 97a1916d..db33039c 100644
--- a/shared/src/components/svg/keyboard/svg-keyboard.component.ts
+++ b/shared/src/components/svg/keyboard/svg-keyboard.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges, ChangeDetectionStrategy } from '@angular/core';
 import { animate, state, trigger, style, transition } from '@angular/animations';
 
-import { Module } from '../../../config-serializer/config-items/Module';
+import { Module } from '../../../config-serializer/config-items/module';
 import { SvgModule } from '../module';
 import { SvgModuleProviderService } from '../../../services/svg-module-provider.service';
 
diff --git a/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index b4d3d0d9..b1abfdeb 100644
--- a/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -17,8 +17,8 @@ import {
     SwitchKeymapAction,
     SwitchLayerAction
 } from '../../../../config-serializer/config-items/key-action';
-import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
-import { Macro } from '../../../../config-serializer/config-items/Macro';
+import { KeyModifiers } from '../../../../config-serializer/config-items/key-modifiers';
+import { Macro } from '../../../../config-serializer/config-items/macro';
 
 import { CaptureService } from '../../../../services/capture.service';
 import { MapperService } from '../../../../services/mapper.service';
diff --git a/shared/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts b/shared/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
index 300d7d03..8606f33d 100644
--- a/shared/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
+++ b/shared/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnChanges, OnInit, ChangeDetectionStrategy } from '@angular/core';
 
 import { KeystrokeAction } from '../../../../config-serializer/config-items/key-action';
-import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
+import { KeyModifiers } from '../../../../config-serializer/config-items/key-modifiers';
 import { MapperService } from '../../../../services/mapper.service';
 
 class SvgAttributes {
diff --git a/shared/src/components/svg/wrap/svg-keyboard-wrap.component.ts b/shared/src/components/svg/wrap/svg-keyboard-wrap.component.ts
index 7dc5f617..d3fab424 100644
--- a/shared/src/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/shared/src/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -31,9 +31,9 @@ import {
     SwitchKeymapAction,
     SwitchLayerAction
 } from '../../../config-serializer/config-items/key-action';
-import { Keymap } from '../../../config-serializer/config-items/Keymap';
-import { Layer } from '../../../config-serializer/config-items/Layer';
-import { LongPressAction } from '../../../config-serializer/config-items/LongPressAction';
+import { Keymap } from '../../../config-serializer/config-items/keymap';
+import { Layer } from '../../../config-serializer/config-items/layer';
+import { LongPressAction } from '../../../config-serializer/config-items/long-press-action';
 import { camelCaseToSentence, capitalizeFirstLetter } from '../../../util';
 
 import { AppState } from '../../../store';
diff --git a/shared/src/config-serializer/config-items/HardwareConfiguration.ts b/shared/src/config-serializer/config-items/hardware-configuration.ts
similarity index 97%
rename from shared/src/config-serializer/config-items/HardwareConfiguration.ts
rename to shared/src/config-serializer/config-items/hardware-configuration.ts
index 439ccfa6..dfebf262 100644
--- a/shared/src/config-serializer/config-items/HardwareConfiguration.ts
+++ b/shared/src/config-serializer/config-items/hardware-configuration.ts
@@ -1,5 +1,5 @@
 import { assertUInt8, assertUInt32 } from '../assert';
-import { UhkBuffer } from '../UhkBuffer';
+import { UhkBuffer } from '../uhk-buffer';
 
 export class HardwareConfiguration {
 
diff --git a/shared/src/config-serializer/config-items/key-action/helper.ts b/shared/src/config-serializer/config-items/key-action/helper.ts
index 3ddb8b3b..0f1c66c2 100644
--- a/shared/src/config-serializer/config-items/key-action/helper.ts
+++ b/shared/src/config-serializer/config-items/key-action/helper.ts
@@ -1,4 +1,4 @@
-import { UhkBuffer } from '../../UhkBuffer';
+import { UhkBuffer } from '../../uhk-buffer';
 import {
     KeyAction,
     KeyActionId,
@@ -10,7 +10,7 @@ import {
     keyActionType
 } from './index';
 
-import { Macro } from '../Macro';
+import { Macro } from '../macro';
 
 export class Helper {
 
diff --git a/shared/src/config-serializer/config-items/key-action/index.ts b/shared/src/config-serializer/config-items/key-action/index.ts
index 4788014b..e9bef9fa 100644
--- a/shared/src/config-serializer/config-items/key-action/index.ts
+++ b/shared/src/config-serializer/config-items/key-action/index.ts
@@ -1,8 +1,8 @@
-export * from './KeyAction';
-export * from './KeystrokeAction';
-export * from './MouseAction';
-export * from './NoneAction';
-export * from './PlayMacroAction';
-export * from './SwitchKeymapAction';
-export * from './SwitchLayerAction';
+export * from './key-action';
+export * from './keystroke-action';
+export * from './mouse-action';
+export * from './none-action';
+export * from './play-macro-action';
+export * from './switch-keymap-action';
+export * from './switch-layer-action';
 export * from './helper';
diff --git a/shared/src/config-serializer/config-items/key-action/KeyAction.ts b/shared/src/config-serializer/config-items/key-action/key-action.ts
similarity index 94%
rename from shared/src/config-serializer/config-items/key-action/KeyAction.ts
rename to shared/src/config-serializer/config-items/key-action/key-action.ts
index 0ab05c16..8b93595a 100644
--- a/shared/src/config-serializer/config-items/key-action/KeyAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/key-action.ts
@@ -1,7 +1,7 @@
-/// <reference path="../../Function.d.ts" />
+/// <reference path="../../function.d.ts" />
 
-import { Macro } from '../Macro';
-import { UhkBuffer } from '../../UhkBuffer';
+import { Macro } from '../macro';
+import { UhkBuffer } from '../../uhk-buffer';
 
 export enum KeyActionId {
     NoneAction                   = 0,
diff --git a/shared/src/config-serializer/config-items/key-action/KeystrokeAction.ts b/shared/src/config-serializer/config-items/key-action/keystroke-action.ts
similarity index 96%
rename from shared/src/config-serializer/config-items/key-action/KeystrokeAction.ts
rename to shared/src/config-serializer/config-items/key-action/keystroke-action.ts
index 9e168030..1c3ef53d 100644
--- a/shared/src/config-serializer/config-items/key-action/KeystrokeAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/keystroke-action.ts
@@ -1,8 +1,8 @@
 import { assertEnum, assertUInt8 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { KeyModifiers } from '../KeyModifiers';
-import { LongPressAction } from '../LongPressAction';
-import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { KeyModifiers } from '../key-modifiers';
+import { LongPressAction } from '../long-press-action';
+import { KeyAction, KeyActionId, keyActionType } from './key-action';
 import { KeystrokeType } from './keystroke-type';
 
 export enum KeystrokeActionFlag {
diff --git a/shared/src/config-serializer/config-items/key-action/MouseAction.ts b/shared/src/config-serializer/config-items/key-action/mouse-action.ts
similarity index 91%
rename from shared/src/config-serializer/config-items/key-action/MouseAction.ts
rename to shared/src/config-serializer/config-items/key-action/mouse-action.ts
index 91afcbf1..53e9f302 100644
--- a/shared/src/config-serializer/config-items/key-action/MouseAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/mouse-action.ts
@@ -1,6 +1,6 @@
 import { assertEnum } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { KeyAction, KeyActionId, keyActionType } from './key-action';
 
 export enum MouseActionParam {
     leftClick,
diff --git a/shared/src/config-serializer/config-items/key-action/NoneAction.ts b/shared/src/config-serializer/config-items/key-action/none-action.ts
similarity index 85%
rename from shared/src/config-serializer/config-items/key-action/NoneAction.ts
rename to shared/src/config-serializer/config-items/key-action/none-action.ts
index 11a9eae7..bc3acbd2 100644
--- a/shared/src/config-serializer/config-items/key-action/NoneAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/none-action.ts
@@ -1,5 +1,5 @@
-import { UhkBuffer } from '../../UhkBuffer';
-import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { KeyAction, KeyActionId, keyActionType } from './key-action';
 
 /**
  * NoneAction is only intended for binary serialization of undefined key actions
diff --git a/shared/src/config-serializer/config-items/key-action/PlayMacroAction.ts b/shared/src/config-serializer/config-items/key-action/play-macro-action.ts
similarity index 90%
rename from shared/src/config-serializer/config-items/key-action/PlayMacroAction.ts
rename to shared/src/config-serializer/config-items/key-action/play-macro-action.ts
index 55669d59..7d9efd43 100644
--- a/shared/src/config-serializer/config-items/key-action/PlayMacroAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/play-macro-action.ts
@@ -1,7 +1,7 @@
 import { assertUInt8 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { Macro } from '../Macro';
-import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { Macro } from '../macro';
+import { KeyAction, KeyActionId, keyActionType } from './key-action';
 
 export class PlayMacroAction extends KeyAction {
 
diff --git a/shared/src/config-serializer/config-items/key-action/SwitchKeymapAction.ts b/shared/src/config-serializer/config-items/key-action/switch-keymap-action.ts
similarity index 91%
rename from shared/src/config-serializer/config-items/key-action/SwitchKeymapAction.ts
rename to shared/src/config-serializer/config-items/key-action/switch-keymap-action.ts
index ee3e92f4..86163cec 100644
--- a/shared/src/config-serializer/config-items/key-action/SwitchKeymapAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/switch-keymap-action.ts
@@ -1,6 +1,6 @@
-import { UhkBuffer } from '../../UhkBuffer';
-import { Keymap } from '../Keymap';
-import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { Keymap } from '../keymap';
+import { KeyAction, KeyActionId, keyActionType } from './key-action';
 
 export class SwitchKeymapAction extends KeyAction {
 
diff --git a/shared/src/config-serializer/config-items/key-action/SwitchLayerAction.ts b/shared/src/config-serializer/config-items/key-action/switch-layer-action.ts
similarity index 92%
rename from shared/src/config-serializer/config-items/key-action/SwitchLayerAction.ts
rename to shared/src/config-serializer/config-items/key-action/switch-layer-action.ts
index 0dceed62..f8096599 100644
--- a/shared/src/config-serializer/config-items/key-action/SwitchLayerAction.ts
+++ b/shared/src/config-serializer/config-items/key-action/switch-layer-action.ts
@@ -1,6 +1,6 @@
 import { assertEnum } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { KeyAction, KeyActionId, keyActionType } from './key-action';
 
 export enum LayerName {
     mod,
diff --git a/shared/src/config-serializer/config-items/KeyModifiers.ts b/shared/src/config-serializer/config-items/key-modifiers.ts
similarity index 100%
rename from shared/src/config-serializer/config-items/KeyModifiers.ts
rename to shared/src/config-serializer/config-items/key-modifiers.ts
diff --git a/shared/src/config-serializer/config-items/Keymap.ts b/shared/src/config-serializer/config-items/keymap.ts
similarity index 97%
rename from shared/src/config-serializer/config-items/Keymap.ts
rename to shared/src/config-serializer/config-items/keymap.ts
index be7dc599..038ca2f1 100644
--- a/shared/src/config-serializer/config-items/Keymap.ts
+++ b/shared/src/config-serializer/config-items/keymap.ts
@@ -1,6 +1,6 @@
-import { UhkBuffer } from '../UhkBuffer';
-import { Layer } from './Layer';
-import { Macro } from './Macro';
+import { UhkBuffer } from '../uhk-buffer';
+import { Layer } from './layer';
+import { Macro } from './macro';
 import { SwitchLayerAction, KeyAction } from './key-action';
 
 export class Keymap {
diff --git a/shared/src/config-serializer/config-items/Layer.ts b/shared/src/config-serializer/config-items/layer.ts
similarity index 94%
rename from shared/src/config-serializer/config-items/Layer.ts
rename to shared/src/config-serializer/config-items/layer.ts
index a174bd44..072d8674 100644
--- a/shared/src/config-serializer/config-items/Layer.ts
+++ b/shared/src/config-serializer/config-items/layer.ts
@@ -1,6 +1,6 @@
-import { UhkBuffer } from '../UhkBuffer';
-import { Macro } from './Macro';
-import { Module } from './Module';
+import { UhkBuffer } from '../uhk-buffer';
+import { Macro } from './macro';
+import { Module } from './module';
 
 export class Layer {
 
diff --git a/shared/src/config-serializer/config-items/LongPressAction.ts b/shared/src/config-serializer/config-items/long-press-action.ts
similarity index 100%
rename from shared/src/config-serializer/config-items/LongPressAction.ts
rename to shared/src/config-serializer/config-items/long-press-action.ts
diff --git a/shared/src/config-serializer/config-items/macro-action/DelayMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/delay-macro-action.ts
similarity index 89%
rename from shared/src/config-serializer/config-items/macro-action/DelayMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/delay-macro-action.ts
index 5085b5ae..c00701cf 100644
--- a/shared/src/config-serializer/config-items/macro-action/DelayMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/delay-macro-action.ts
@@ -1,6 +1,6 @@
 import { assertUInt16 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { MacroAction, MacroActionId, macroActionType } from './macro-action';
 
 export class DelayMacroAction extends MacroAction {
 
diff --git a/shared/src/config-serializer/config-items/macro-action/EditableMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/editable-macro-action.ts
similarity index 94%
rename from shared/src/config-serializer/config-items/macro-action/EditableMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/editable-macro-action.ts
index 5d2a2cd7..2128a97c 100644
--- a/shared/src/config-serializer/config-items/macro-action/EditableMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/editable-macro-action.ts
@@ -1,11 +1,11 @@
 import { KeyAction, KeystrokeAction, keyActionType } from '../key-action';
-import { DelayMacroAction } from './DelayMacroAction';
-import { KeyMacroAction } from './KeyMacroAction';
-import { MacroAction, MacroSubAction, macroActionType } from './MacroAction';
-import { MouseButtonMacroAction } from './MouseButtonMacroAction';
-import { MoveMouseMacroAction } from './MoveMouseMacroAction';
-import { ScrollMouseMacroAction } from './ScrollMouseMacroAction';
-import { TextMacroAction } from './TextMacroAction';
+import { DelayMacroAction } from './delay-macro-action';
+import { KeyMacroAction } from './key-macro-action';
+import { MacroAction, MacroSubAction, macroActionType } from './macro-action';
+import { MouseButtonMacroAction } from './mouse-button-macro-action';
+import { MoveMouseMacroAction } from './move-mouse-macro-action';
+import { ScrollMouseMacroAction } from './scroll-mouse-macro-action';
+import { TextMacroAction } from './text-macro-action';
 
 interface JsObjectEditableMacroAction {
     macroActionType: string;
diff --git a/shared/src/config-serializer/config-items/macro-action/helper.ts b/shared/src/config-serializer/config-items/macro-action/helper.ts
index 14f7d302..fa8ca2ac 100644
--- a/shared/src/config-serializer/config-items/macro-action/helper.ts
+++ b/shared/src/config-serializer/config-items/macro-action/helper.ts
@@ -1,4 +1,4 @@
-import { UhkBuffer } from '../../UhkBuffer';
+import { UhkBuffer } from '../../uhk-buffer';
 import {
     DelayMacroAction,
     KeyMacroAction,
diff --git a/shared/src/config-serializer/config-items/macro-action/index.ts b/shared/src/config-serializer/config-items/macro-action/index.ts
index 464ae627..127ec22d 100644
--- a/shared/src/config-serializer/config-items/macro-action/index.ts
+++ b/shared/src/config-serializer/config-items/macro-action/index.ts
@@ -1,9 +1,9 @@
-export * from './DelayMacroAction';
-export * from './EditableMacroAction';
-export * from './KeyMacroAction';
-export * from './MacroAction';
-export * from './MoveMouseMacroAction';
-export * from './MouseButtonMacroAction';
-export * from './ScrollMouseMacroAction';
-export * from './TextMacroAction';
+export * from './delay-macro-action';
+export * from './editable-macro-action';
+export * from './key-macro-action';
+export * from './macro-action';
+export * from './move-mouse-macro-action';
+export * from './mouse-button-macro-action';
+export * from './scroll-mouse-macro-action';
+export * from './text-macro-action';
 export * from './helper';
diff --git a/shared/src/config-serializer/config-items/macro-action/KeyMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/key-macro-action.ts
similarity index 96%
rename from shared/src/config-serializer/config-items/macro-action/KeyMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/key-macro-action.ts
index a68451a0..c4d1031d 100644
--- a/shared/src/config-serializer/config-items/macro-action/KeyMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/key-macro-action.ts
@@ -1,7 +1,7 @@
 import { assertEnum, assertUInt8 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { KeyModifiers } from '../KeyModifiers';
-import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './MacroAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { KeyModifiers } from '../key-modifiers';
+import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './macro-action';
 
 const NUM_OF_COMBINATIONS = 3; // Cases: scancode, modifer, both
 
diff --git a/shared/src/config-serializer/config-items/macro-action/MacroAction.ts b/shared/src/config-serializer/config-items/macro-action/macro-action.ts
similarity index 98%
rename from shared/src/config-serializer/config-items/macro-action/MacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/macro-action.ts
index 1e67b185..81f07e6a 100644
--- a/shared/src/config-serializer/config-items/macro-action/MacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/macro-action.ts
@@ -1,4 +1,4 @@
-import { UhkBuffer } from '../../UhkBuffer';
+import { UhkBuffer } from '../../uhk-buffer';
 
 export enum MacroActionId {
     KeyMacroAction                  =  0,
diff --git a/shared/src/config-serializer/config-items/macro-action/MouseButtonMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/mouse-button-macro-action.ts
similarity index 97%
rename from shared/src/config-serializer/config-items/macro-action/MouseButtonMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/mouse-button-macro-action.ts
index 000fb9d0..75638ccb 100644
--- a/shared/src/config-serializer/config-items/macro-action/MouseButtonMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/mouse-button-macro-action.ts
@@ -1,6 +1,6 @@
 import { assertEnum, assertUInt8 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './MacroAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './macro-action';
 
 export enum MouseButtons {
     Left = 1 << 0,
diff --git a/shared/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/move-mouse-macro-action.ts
similarity index 90%
rename from shared/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/move-mouse-macro-action.ts
index 56dadc37..d2746dff 100644
--- a/shared/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/move-mouse-macro-action.ts
@@ -1,6 +1,6 @@
 import { assertInt16 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { MacroAction, MacroActionId, macroActionType } from './macro-action';
 
 export class MoveMouseMacroAction extends MacroAction {
 
diff --git a/shared/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/scroll-mouse-macro-action.ts
similarity index 90%
rename from shared/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/scroll-mouse-macro-action.ts
index ac736cc4..bcc7028a 100644
--- a/shared/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/scroll-mouse-macro-action.ts
@@ -1,6 +1,6 @@
 import { assertInt16 } from '../../assert';
-import { UhkBuffer } from '../../UhkBuffer';
-import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { MacroAction, MacroActionId, macroActionType } from './macro-action';
 
 export class ScrollMouseMacroAction extends MacroAction {
 
diff --git a/shared/src/config-serializer/config-items/macro-action/TextMacroAction.ts b/shared/src/config-serializer/config-items/macro-action/text-macro-action.ts
similarity index 88%
rename from shared/src/config-serializer/config-items/macro-action/TextMacroAction.ts
rename to shared/src/config-serializer/config-items/macro-action/text-macro-action.ts
index d49b76e1..d63911e5 100644
--- a/shared/src/config-serializer/config-items/macro-action/TextMacroAction.ts
+++ b/shared/src/config-serializer/config-items/macro-action/text-macro-action.ts
@@ -1,5 +1,5 @@
-import { UhkBuffer } from '../../UhkBuffer';
-import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
+import { UhkBuffer } from '../../uhk-buffer';
+import { MacroAction, MacroActionId, macroActionType } from './macro-action';
 
 export class TextMacroAction extends MacroAction {
 
diff --git a/shared/src/config-serializer/config-items/Macro.ts b/shared/src/config-serializer/config-items/macro.ts
similarity index 97%
rename from shared/src/config-serializer/config-items/Macro.ts
rename to shared/src/config-serializer/config-items/macro.ts
index f151818e..73f3641e 100644
--- a/shared/src/config-serializer/config-items/Macro.ts
+++ b/shared/src/config-serializer/config-items/macro.ts
@@ -1,5 +1,5 @@
 import { assertUInt8 } from '../assert';
-import { UhkBuffer } from '../UhkBuffer';
+import { UhkBuffer } from '../uhk-buffer';
 import { Helper as MacroActionHelper, MacroAction } from './macro-action';
 
 export class Macro {
diff --git a/shared/src/config-serializer/config-items/ModuleConfiguration.ts b/shared/src/config-serializer/config-items/module-configuration.ts
similarity index 97%
rename from shared/src/config-serializer/config-items/ModuleConfiguration.ts
rename to shared/src/config-serializer/config-items/module-configuration.ts
index fa4f8827..f4c1cd10 100644
--- a/shared/src/config-serializer/config-items/ModuleConfiguration.ts
+++ b/shared/src/config-serializer/config-items/module-configuration.ts
@@ -1,5 +1,5 @@
 import { assertUInt8 } from '../assert';
-import { UhkBuffer } from '../UhkBuffer';
+import { UhkBuffer } from '../uhk-buffer';
 
 export class ModuleConfiguration {
 
diff --git a/shared/src/config-serializer/config-items/Module.ts b/shared/src/config-serializer/config-items/module.ts
similarity index 93%
rename from shared/src/config-serializer/config-items/Module.ts
rename to shared/src/config-serializer/config-items/module.ts
index 9d3063ae..267b3318 100644
--- a/shared/src/config-serializer/config-items/Module.ts
+++ b/shared/src/config-serializer/config-items/module.ts
@@ -1,8 +1,7 @@
 import { assertEnum, assertUInt8 } from '../assert';
-import { UhkBuffer } from '../UhkBuffer';
-import { Helper as KeyActionHelper, KeyAction, NoneAction } from './key-action';
-import { Macro } from './Macro';
-import { PlayMacroAction, SwitchKeymapAction } from './key-action';
+import { UhkBuffer } from '../uhk-buffer';
+import { Helper as KeyActionHelper, KeyAction, NoneAction, PlayMacroAction, SwitchKeymapAction } from './key-action';
+import { Macro } from './macro';
 
 enum PointerRole {
     none,
diff --git a/shared/src/config-serializer/config-items/UserConfiguration.ts b/shared/src/config-serializer/config-items/user-configuration.ts
similarity index 93%
rename from shared/src/config-serializer/config-items/UserConfiguration.ts
rename to shared/src/config-serializer/config-items/user-configuration.ts
index 99c41ccf..819bef0b 100644
--- a/shared/src/config-serializer/config-items/UserConfiguration.ts
+++ b/shared/src/config-serializer/config-items/user-configuration.ts
@@ -1,8 +1,8 @@
 import { assertUInt16 } from '../assert';
-import { UhkBuffer } from '../UhkBuffer';
-import { Keymap } from './Keymap';
-import { Macro } from './Macro';
-import { ModuleConfiguration } from './ModuleConfiguration';
+import { UhkBuffer } from '../uhk-buffer';
+import { Keymap } from './keymap';
+import { Macro } from './macro';
+import { ModuleConfiguration } from './module-configuration';
 
 export class UserConfiguration {
 
diff --git a/shared/src/config-serializer/Function.d.ts b/shared/src/config-serializer/function.d.ts
similarity index 100%
rename from shared/src/config-serializer/Function.d.ts
rename to shared/src/config-serializer/function.d.ts
diff --git a/shared/src/config-serializer/UhkBuffer.ts b/shared/src/config-serializer/uhk-buffer.ts
similarity index 100%
rename from shared/src/config-serializer/UhkBuffer.ts
rename to shared/src/config-serializer/uhk-buffer.ts
diff --git a/shared/src/services/datastorage-repository.service.ts b/shared/src/services/datastorage-repository.service.ts
index 2d2baa7c..373a3e31 100644
--- a/shared/src/services/datastorage-repository.service.ts
+++ b/shared/src/services/datastorage-repository.service.ts
@@ -1,6 +1,6 @@
 import { InjectionToken } from '@angular/core';
 
-import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration';
+import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
 import { AutoUpdateSettings } from '../models/auto-update-settings';
 
 export interface DataStorageRepositoryService {
diff --git a/shared/src/services/default-user-configuration.service.ts b/shared/src/services/default-user-configuration.service.ts
index 2ba5d764..69834f9d 100644
--- a/shared/src/services/default-user-configuration.service.ts
+++ b/shared/src/services/default-user-configuration.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration';
+import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
 
 @Injectable()
 export class DefaultUserConfigurationService {
diff --git a/shared/src/services/local-datastorage-repository.service.ts b/shared/src/services/local-datastorage-repository.service.ts
index 4872f386..8e7d7219 100644
--- a/shared/src/services/local-datastorage-repository.service.ts
+++ b/shared/src/services/local-datastorage-repository.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration';
+import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
 import { DataStorageRepositoryService } from './datastorage-repository.service';
 import { State as AutoUpdateSettings } from '../store/reducers/auto-update-settings';
 
diff --git a/shared/src/store/actions/keymap.ts b/shared/src/store/actions/keymap.ts
index ca9e0109..37674bf0 100644
--- a/shared/src/store/actions/keymap.ts
+++ b/shared/src/store/actions/keymap.ts
@@ -1,8 +1,8 @@
 import { Action } from '@ngrx/store';
 
 import { KeyAction } from '../../config-serializer/config-items/key-action';
-import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { Macro } from '../../config-serializer/config-items/Macro';
+import { Keymap } from '../../config-serializer/config-items/keymap';
+import { Macro } from '../../config-serializer/config-items/macro';
 
 export namespace KeymapActions {
     export const PREFIX = '[Keymap] ';
diff --git a/shared/src/store/actions/macro.ts b/shared/src/store/actions/macro.ts
index 5b0fc5f6..abe7d35f 100644
--- a/shared/src/store/actions/macro.ts
+++ b/shared/src/store/actions/macro.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 
-import { Macro } from '../../config-serializer/config-items/Macro';
+import { Macro } from '../../config-serializer/config-items/macro';
 import { MacroAction } from '../../config-serializer/config-items/macro-action';
 
 export namespace MacroActions {
diff --git a/shared/src/store/actions/user-config.ts b/shared/src/store/actions/user-config.ts
index 18caffdf..6e6339a7 100644
--- a/shared/src/store/actions/user-config.ts
+++ b/shared/src/store/actions/user-config.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
 import { type } from '../../util';
-import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
+import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
 
 const PREFIX = '[user-config] ';
 
diff --git a/shared/src/store/effects/keymap.ts b/shared/src/store/effects/keymap.ts
index ba8c430c..0c91e38e 100644
--- a/shared/src/store/effects/keymap.ts
+++ b/shared/src/store/effects/keymap.ts
@@ -15,7 +15,7 @@ import 'rxjs/add/observable/of';
 import { KeymapActions } from '../actions';
 import { AppState } from '../index';
 
-import { Keymap } from '../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../config-serializer/config-items/keymap';
 
 @Injectable()
 export class KeymapEffects {
diff --git a/shared/src/store/effects/user-config.ts b/shared/src/store/effects/user-config.ts
index 4251d4f2..1c729b67 100644
--- a/shared/src/store/effects/user-config.ts
+++ b/shared/src/store/effects/user-config.ts
@@ -16,7 +16,7 @@ import {
     SaveUserConfigSuccessAction
 } from '../actions/user-config';
 
-import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
+import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
 import { DATA_STORAGE_REPOSITORY, DataStorageRepositoryService } from '../../services/datastorage-repository.service';
 import { DefaultUserConfigurationService } from '../../services/default-user-configuration.service';
 import { AppState, getUserConfiguration } from '../index';
diff --git a/shared/src/store/index.ts b/shared/src/store/index.ts
index 885f5287..8ac8f2d6 100644
--- a/shared/src/store/index.ts
+++ b/shared/src/store/index.ts
@@ -1,7 +1,7 @@
 import { createSelector } from 'reselect';
 
-import { Keymap } from '../config-serializer/config-items/Keymap';
-import { UserConfiguration } from '../config-serializer/config-items/UserConfiguration';
+import { Keymap } from '../config-serializer/config-items/keymap';
+import { UserConfiguration } from '../config-serializer/config-items/user-configuration';
 import * as autoUpdate from './reducers/auto-update-settings';
 
 // State interface for the application
diff --git a/shared/src/store/reducers/preset.ts b/shared/src/store/reducers/preset.ts
index 40027961..fdbc95dd 100644
--- a/shared/src/store/reducers/preset.ts
+++ b/shared/src/store/reducers/preset.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 
-import { Keymap } from '../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../config-serializer/config-items/keymap';
 import { KeymapActions } from '../actions/keymap';
 
 const initialState: Keymap[] = [];
diff --git a/shared/src/store/reducers/user-configuration.ts b/shared/src/store/reducers/user-configuration.ts
index e6aee691..3963ebe7 100644
--- a/shared/src/store/reducers/user-configuration.ts
+++ b/shared/src/store/reducers/user-configuration.ts
@@ -6,11 +6,11 @@ import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/map';
 
 import { Helper as KeyActionHelper, KeyAction } from '../../config-serializer/config-items/key-action';
-import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { Macro } from '../../config-serializer/config-items/Macro';
-import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
-import { Layer } from '../../config-serializer/config-items/Layer';
-import { Module } from '../../config-serializer/config-items/Module';
+import { Keymap } from '../../config-serializer/config-items/keymap';
+import { Macro } from '../../config-serializer/config-items/macro';
+import { UserConfiguration } from '../../config-serializer/config-items/user-configuration';
+import { Layer } from '../../config-serializer/config-items/layer';
+import { Module } from '../../config-serializer/config-items/module';
 import { KeymapActions, MacroActions } from '../actions';
 import { AppState } from '../index';
 import { ActionTypes } from '../actions/user-config';
diff --git a/test-serializer/test-serializer.ts b/test-serializer/test-serializer.ts
index 7b5aa257..18ea3a1a 100644
--- a/test-serializer/test-serializer.ts
+++ b/test-serializer/test-serializer.ts
@@ -1,5 +1,5 @@
-import { UserConfiguration } from '../shared/src/config-serializer/config-items/UserConfiguration';
-import { UhkBuffer } from '../shared/src/config-serializer/UhkBuffer';
+import { UserConfiguration } from '../shared/src/config-serializer/config-items/user-configuration';
+import { UhkBuffer } from '../shared/src/config-serializer/uhk-buffer';
 
 const assert = require('assert');
 const fs = require('fs');