diff --git a/src/index.html b/src/index.html
index be0debb..605ba6a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -28,12 +28,12 @@
       fog="color: #a00; density: 0.035; type: exponential">
       <a-assets timeout="10000">
         <a-asset-item id="arrowObj" src="assets/models/arrow.obj"></a-asset-item>
-        <a-asset-item id="backglow-obj" src="assets/models/backglow.obj"></a-asset-item>
+        <a-asset-item id="backglowObj" src="assets/models/backglow.obj"></a-asset-item>
         <a-asset-item id="beatObj" src="assets/models/beat.obj"></a-asset-item>
         <a-asset-item id="dotObj" src="assets/models/dot.obj"></a-asset-item>
-        <a-asset-item id="logofront-obj" src="assets/models/logofront.obj"></a-asset-item>
-        <a-asset-item id="logoback-obj" src="assets/models/logoback.obj"></a-asset-item>
-        <a-asset-item id="logofront-u-obj" src="assets/models/logofront-u.obj"></a-asset-item>
+        <a-asset-item id="logofrontObj" src="assets/models/logofront.obj"></a-asset-item>
+        <a-asset-item id="logobackObj" src="assets/models/logoback.obj"></a-asset-item>
+        <a-asset-item id="logofrontUObj" src="assets/models/logofront-u.obj"></a-asset-item>
         <a-asset-item id="logoSparks" src="assets/models/logosparks.json"></a-asset-item>
         <a-asset-item id="laserObj" src="assets/models/laser/laser.obj"></a-asset-item>
 
@@ -67,7 +67,7 @@
         <a-mixin id="arrow-red-beat" beat="color: red; type: arrow"></a-mixin>
         <a-mixin id="dot-blue-beat" beat="color: blue; type: dot"></a-mixin>
 
-        <a-mixin id="bad-beat"
+        <a-mixin id="badBeat"
           geometry="primitive: plane"
           material="shader: flat; transparent: true"
           visible="false"
@@ -92,10 +92,10 @@
       </a-entity>
 
       <!-- Wrong + miss beat visual indicators. -->
-      <a-entity id="wrongLeft" mixin='bad-beat' geometry="height: 0.3; width: 0.3" material="src: #wrongRedImg"></a-entity>
-      <a-entity id="wrongRight" mixin='bad-beat' geometry="height: 0.3; width: 0.3" material="src: #wrongBlueImg"></a-entity>
-      <a-entity id="missLeft" mixin='bad-beat' geometry="height: 0.25; width: 0.5" material="src: #missRedImg"></a-entity>
-      <a-entity id="missRight" mixin='bad-beat' geometry="height: 0.25; width: 0.5" material="src: #missBlueImg"></a-entity>
+      <a-entity id="wrongLeft" mixin='badBeat' geometry="height: 0.3; width: 0.3" material="src: #wrongRedImg"></a-entity>
+      <a-entity id="wrongRight" mixin='badBeat' geometry="height: 0.3; width: 0.3" material="src: #wrongBlueImg"></a-entity>
+      <a-entity id="missLeft" mixin='badBeat' geometry="height: 0.25; width: 0.5" material="src: #missRedImg"></a-entity>
+      <a-entity id="missRight" mixin='badBeat' geometry="height: 0.25; width: 0.5" material="src: #missBlueImg"></a-entity>
 
       <!-- Player. -->
       <a-mixin
diff --git a/src/templates/stage.html b/src/templates/stage.html
index 189d295..ff1fd64 100644
--- a/src/templates/stage.html
+++ b/src/templates/stage.html
@@ -6,7 +6,7 @@
   proxy-event="event: audioanalyser-beat; to: #logolight, #floor"></a-entity>
 
 <a-entity id="stage">
-  <a-entity id="backglow" obj-model="obj: #backglow-obj" position="0 0 -50" scale="20 20 20" material="shader: flat; transparent: true; fog: false; color: #f00; src:#backglowTexture; opacity: 0.8"></a-entity>
+  <a-entity id="backglow" obj-model="obj: #backglowObj" position="0 0 -50" scale="20 20 20" material="shader: flat; transparent: true; fog: false; color: #f00; src:#backglowTexture; opacity: 0.8"></a-entity>
 
   <a-entity id="twister" twister position="0 0 -60" rotation="90 0 0"></a-entity>
 
@@ -60,9 +60,9 @@
 
   <a-entity id="logosparks" bind__visible="menu.active" particleplayer="src: #logoSparks; scale: 1.4; pscale: 0.35; count: 10; dur: 600; on: logoflicker" position="-2.8 5.5 -7.2"></a-entity>
   <a-entity id="logo" bind__visible="menu.active" position="0 6 -7.5" rotation="90 0 0">
-    <a-entity obj-model="obj: #logoback-obj" material="color: #001B29"></a-entity>
-    <a-entity obj-model="obj: #logofront-obj"  material="color: #e81e23"></a-entity>
-    <a-entity obj-model="obj: #logofront-u-obj" material="color: #e81e23" logoflicker="delay: 1200" bind__logoflicker="active: menu.active"></a-entity>
+    <a-entity obj-model="obj: #logobackObj" material="color: #001b29"></a-entity>
+    <a-entity obj-model="obj: #logofrontObj"  material="color: #e81e23"></a-entity>
+    <a-entity obj-model="obj: #logofrontUObj" material="color: #e81e23" logoflicker="delay: 1200" bind__logoflicker="active: menu.active"></a-entity>
   </a-entity>
 
   <a-entity