diff --git a/Message/Request/OSType.enum.js b/Message/Request/OSType.enum.js
index 8f33a69..adcb735 100644
--- a/Message/Request/OSType.enum.js
+++ b/Message/Request/OSType.enum.js
@@ -9,7 +9,7 @@
  */
 (function (jsOMS, undefined)
 {
-    jsOMS.EnumOSType = Object.freeze({
+    jsOMS.Message.Request.OSType = Object.freeze({
         WINDOWS_81: 'windows nt 6.3'; /* Windows 8.1 */
         WINDOWS_8: 'windows nt 6.2'; /* Windows 8 */
         WINDOWS_7: 'windows nt 6.1'; /* Windows 7 */
diff --git a/Message/Request/RequestMethod.enum.js b/Message/Request/RequestMethod.enum.js
index fc9ccfd..51c07a5 100644
--- a/Message/Request/RequestMethod.enum.js
+++ b/Message/Request/RequestMethod.enum.js
@@ -9,7 +9,7 @@
  */
 (function (jsOMS, undefined)
 {
-    jsOMS.EnumRequestMethod = Object.freeze({
+    jsOMS.Message.Request.RequestMethod = Object.freeze({
         POST: 'POST',
         GET: 'GET',
         PUT: 'PUT',
diff --git a/Message/Request/RequestType.enum.js b/Message/Request/RequestType.enum.js
index d08817d..81ab583 100644
--- a/Message/Request/RequestType.enum.js
+++ b/Message/Request/RequestType.enum.js
@@ -9,7 +9,7 @@
  */
 (function (jsOMS, undefined)
 {
-    jsOMS.EnumRequestType = Object.freeze({
+    jsOMS.Message.Request.RequestType = Object.freeze({
         JSON: 'json',
         RAW: 'raw'
     });
diff --git a/Message/Response/ResponseResultType.enum.js b/Message/Response/ResponseResultType.enum.js
index 6b71086..59bf343 100644
--- a/Message/Response/ResponseResultType.enum.js
+++ b/Message/Response/ResponseResultType.enum.js
@@ -9,7 +9,7 @@
  */
 (function (jsOMS, undefined)
 {
-    jsOMS.EnumResponseResultType = Object.freeze({
+    jsOMS.Message.Response.ResponseResultType = Object.freeze({
         MULTI: 0,
         MESSAGE: 1,
         INFO: 2,
diff --git a/Message/Response/ResponseType.enum.js b/Message/Response/ResponseType.enum.js
index 83cd396..9c124e2 100644
--- a/Message/Response/ResponseType.enum.js
+++ b/Message/Response/ResponseType.enum.js
@@ -9,7 +9,7 @@
  */
 (function (jsOMS, undefined)
 {
-    jsOMS.EnumResponseType = Object.freeze({
+    jsOMS.Message.Response.ResponseType = Object.freeze({
         TEXT: 'text',
         JSON: 'json',
         DOCUMENT: 'document',
diff --git a/UI/FormManager.js b/UI/FormManager.js
index 061b375..d876a2c 100644
--- a/UI/FormManager.js
+++ b/UI/FormManager.js
@@ -94,7 +94,7 @@
         self = this;
 
         request.setData(form.getData());
-        request.setType(jsOMS.EnumResponseType.JSON);
+        request.setType(jsOMS.Message.Response.ResponseType.JSON);
         request.setUri(form.getAction());
         request.setMethod(form.getMethod());
         request.setRequestHeader('Content-Type', 'application/json');
diff --git a/oms.min.js b/oms.min.js
index f79a1e8..8fe7334 100644
--- a/oms.min.js
+++ b/oms.min.js
@@ -390,8 +390,8 @@
     {
         var authRequest = new jsOMS.Request();
         authRequest.setUri(this.uri);
-        authRequest.setMethod(jsOMS.EnumRequestMethod.POST);
-        authRequest.setResponseType(jsOMS.EnumRequestType.JSON);
+        authRequest.setMethod(jsOMS.Message.Request.RequestMethod.POST);
+        authRequest.setResponseType(jsOMS.Message.Request.RequestType.JSON);
         authRequest.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
         authRequest.setSuccess(function (xhr) {
             this.loginResult(xhr);
@@ -1030,7 +1030,7 @@ with ({p: MathProcessor.prototype}) {
     };
 }(window.jsOMS = window.jsOMS || {}));
 (function (jsOMS, undefined) {
-    jsOMS.EnumRequestMethod = Object.freeze({
+    jsOMS.Message.Request.RequestMethod = Object.freeze({
         POST: 'POST',
         GET: 'GET',
         PUT: 'PUT',
@@ -1070,7 +1070,7 @@ with ({p: MathProcessor.prototype}) {
     }
 }(window.jsOMS = window.jsOMS || {}));
 (function (jsOMS, undefined) {
-    jsOMS.EnumResponseResultType = Object.freeze({
+    jsOMS.Message.Response.ResponseResultType = Object.freeze({
         MULTI: 0,
         MESSAGE: 1,
         INFO: 2,
@@ -1079,7 +1079,7 @@ with ({p: MathProcessor.prototype}) {
     });
 }(window.jsOMS = window.jsOMS || {}));
 (function (jsOMS, undefined) {
-    jsOMS.EnumRequestType = Object.freeze({
+    jsOMS.Message.Request.RequestType = Object.freeze({
         TEXT: 'text',
         JSON: 'json',
         DOCUMENT: 'document',