diff --git a/app/Game/Channel/Channel.js b/app/Game/Channel/Channel.js
index 2682fb4..db3b3a6 100755
--- a/app/Game/Channel/Channel.js
+++ b/app/Game/Channel/Channel.js
@@ -7,7 +7,7 @@
         "Game/Config/Settings"
     ], 
 
-    function (GameController, nc, User, ProtocolHelper, OptionsHelper, Settings) {
+    function (GameController, nc, User, ProtocolHelper, optionsHelper, Settings) {
 
         "use strict";
 
@@ -21,7 +21,7 @@
             this.levelListIndex = -1;
             this.gameController = null;
 
-            this.options = options = OptionsHelper.merge(options, {
+            this.options = options = optionsHelper.merge(options, {
                 levelUids: Settings.CHANNEL_DEFAULT_LEVELS
             });
 
diff --git a/app/Game/Core/GameObjects/Item.js b/app/Game/Core/GameObjects/Item.js
index 0787a05..4e25fb0 100644
--- a/app/Game/Core/GameObjects/Item.js
+++ b/app/Game/Core/GameObjects/Item.js
@@ -8,7 +8,7 @@ define([
     "Lib/Utilities/Assert"
 ],
  
-function (Parent, Box2D, OptionsHelper, Settings, Exception, nc, Assert) {
+function (Parent, Box2D, optionsHelper, Settings, Exception, nc, Assert) {
 
 	"use strict";
  
@@ -26,7 +26,7 @@ function (Parent, Box2D, OptionsHelper, Settings, Exception, nc, Assert) {
             y: parseFloat(options.y)
         };
 
-        this.options = OptionsHelper.merge(floatOptions, options);
+        this.options = optionsHelper.merge(floatOptions, options);
 
         if(!this.options.category) {
             // FIXME add more validation
diff --git a/app/Game/Core/GameObjects/Items/RagDoll.js b/app/Game/Core/GameObjects/Items/RagDoll.js
index 51bdb3e..48faba6 100644
--- a/app/Game/Core/GameObjects/Items/RagDoll.js
+++ b/app/Game/Core/GameObjects/Items/RagDoll.js
@@ -8,7 +8,7 @@ define([
     "Game/Config/ItemSettings",
 ],
  
-function (Parent, Box2D, Settings, nc, Assert, OptionsHelper, ItemSettings) {
+function (Parent, Box2D, Settings, nc, Assert, optionsHelper, ItemSettings) {
 
 	"use strict";
  
@@ -96,8 +96,8 @@ function (Parent, Box2D, Settings, nc, Assert, OptionsHelper, ItemSettings) {
 
 
         // FIXME
-        var ragdollOptions = OptionsHelper.merge(ItemSettings.RagDoll, ItemSettings.Default);
-        options = OptionsHelper.merge(options, ragdollOptions);
+        var ragdollOptions = optionsHelper.merge(ItemSettings.RagDoll, ItemSettings.Default);
+        options = optionsHelper.merge(options, ragdollOptions);
         Parent.call(this, physicsEngine, uid, options);
         //this.createSensor();
 
diff --git a/app/Game/Core/Loader/TiledLevel.js b/app/Game/Core/Loader/TiledLevel.js
index 3990efc..16834b0 100755
--- a/app/Game/Core/Loader/TiledLevel.js
+++ b/app/Game/Core/Loader/TiledLevel.js
@@ -13,7 +13,7 @@ define([
     "Game/" + GLOBALS.context + "/GameObjects/Item",
     "Game/" + GLOBALS.context + "/GameObjects/Items/Skateboard",
 
-], function (Parent, Settings, ItemSettings, Box2D, OptionsHelper, Exception, nc, Assert, AbstractLayer, CollisionDetector, Tile, Item, Skateboard) {
+], function (Parent, Settings, ItemSettings, Box2D, optionsHelper, Exception, nc, Assert, AbstractLayer, CollisionDetector, Tile, Item, Skateboard) {
     
     "use strict";
 
@@ -187,7 +187,7 @@ define([
             throw new Exception("Item name (" + name + ") cannot be found in item list");
         }
 
-        return OptionsHelper.merge(ItemSettings[name], ItemSettings.Default);
+        return optionsHelper.merge(ItemSettings[name], ItemSettings.Default);
     };
 
     TiledLevel.prototype.getTileImagePath = function(gid) {
diff --git a/app/Lib/Utilities/Options.js b/app/Lib/Utilities/Options.js
index ff21290..fb24e3d 100644
--- a/app/Lib/Utilities/Options.js
+++ b/app/Lib/Utilities/Options.js
@@ -10,7 +10,7 @@ function (Exception) {
 
     }
  
-    OptionsHelper.prototype.merge = function(options, preset) {
+    optionsHelper.prototype.merge = function(options, preset) {
 
     	if(!preset && !options) {
     		throw new Exception("OptionsHelper requires objects");
@@ -43,7 +43,7 @@ function (Exception) {
 				if(options[key].constructor !== Object) {
 					preset[key] = options[key];
 				} else {
-					preset[key] = OptionsHelper.prototype.merge.call(this, options[key], preset[key]);
+					preset[key] = optionsHelper.prototype.merge.call(this, options[key], preset[key]);
 				}
 			}
 		}
diff --git a/app/Server/Api.js b/app/Server/Api.js
index a0186a3..f237c26 100644
--- a/app/Server/Api.js
+++ b/app/Server/Api.js
@@ -7,7 +7,7 @@ define([
 	"fs"
 ],
  
-function (nc, ProtocolHelper, validate, OptionsHelper, Settings, FileSystem) {
+function (nc, ProtocolHelper, validate, optionsHelper, Settings, FileSystem) {
 
 	"use strict";
 
@@ -121,7 +121,7 @@ function (nc, ProtocolHelper, validate, OptionsHelper, Settings, FileSystem) {
 				scoreLimit: Settings.CHANNEL_DEFAULT_SCORE_LIMIT
 			};
 
-			options = OptionsHelper.merge(options, defaultOptions);
+			options = optionsHelper.merge(options, defaultOptions);
 
 			var result = this.coordinator.createChannel(options);
 			if(result !== false) {