diff --git a/lib/core-services/user_manager.js b/lib/core-services/user_manager.js
index ba616c75..4b4f52fa 100644
--- a/lib/core-services/user_manager.js
+++ b/lib/core-services/user_manager.js
@@ -1,99 +1,99 @@
 var Sealious = require("../main.js");
 var Promise = require("bluebird");
 
 module.exports = new function(){
 	this.name = "users";
 
 	this.create_user = function(context, username, password){
 		var user_data;
 		return Sealious.Dispatcher.users.user_exists(context, username)
 			.then(function(user_exists){
 				if (!user_exists) {
 					Sealious.Logger.info("User " + username + " has been created");
-					return Sealious.Dispatcher.resources.create(context, "user", {
+					return Sealious.ResourceManager.create(context, "user", {
 						username: username,
 						password: password
 					});
 				} else {
 					throw new Sealious.Errors.ValueExists("Username `" + username + "` is already taken.");
 				}
 			})
 	}
 
 	this.user_exists = function(context, username){
 		return new Promise(function(resolve, reject){
-			Sealious.Dispatcher.resources.find({
+			Sealious.ResourceManager.find({
 					username: username
 				}, "user")
 				.then(function(matched_documents){
 					resolve(matched_documents.length === 1);
 				});
 		})
 	}
 
 	this.password_match = function(context, username, password){
 		return new Promise(function(resolve, reject){
 			var err;
 			if (!username && !password) {
 				err = new Sealious.Errors.InvalidCredentials("Missing username and password!");
 				reject(err);
 			} else if (!password) {
 				err = new Sealious.Errors.InvalidCredentials("Missing password!");
 				reject(err);
 			} else if (!username) {
 				err = new Sealious.Errors.InvalidCredentials("Missing username!");
 				reject(err);
 			} else {
 				var query = {
 					type: "user",
 					body: {
 						username: username,
 						password: password
 					}
 				};
-				Sealious.Dispatcher.datastore.find("resources", query)
+				Sealious.Datastore.find("resources", query)
 					.then(function(result){
 						if (result[0]) {
 							resolve(result[0].sealious_id);
 						} else {
 							var err = new Sealious.Errors.InvalidCredentials("Wrong username or password!");
 							reject(err);
 						}
 					})
 			}
 		})
 	}
 
 	this.get_all_users = function(context){
-		return Sealious.Dispatcher.datastore.find("resources", {
+		return Sealious.Datastore.find("resources", {
 			type: "user"
 		});
 	}
 
 	this.get_user_data = function(context, user_resource_id){
 		var ret;
 		try {
-			ret = Sealious.Dispatcher.resources.get_by_id(context, user_resource_id);
+			ret = Sealious.ResourceManager.get_by_id(context, user_resource_id);
 		} catch (err) {
 			throw err;
 		}
 		return ret;
 	}
 
 	this.update_user_data = function(context, user_id, new_user_data){
-		return Sealious.Dispatcher.resources.update_resource(user_id, new_user_data);
+		return Sealious.ResourceManager.update_resource(user_id, new_user_data);
 	}
 
 	this.delete_user = function(context, user_id){
 		return new Promise(function(resolve, reject){
-			Sealious.Dispatcher.datastore.delete("resources", {
+			Sealious.Datastore.delete("resources", {
 					sealious_id: user_id
 				})
 				.then(function(data){
 					resolve(data);
 				}).catch(function(e){
 					reject(e);
 				});
 		});
 	}
 }
\ No newline at end of file