diff --git a/projects/common/classes/audioElement.ts b/projects/common/classes/audio-element.ts
similarity index 85%
rename from projects/common/classes/audioElement.ts
rename to projects/common/classes/audio-element.ts
index 2f6d3be9ed6149b53a164ec56c20e8522e46e013..3db8a7c9ff35e2ea9e81dce27b3be00c7a800341 100644
--- a/projects/common/classes/audioElement.ts
+++ b/projects/common/classes/audio-element.ts
@@ -1,4 +1,4 @@
-import { UIElement } from './uIElement';
+import { UIElement } from './uI-element';
 
 export class AudioElement extends UIElement {
   src: string = '';
diff --git a/projects/common/classes/buttonElement.ts b/projects/common/classes/button-element.ts
similarity index 95%
rename from projects/common/classes/buttonElement.ts
rename to projects/common/classes/button-element.ts
index 906d10c3e72c35346d6a482c1fc894df95171ca8..70d1e4376b2c639558db6aa304b5a744016c02bf 100644
--- a/projects/common/classes/buttonElement.ts
+++ b/projects/common/classes/button-element.ts
@@ -1,5 +1,5 @@
 import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces';
-import { UIElement } from './uIElement';
+import { UIElement } from './uI-element';
 import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer';
 
 export class ButtonElement extends UIElement implements FontElement, SurfaceUIElement {
diff --git a/projects/common/classes/checkboxElement.ts b/projects/common/classes/checkbox-element.ts
similarity index 94%
rename from projects/common/classes/checkboxElement.ts
rename to projects/common/classes/checkbox-element.ts
index 7385d35c3f1bc79c7033b3031a9b7ec3e9ed07e5..7d4218a34affd8ba7ce408c010e2858616674476 100644
--- a/projects/common/classes/checkboxElement.ts
+++ b/projects/common/classes/checkbox-element.ts
@@ -1,4 +1,4 @@
-import { InputElement, UIElement } from './uIElement';
+import { InputElement, UIElement } from './uI-element';
 import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces';
 import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer';
 
diff --git a/projects/common/classes/dropdownElement.ts b/projects/common/classes/dropdown-element.ts
similarity index 93%
rename from projects/common/classes/dropdownElement.ts
rename to projects/common/classes/dropdown-element.ts
index 9373cba59582e64175f4bb4ca78f8305ef81a385..a06b74f5543825a68bcb3a4347496631f1f3cf29 100644
--- a/projects/common/classes/dropdownElement.ts
+++ b/projects/common/classes/dropdown-element.ts
@@ -1,4 +1,4 @@
-import { InputElement, UIElement } from './uIElement';
+import { InputElement, UIElement } from './uI-element';
 import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces';
 import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer';
 
diff --git a/projects/common/classes/imageElement.ts b/projects/common/classes/image-element.ts
similarity index 86%
rename from projects/common/classes/imageElement.ts
rename to projects/common/classes/image-element.ts
index a7a61456835af3e96eb9ce49fc388f5ed024180c..522329b604c2c434fa10fb697cdafaacf442a54e 100644
--- a/projects/common/classes/imageElement.ts
+++ b/projects/common/classes/image-element.ts
@@ -1,4 +1,4 @@
-import { UIElement } from './uIElement';
+import { UIElement } from './uI-element';
 
 export class ImageElement extends UIElement {
   src: string = '';
diff --git a/projects/common/classes/radioButtonGroupElement.ts b/projects/common/classes/radio-button-group-element.ts
similarity index 94%
rename from projects/common/classes/radioButtonGroupElement.ts
rename to projects/common/classes/radio-button-group-element.ts
index e66b31a04c36b58a5e7b05292cd2e3d259118beb..2a5a05fe71ae14452ff89efe3190c53daf631d9e 100644
--- a/projects/common/classes/radioButtonGroupElement.ts
+++ b/projects/common/classes/radio-button-group-element.ts
@@ -1,4 +1,4 @@
-import { InputElement, UIElement } from './uIElement';
+import { InputElement, UIElement } from './uI-element';
 import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces';
 import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer';
 
diff --git a/projects/common/classes/section.ts b/projects/common/classes/section.ts
index 802b6025e2466394ca6aa567c0fdd67482691490..873a6429a4ae6003fa2b20417a06d36f44f3fd70 100644
--- a/projects/common/classes/section.ts
+++ b/projects/common/classes/section.ts
@@ -1,6 +1,6 @@
 import {
   UIElement
-} from './uIElement';
+} from './uI-element';
 import * as ElementFactory from '../util/element.factory';
 
 export class Section {
diff --git a/projects/common/classes/textAreaElement.ts b/projects/common/classes/text-area-element.ts
similarity index 94%
rename from projects/common/classes/textAreaElement.ts
rename to projects/common/classes/text-area-element.ts
index 377d68352f1045625d4ec07cc48087bdf23383c4..3f0da8a7cc142abe397db959ef108a6a9bec53f6 100644
--- a/projects/common/classes/textAreaElement.ts
+++ b/projects/common/classes/text-area-element.ts
@@ -1,5 +1,5 @@
 import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces';
-import { InputElement, UIElement } from './uIElement';
+import { InputElement, UIElement } from './uI-element';
 import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer';
 
 export class TextAreaElement extends InputElement implements FontElement, SurfaceUIElement {
diff --git a/projects/common/classes/textElement.ts b/projects/common/classes/text-element.ts
similarity index 96%
rename from projects/common/classes/textElement.ts
rename to projects/common/classes/text-element.ts
index 8ccab10c724e831b44301d57f96073ce62dc1604..ace68c9e60168372b9a43b48744491a4df2eca06 100644
--- a/projects/common/classes/textElement.ts
+++ b/projects/common/classes/text-element.ts
@@ -1,4 +1,4 @@
-import { UIElement } from './uIElement';
+import { UIElement } from './uI-element';
 import { SurfaceUIElement } from '../interfaces/UIElementInterfaces';
 import { initSurfaceElement } from '../util/unit-interface-initializer';
 
diff --git a/projects/common/classes/textFieldElement.ts b/projects/common/classes/text-field-element.ts
similarity index 95%
rename from projects/common/classes/textFieldElement.ts
rename to projects/common/classes/text-field-element.ts
index 989b3ec6da2b23995c31f3a869d26339b9872828..388471877f953c916985138b21f9441c9da06fea 100644
--- a/projects/common/classes/textFieldElement.ts
+++ b/projects/common/classes/text-field-element.ts
@@ -1,4 +1,4 @@
-import { InputElement, UIElement } from './uIElement';
+import { InputElement, UIElement } from './uI-element';
 import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces';
 import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer';
 
diff --git a/projects/common/classes/uIElement.ts b/projects/common/classes/uI-element.ts
similarity index 100%
rename from projects/common/classes/uIElement.ts
rename to projects/common/classes/uI-element.ts
diff --git a/projects/common/classes/videoElement.ts b/projects/common/classes/video-element.ts
similarity index 86%
rename from projects/common/classes/videoElement.ts
rename to projects/common/classes/video-element.ts
index 650ba49f08352bfa5ac8ba8bc37b25b8382afdf8..9f901046fc996d62c81ba129ce371b16dd59194e 100644
--- a/projects/common/classes/videoElement.ts
+++ b/projects/common/classes/video-element.ts
@@ -1,4 +1,4 @@
-import { UIElement } from './uIElement';
+import { UIElement } from './uI-element';
 
 export class VideoElement extends UIElement {
   src: string = '';
diff --git a/projects/common/element-component.directive.ts b/projects/common/element-component.directive.ts
index 26e0931d27ae312d824ae11c99cf42f156fd8827..74bd49eb09c7f3cc70cc142f38c83c5eb6fb48d3 100644
--- a/projects/common/element-component.directive.ts
+++ b/projects/common/element-component.directive.ts
@@ -1,7 +1,7 @@
 import {
   Directive
 } from '@angular/core';
-import { UIElement } from './classes/uIElement';
+import { UIElement } from './classes/uI-element';
 
 @Directive()
 export abstract class ElementComponent {
diff --git a/projects/common/element-components/audio.component.ts b/projects/common/element-components/audio.component.ts
index 77bef3a509eb4b2b700b1684f6514d38b70d57da..98e86102d53ac5c130ab31b483e47cdc3cf2ffe8 100644
--- a/projects/common/element-components/audio.component.ts
+++ b/projects/common/element-components/audio.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { AudioElement } from '../classes/audioElement';
+import { AudioElement } from '../classes/audio-element';
 
 @Component({
   selector: 'app-audio',
diff --git a/projects/common/element-components/button.component.ts b/projects/common/element-components/button.component.ts
index b940318476eccc9e5e700a43b30f5694ce517621..7ece62f114a6e78c818f3cf05bc4bce138fe5c76 100644
--- a/projects/common/element-components/button.component.ts
+++ b/projects/common/element-components/button.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { ButtonElement } from '../classes/buttonElement';
+import { ButtonElement } from '../classes/button-element';
 
 @Component({
   selector: 'app-button',
diff --git a/projects/common/element-components/checkbox.component.ts b/projects/common/element-components/checkbox.component.ts
index 7ac772fff04d71c1984312cd34f348fa64eac7ce..46926d93865847dc07fb96127431551ff4fae071 100644
--- a/projects/common/element-components/checkbox.component.ts
+++ b/projects/common/element-components/checkbox.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { ValidatorFn, Validators } from '@angular/forms';
 import { FormElementComponent } from '../form-element-component.directive';
-import { CheckboxElement } from '../classes/checkboxElement';
+import { CheckboxElement } from '../classes/checkbox-element';
 
 @Component({
   selector: 'app-checkbox',
diff --git a/projects/common/element-components/dropdown.component.ts b/projects/common/element-components/dropdown.component.ts
index 4754e776853f60661cef78055938b68480fe6443..f69b6a4463e534ffe7c1bedf3ec9f10c3c30eee0 100644
--- a/projects/common/element-components/dropdown.component.ts
+++ b/projects/common/element-components/dropdown.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { FormElementComponent } from '../form-element-component.directive';
-import { DropdownElement } from '../classes/dropdownElement';
+import { DropdownElement } from '../classes/dropdown-element';
 
 @Component({
   selector: 'app-dropdown',
diff --git a/projects/common/element-components/image.component.ts b/projects/common/element-components/image.component.ts
index a49b9a5083ddc9fb3249eb4dd44e718604c19a31..26d414ef1fb0b1e3f79fb4bb55ccbcbf191dbb41 100644
--- a/projects/common/element-components/image.component.ts
+++ b/projects/common/element-components/image.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { ImageElement } from '../classes/imageElement';
+import { ImageElement } from '../classes/image-element';
 
 @Component({
   selector: 'app-image',
diff --git a/projects/common/element-components/pipes/error-transform.pipe.ts b/projects/common/element-components/pipes/error-transform.pipe.ts
index 0521d6fd0299524a1d20058d27b0a5b4865c176c..55e393598a682acd83d2d4859078a62b385f6e8f 100644
--- a/projects/common/element-components/pipes/error-transform.pipe.ts
+++ b/projects/common/element-components/pipes/error-transform.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { ValidationErrors } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
-import { UIElement } from '../../classes/uIElement';
+import { UIElement } from '../../classes/uI-element';
 
 @Pipe({
   name: 'errorTransform'
diff --git a/projects/common/element-components/radio-button-group.component.ts b/projects/common/element-components/radio-button-group.component.ts
index b1bb428692d3abcf03aa02c7212f44098a3a984f..4f5502e1f434fe47496cf7de9e98da7dd3eecd1f 100644
--- a/projects/common/element-components/radio-button-group.component.ts
+++ b/projects/common/element-components/radio-button-group.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { FormElementComponent } from '../form-element-component.directive';
-import { RadioButtonGroupElement } from '../classes/radioButtonGroupElement';
+import { RadioButtonGroupElement } from '../classes/radio-button-group-element';
 
 @Component({
   selector: 'app-radio-button-group',
diff --git a/projects/common/element-components/text-area.component.ts b/projects/common/element-components/text-area.component.ts
index fb23425d35e83f820107246acc53770ebbd40145..06c8304df2f6028351e38117f4fd7a36988031f6 100644
--- a/projects/common/element-components/text-area.component.ts
+++ b/projects/common/element-components/text-area.component.ts
@@ -1,6 +1,6 @@
 import { Component, Output, EventEmitter } from '@angular/core';
 import { FormElementComponent } from '../form-element-component.directive';
-import { TextAreaElement } from '../classes/textAreaElement';
+import { TextAreaElement } from '../classes/text-area-element';
 
 @Component({
   selector: 'app-text-area',
diff --git a/projects/common/element-components/text-field.component.ts b/projects/common/element-components/text-field.component.ts
index b6a2046b170262175a6370634cfa8125d5764854..860bd88f8c029797f99e9a653a60f515a764eaca 100644
--- a/projects/common/element-components/text-field.component.ts
+++ b/projects/common/element-components/text-field.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { ValidatorFn, Validators } from '@angular/forms';
 import { FormElementComponent } from '../form-element-component.directive';
-import { TextFieldElement } from '../classes/textFieldElement';
+import { TextFieldElement } from '../classes/text-field-element';
 
 @Component({
   selector: 'app-text-field',
diff --git a/projects/common/element-components/text.component.ts b/projects/common/element-components/text.component.ts
index e56b6a51da526704aef16fc04f02121fcc21567f..75325cccc7c7b0e4c3702ed8e985171f222d2ded 100644
--- a/projects/common/element-components/text.component.ts
+++ b/projects/common/element-components/text.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ElementComponent } from '../element-component.directive';
-import { TextElement } from '../classes/textElement';
+import { TextElement } from '../classes/text-element';
 
 @Component({
   selector: 'app-text',
diff --git a/projects/common/element-components/video.component.ts b/projects/common/element-components/video.component.ts
index 8ec946d33c3ffd6133a500d286f0cdaa414c7f43..73d4e5311505af1ac30a8425ab92c871eee63eaa 100644
--- a/projects/common/element-components/video.component.ts
+++ b/projects/common/element-components/video.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { VideoElement } from '../classes/videoElement';
+import { VideoElement } from '../classes/video-element';
 
 @Component({
   selector: 'app-video',
diff --git a/projects/common/form-element-component.directive.ts b/projects/common/form-element-component.directive.ts
index 4bc5e7dfa85e4be2254682ac7c6e415f90a052dc..a0c2c0c623591f089476f6bcd299d0c0e7fd78ec 100644
--- a/projects/common/form-element-component.directive.ts
+++ b/projects/common/form-element-component.directive.ts
@@ -9,7 +9,7 @@ import { pairwise, startWith, takeUntil } from 'rxjs/operators';
 import { FormService } from './form.service';
 import { ValueChangeElement } from './form';
 import { ElementComponent } from './element-component.directive';
-import { InputElement } from './classes/uIElement';
+import { InputElement } from './classes/uI-element';
 
 @Directive()
 export abstract class FormElementComponent extends ElementComponent implements OnInit, OnDestroy {
diff --git a/projects/common/util/element.factory.ts b/projects/common/util/element.factory.ts
index b6151e90a3c31291becd525ffa252d2ead87a16c..f60533efc765d6c55e1909fa6a1450faa887e93b 100644
--- a/projects/common/util/element.factory.ts
+++ b/projects/common/util/element.factory.ts
@@ -1,14 +1,14 @@
-import { UIElement } from '../classes/uIElement';
-import { TextElement } from '../classes/textElement';
-import { ButtonElement } from '../classes/buttonElement';
-import { TextFieldElement } from '../classes/textFieldElement';
-import { TextAreaElement } from '../classes/textAreaElement';
-import { CheckboxElement } from '../classes/checkboxElement';
-import { DropdownElement } from '../classes/dropdownElement';
-import { RadioButtonGroupElement } from '../classes/radioButtonGroupElement';
-import { ImageElement } from '../classes/imageElement';
-import { AudioElement } from '../classes/audioElement';
-import { VideoElement } from '../classes/videoElement';
+import { UIElement } from '../classes/uI-element';
+import { TextElement } from '../classes/text-element';
+import { ButtonElement } from '../classes/button-element';
+import { TextFieldElement } from '../classes/text-field-element';
+import { TextAreaElement } from '../classes/text-area-element';
+import { CheckboxElement } from '../classes/checkbox-element';
+import { DropdownElement } from '../classes/dropdown-element';
+import { RadioButtonGroupElement } from '../classes/radio-button-group-element';
+import { ImageElement } from '../classes/image-element';
+import { AudioElement } from '../classes/audio-element';
+import { VideoElement } from '../classes/video-element';
 
 export function createElement(elementModel: UIElement, coordinates?: { x: number; y: number }): UIElement {
   let newElement: UIElement;
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
index 6e0214c9fea06eebe8363e6e1d6f7600c5b725b8..06d6878a9e4be629addf8d6f8b261c5cbf0b3a07 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
@@ -12,7 +12,7 @@ import { FormElementComponent } from '../../../../../../../common/form-element-c
 import { ValueChangeElement } from '../../../../../../../common/form';
 import { ElementComponent } from '../../../../../../../common/element-component.directive';
 import { SelectionService } from '../../../../selection.service';
-import { InputElement, UIElement } from '../../../../../../../common/classes/uIElement';
+import { InputElement, UIElement } from '../../../../../../../common/classes/uI-element';
 
 @Directive()
 export abstract class CanvasElementOverlay implements OnInit, OnDestroy {
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
index ff1e5537798dc09a56d4bfb91973f533bc5a86ba..661403c857c22e2c52a2eb088743a2844921b6ac 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
@@ -7,7 +7,7 @@ import { takeUntil } from 'rxjs/operators';
 import { UnitService } from '../../../../unit.service';
 import { SelectionService } from '../../../../selection.service';
 import { Page } from '../../../../../../../common/classes/page';
-import { UIElement } from '../../../../../../../common/classes/uIElement';
+import { UIElement } from '../../../../../../../common/classes/uI-element';
 import { Section } from '../../../../../../../common/classes/section';
 
 @Component({
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
index c61e9c90055d2effeb15c0ba2e44246ec103ecf5..e52173916b4da44db14e17e95c7e05384dd0b3de 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { CdkDragMove } from '@angular/cdk/drag-drop';
 import { CanvasElementOverlay } from './canvas-element-overlay';
-import { UIElement } from '../../../../../../../common/classes/uIElement';
+import { UIElement } from '../../../../../../../common/classes/uI-element';
 
 @Component({
   selector: 'app-dynamic-canvas-overlay',
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
index 46b2362355ac40d97cc3852b023cdd7c4f010b7b..e80886e55ee70ebfac7bc271adcecd29fd5d3488 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
@@ -10,7 +10,7 @@ import { UnitService } from '../../../../unit.service';
 import { SelectionService } from '../../../../selection.service';
 import { MessageService } from '../../../../../../../common/message.service';
 import { FileService } from '../../../../../../../common/file.service';
-import { UIElement } from '../../../../../../../common/classes/uIElement';
+import { UIElement } from '../../../../../../../common/classes/uI-element';
 
 @Component({
   selector: 'app-element-properties',
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
index 298ea6b70c445a16fac3a7d439e8d3e59593c401..1fbd963abb24db0f01c39f64fd2e72bd8602b1dc 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { UnitService } from '../../../../unit.service';
 import { SelectionService } from '../../../../selection.service';
-import { UIElement } from '../../../../../../../common/classes/uIElement';
+import { UIElement } from '../../../../../../../common/classes/uI-element';
 
 @Component({
   selector: 'app-element-sizing-properties',
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
index d47a8e0849fbfb3ea8fd70435e600edd4282a8af..e891409af70c71e81d2387b0f6457d1997a0abf1 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
@@ -1,7 +1,7 @@
 import {
   Component, EventEmitter, Input, Output
 } from '@angular/core';
-import { UIElement } from '../../../../../../../common/classes/uIElement';
+import { UIElement } from '../../../../../../../common/classes/uI-element';
 
 @Component({
   selector: 'app-element-style-properties',
diff --git a/projects/editor/src/app/selection.service.ts b/projects/editor/src/app/selection.service.ts
index ebcdee736abcb8ae83fe66e4d1401ad150ffc6cd..e12d39a0b14b175320fdf3a7096ad03716d869e1 100644
--- a/projects/editor/src/app/selection.service.ts
+++ b/projects/editor/src/app/selection.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { UIElement } from '../../../common/classes/uIElement';
+import { UIElement } from '../../../common/classes/uI-element';
 
 @Injectable({
   providedIn: 'root'
diff --git a/projects/editor/src/app/unit.service.ts b/projects/editor/src/app/unit.service.ts
index c07368a595923ccca5d3277d92662393243aa2fa..bf63817a3b72af8c641f9b5df7e5d38cdafe6a74 100644
--- a/projects/editor/src/app/unit.service.ts
+++ b/projects/editor/src/app/unit.service.ts
@@ -9,8 +9,8 @@ import { VeronaAPIService } from './verona-api.service';
 import { Unit } from '../../../common/classes/unit';
 import { Page } from '../../../common/classes/page';
 import { Section } from '../../../common/classes/section';
-import { InputElement, UIElement } from '../../../common/classes/uIElement';
-import { TextElement } from '../../../common/classes/textElement';
+import { InputElement, UIElement } from '../../../common/classes/uI-element';
+import { TextElement } from '../../../common/classes/text-element';
 
 @Injectable({
   providedIn: 'root'
diff --git a/projects/player/src/app/components/element/element.component.ts b/projects/player/src/app/components/element/element.component.ts
index ed6a2e79d4a5ea36c9a250bdeef5f171f812bd1f..86e024c1694e5e35566717ec6fd31052c78d67da 100644
--- a/projects/player/src/app/components/element/element.component.ts
+++ b/projects/player/src/app/components/element/element.component.ts
@@ -13,7 +13,7 @@ import { FormService } from '../../../../../common/form.service';
 import { ValueChangeElement } from '../../../../../common/form';
 import { UnitStateService } from '../../services/unit-state.service';
 import { MarkingService } from '../../services/marking.service';
-import { UIElement } from '../../../../../common/classes/uIElement';
+import { UIElement } from '../../../../../common/classes/uI-element';
 
 @Component({
   selector: 'app-element',
diff --git a/projects/player/src/app/services/unit-state.service.ts b/projects/player/src/app/services/unit-state.service.ts
index bec7b9ee0005032297dcfaf314bbafaaceedd3a5..0de87d960c63fa2ddca8a3ad20f18cbf397e8b90 100644
--- a/projects/player/src/app/services/unit-state.service.ts
+++ b/projects/player/src/app/services/unit-state.service.ts
@@ -7,7 +7,7 @@ import {
   UnitStateElementCodeStatusValue
 } from '../models/verona';
 import { ValueChangeElement } from '../../../../common/form';
-import { InputElement, InputElementValue } from '../../../../common/classes/uIElement';
+import { InputElement, InputElementValue } from '../../../../common/classes/uI-element';
 
 @Injectable({
   providedIn: 'root'