diff --git a/firebird-ng/src/app/main-display/main-display.component.ts b/firebird-ng/src/app/main-display/main-display.component.ts
index 9e6ad12..e64cc7d 100644
--- a/firebird-ng/src/app/main-display/main-display.component.ts
+++ b/firebird-ng/src/app/main-display/main-display.component.ts
@@ -423,7 +423,8 @@ export class MainDisplayComponent implements OnInit {
         //this.buildEventDataFromJSON(this.eventsArray[0]);
         this.eventDisplay.parsePhoenixEvents(data);
         console.log(this);
-        console.log(`Loading event: ${data}`);
+        console.log(`Loading event: `);
+        console.log(data);
       };
       worker.postMessage(eventConfig.eventFile);
     } else {
diff --git a/firebird-ng/src/app/painters/PointHitPainter.ts b/firebird-ng/src/app/painters/PointHitPainter.ts
deleted file mode 100644
index 9acab04..0000000
--- a/firebird-ng/src/app/painters/PointHitPainter.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-
-class PointHitPainter {
-
-}
diff --git a/firebird-ng/src/app/painters/box-hit.painter.ts b/firebird-ng/src/app/painters/box-hit.painter.ts
new file mode 100644
index 0000000..e69de29
diff --git a/firebird-ng/src/app/painters/IEntryComponentRenderer.ts b/firebird-ng/src/app/painters/component-painter.ts
similarity index 80%
rename from firebird-ng/src/app/painters/IEntryComponentRenderer.ts
rename to firebird-ng/src/app/painters/component-painter.ts
index dcccf8b..6dc01e8 100644
--- a/firebird-ng/src/app/painters/IEntryComponentRenderer.ts
+++ b/firebird-ng/src/app/painters/component-painter.ts
@@ -1,4 +1,4 @@
-interface IEntryComponentRenderer {
+interface ComponentPainter {
     createFromObject(source: any): any;
     toModel(source: any): any;
     renderAtTime(source: any): any;
diff --git a/firebird-ng/src/app/painters/Painter.ts b/firebird-ng/src/app/painters/event-painter.ts
similarity index 69%
rename from firebird-ng/src/app/painters/Painter.ts
rename to firebird-ng/src/app/painters/event-painter.ts
index a3b2c2c..15acc1e 100644
--- a/firebird-ng/src/app/painters/Painter.ts
+++ b/firebird-ng/src/app/painters/event-painter.ts
@@ -1,4 +1,4 @@
 
-interface Painter {
+interface EventPainter {
   sendEmail(address: string, content: string): void;
 }