diff --git a/app.js b/app.js
index 95b8e9c..444990f 100644
--- a/app.js
+++ b/app.js
@@ -15,7 +15,7 @@ define(function(require) {
 	};
 
 	// Autoload submodules
-	// (Submodules should be described in /apps/storagemgmt/storages.js)
+	// (Submodules should be described in /apps/storage/storages.js)
 	var storagesList = storagesConfig.storages;
 	var storagesPaths = [];
 	for (var i = 0, len = storagesList.length; i < len; i++) {
@@ -24,12 +24,12 @@ define(function(require) {
 	require(storagesPaths);
 
 	var storageManager = {
-		name: 'storagemgmt',
+		name: 'storage',
 		css: [ 'app' ],
 		requests: {},
 
 		subscribe: {
-			'storagemgmt.fetchStorages': 'define_storage_nodes' // For all submodules
+			'storage.fetchStorages': 'define_storage_nodes' // For all submodules
 		},
 
 		subModules: storagesList,
@@ -60,7 +60,7 @@ define(function(require) {
 		render: function(container) {
 			var self = this;
 
-			monster.pub('storagemgmt.fetchStorages', {
+			monster.pub('storage.fetchStorages', {
 				storages: self.storages,
 				callback: function (args) {
 					self.extendI18nOfSubmodule(args);
@@ -79,7 +79,7 @@ define(function(require) {
 				]
 			});
 
-			$(document.body).addClass('storagemgmt-app'); // class for styles;
+			$(document.body).addClass('storage-app'); // class for styles;
 		},
 
 		extendI18nOfSubmodule: function (args) {
@@ -90,7 +90,7 @@ define(function(require) {
 
 				if (submoduleLanguages.length && submoduleLanguages.length > 0) {
 					if(submoduleLanguages.indexOf(curLanguage) > -1) {
-						$.getJSON('/apps/storagemgmt/submodules/' + args.submoduleName + '/i18n/' + curLanguage  + '.json').done(function (newDict) {
+						$.getJSON('/apps/storage/submodules/' + args.submoduleName + '/i18n/' + curLanguage  + '.json').done(function (newDict) {
 							var dict = self.data.i18n[curLanguage];
 							$.extend(true, dict, newDict);
 						})
@@ -163,7 +163,7 @@ define(function(require) {
 					}
 				},
 				error: function(error) {
-					var errorMessage = self.i18n.active().storagemgmt.universalErrorMessageTemplate.replace('%api%', 'Storage');
+					var errorMessage = self.i18n.active().storage.universalErrorMessageTemplate.replace('%api%', 'Storage');
 					monster.ui.alert(errorMessage);
 					log(error.status + ' - ' + error.error + ': ' + error.message + ' ');
 				}
@@ -321,17 +321,17 @@ define(function(require) {
 			template.on('click', '.js-remove-storage', function(e) {
 				e.preventDefault();
 				var uuid = $(this).closest('.js-storage-item').data('uuid');
-				monster.ui.confirm(self.i18n.active().storagemgmt.confirmDeleteText, function() {
+				monster.ui.confirm(self.i18n.active().storage.confirmDeleteText, function() {
 					self.storageManagerDeleteStorage(uuid, function() {
 						$('.js-storage-item[data-uuid="' + uuid + '"]').slideUp(400, function() {
 							$(this).remove();
 						});
-						self.storageManagerShowMessage(self.i18n.active().storagemgmt.successRemovingMessage);
+						self.storageManagerShowMessage(self.i18n.active().storage.successRemovingMessage);
 					});
 				}, undefined, {
 					type: 'warning',
-					title: self.i18n.active().storagemgmt.confirmDeleteTitle,
-					confirmButtonText: self.i18n.active().storagemgmt.confirmDelete
+					title: self.i18n.active().storage.confirmDeleteTitle,
+					confirmButtonText: self.i18n.active().storage.confirmDelete
 				});
 			});
 
@@ -356,7 +356,7 @@ define(function(require) {
 				var isAlreadyActive = $(this).closest('.js-storage-item').hasClass('active-storage');
 
 				if(isAlreadyActive) {
-					self.storageManagerShowMessage(self.i18n.active().storagemgmt.alreadyActiveMessage, 'warning')
+					self.storageManagerShowMessage(self.i18n.active().storage.alreadyActiveMessage, 'warning')
 				} else {
 					self.storageManagerSetDefaultStorage(uuid);
 				}
@@ -414,7 +414,7 @@ define(function(require) {
 				self.storageManagerPatchStorage(storageData, function(){
 					var renderArgs = {
 						callback: function () {
-							self.storageManagerShowMessage(self.i18n.active().storagemgmt.successSavingMessage, 'success');
+							self.storageManagerShowMessage(self.i18n.active().storage.successSavingMessage, 'success');
 						}
 					};
 
@@ -528,7 +528,7 @@ define(function(require) {
 					self.storageManagerPatchStorage(storageData, function(data) {
 						// update item name
 						$('.js-storage-item[data-uuid="' + uuid + '"]').find('.js-storage-name').text(storageName);
-						self.storageManagerShowMessage(self.i18n.active().storagemgmt.successUpdate, 'success');
+						self.storageManagerShowMessage(self.i18n.active().storage.successUpdate, 'success');
 					});
 				});
 
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 5701b8c..f94ea28 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -1,5 +1,5 @@
 {
-	"storagemgmt": {
+	"storage": {
 		"title": "Storage Engine Management",
 		"description": "The Storage Engine Management app allows you manage your storage",
 		"universalErrorMessageTemplate": "Please contact your system administrator to configure %api% API, required for this application to work",
diff --git a/style/app.css b/style/app.css
index 2ed82e9..e8ed3e3 100644
--- a/style/app.css
+++ b/style/app.css
@@ -1,20 +1,20 @@
-.storagemgmt-app .storages-settings {
+.storage-app .storages-settings {
   display: block;
   background: white;
   padding: 13px 23px 2px;
   margin-bottom: 24px;
   border-radius: 8px;
   position: relative; }
-  .storagemgmt-app .storages-settings .close-btn {
+  .storage-app .storages-settings .close-btn {
     width: 31px;
     display: inline-block;
     text-align: center;
     position: absolute;
     top: 10px;
     right: 10px; }
-  .storagemgmt-app .storages-settings .close-btn i.fa {
+  .storage-app .storages-settings .close-btn i.fa {
     font-size: 20px; }
-  .storagemgmt-app .storages-settings .close-btn:hover i.fa {
+  .storage-app .storages-settings .close-btn:hover i.fa {
     color: #22A5FF; }
 
 .storage-manager-wrapper {
diff --git a/style/app.scss b/style/app.scss
index b002de5..6866b1e 100644
--- a/style/app.scss
+++ b/style/app.scss
@@ -1,4 +1,4 @@
-.storagemgmt-app {
+.storage-app {
 	.storages-settings {
 		display: block;
 		background: white;
diff --git a/submodules/mts/i18n/en-US.json b/submodules/mts/i18n/en-US.json
index 658c9a4..6f31f71 100644
--- a/submodules/mts/i18n/en-US.json
+++ b/submodules/mts/i18n/en-US.json
@@ -1,5 +1,5 @@
 {
-	"storagemgmt": {
+	"storage": {
 		"submodules": {
 			"mts": {
 				"nameLabel": "Name",
diff --git a/submodules/mts/mts.js b/submodules/mts/mts.js
index 2c99be7..f721416 100644
--- a/submodules/mts/mts.js
+++ b/submodules/mts/mts.js
@@ -10,7 +10,7 @@ define(function(require){
 		requests: {},
 
 		subscribe: {
-			'storagemgmt.fetchStorages': 'defineStorageMTS'
+			'storage.fetchStorages': 'defineStorageMTS'
 		},
 
 		defineStorageMTS: function(args) {
diff --git a/submodules/mts/views/formElements.html b/submodules/mts/views/formElements.html
index ccdabd1..08220f2 100644
--- a/submodules/mts/views/formElements.html
+++ b/submodules/mts/views/formElements.html
@@ -1,25 +1,25 @@
 <input type="hidden" name="handler" value="s3"/>
 <input type="hidden" name="settings.host" value="s3.cloud.mts.ru"/>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.nameLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.nameLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{name}}" name="name">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.bucketLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.bucketLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.bucket}}" name="settings.bucket">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.keyLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.keyLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.key}}" name="settings.key">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.secretLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.secretLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.secret}}" name="settings.secret">
 	</div>
diff --git a/submodules/mts/views/logo.html b/submodules/mts/views/logo.html
index 3e196af..adb5c43 100644
--- a/submodules/mts/views/logo.html
+++ b/submodules/mts/views/logo.html
@@ -1 +1 @@
-<img src="/apps/storagemgmt/submodules/mts/img/logo.png" alt="mts" />
+<img src="/apps/storage/submodules/mts/img/logo.png" alt="mts" />
diff --git a/submodules/s3/i18n/en-US.json b/submodules/s3/i18n/en-US.json
index 0c0bad4..4f10457 100644
--- a/submodules/s3/i18n/en-US.json
+++ b/submodules/s3/i18n/en-US.json
@@ -1,5 +1,5 @@
 {
-	"storagemgmt": {
+	"storage": {
 		"submodules": {
 			"s3": {
 				"nameLabel": "Name",
diff --git a/submodules/s3/s3.js b/submodules/s3/s3.js
index ee15e6d..76e62a4 100644
--- a/submodules/s3/s3.js
+++ b/submodules/s3/s3.js
@@ -10,7 +10,7 @@ define(function(require){
 		requests: {},
 
 		subscribe: {
-			'storagemgmt.fetchStorages': 'defineStorageS3'
+			'storage.fetchStorages': 'defineStorageS3'
 		},
 
 		defineStorageS3: function(args) {
diff --git a/submodules/s3/views/formElements.html b/submodules/s3/views/formElements.html
index b56aef8..e9d71e8 100644
--- a/submodules/s3/views/formElements.html
+++ b/submodules/s3/views/formElements.html
@@ -1,24 +1,24 @@
 <input type="hidden" name="handler" value="s3"/>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.nameLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.nameLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{name}}" name="name">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.bucketLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.bucketLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.bucket}}" name="settings.bucket">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.keyLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.keyLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.key}}" name="settings.key">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.secretLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.s3.secretLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.secret}}" name="settings.secret">
 	</div>
diff --git a/submodules/s3/views/logo.html b/submodules/s3/views/logo.html
index e3dc5f7..3c074d1 100644
--- a/submodules/s3/views/logo.html
+++ b/submodules/s3/views/logo.html
@@ -1 +1 @@
-<img src="/apps/storagemgmt/submodules/s3/img/logo.png" alt="s3" />
+<img src="/apps/storage/submodules/s3/img/logo.png" alt="s3" />
diff --git a/views/field-path.html b/views/field-path.html
index 08becf5..89aad6f 100644
--- a/views/field-path.html
+++ b/views/field-path.html
@@ -1,5 +1,5 @@
 <div class="path-wrapper">
-	<input class="input-small" type="text" id="path" placeholder="{{ i18n.storagemgmt.pathPlaceholder }}" value="{{path}}">
+	<input class="input-small" type="text" id="path" placeholder="{{ i18n.storage.pathPlaceholder }}" value="{{path}}">
 	<button class="save-path monster-button-fit monster-button-success">{{ i18n.save }}</button>
 	<a href="javascript:void(0);" class="monster-link cancel-link">{{ i18n.cancel }}</a>
 </div>
diff --git a/views/item-settings.html b/views/item-settings.html
index feccf10..c425840 100644
--- a/views/item-settings.html
+++ b/views/item-settings.html
@@ -5,10 +5,10 @@
 				{{{ formElements }}}
 				<div class="buttons-wrapper clearfix">
 					<button type="submit" class="btn btn-primary js-save" >
-						{{ @root.i18n.storagemgmt.itemSettings.saveBtnText }}
+						{{ @root.i18n.storage.itemSettings.saveBtnText }}
 					</button>
 					<button type="button" class="btn js-cancel">
-						{{ @root.i18n.storagemgmt.itemSettings.cancelBtnText }}
+						{{ @root.i18n.storage.itemSettings.cancelBtnText }}
 					</button>
 				</div>
 			</form>
diff --git a/views/layout.html b/views/layout.html
index 9043438..7c0f200 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -1,5 +1,5 @@
 <div id="storage_manager_wrapper" class="storage-manager-wrapper">
-	<h3>{{ @root.i18n.storagemgmt.settingsTitle }}</h3>
+	<h3>{{ @root.i18n.storage.settingsTitle }}</h3>
 	<div class="js-storage-items storage-items-list">
 		{{#compare storages.length ">" 0}}
 			{{#each storages}}
@@ -26,7 +26,7 @@
 	<div class="buttons-wrapper">
 		<a href="" class="js-create-storage btn">
 			<i class="fa fa-plus"></i>
-			{{ @root.i18n.storagemgmt.newStorageBtnText }}
+			{{ @root.i18n.storage.newStorageBtnText }}
 		</a>
 	</div>
 </div>
diff --git a/views/new-item.html b/views/new-item.html
index 06e65e2..b086b9d 100644
--- a/views/new-item.html
+++ b/views/new-item.html
@@ -18,17 +18,17 @@
 							<form class="form-horizontal js-storage-settings-form">
 								{{{ formElements }}}
 								<label class="control-group">
-									<span class="control-label">{{ @root.i18n.storagemgmt.itemSettings.setDefaultLabel }}</span>
+									<span class="control-label">{{ @root.i18n.storage.itemSettings.setDefaultLabel }}</span>
 									<div class="controls">
 										<input type="checkbox" checked="checked" value="" name="set_default" />
 									</div>
 								</label>
 								<div class="buttons-wrapper clearfix">
 									<button type="submit" class="btn btn-primary js-save" >
-										{{ @root.i18n.storagemgmt.newItem.saveNewItemText }}
+										{{ @root.i18n.storage.newItem.saveNewItemText }}
 									</button>
 									<button type="button" class="btn js-cancel">
-										{{ @root.i18n.storagemgmt.newItem.cancelBtnText }}
+										{{ @root.i18n.storage.newItem.cancelBtnText }}
 									</button>
 								</div>
 							</form>