diff --git a/packages/chatpal-search/server/provider/index.js b/packages/chatpal-search/server/provider/index.js
index fcccc7d96cd..0f0f2545864 100644
--- a/packages/chatpal-search/server/provider/index.js
+++ b/packages/chatpal-search/server/provider/index.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import ChatpalLogger from '../utils/logger';
 import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms, Messages } from 'meteor/rocketchat:models';
 
 /**
  * Enables HTTP functions on Chatpal Backend
@@ -280,11 +280,11 @@ export default class Index {
 	 * @private
 	 */
 	_existsDataOlderThan(date) {
-		return RocketChat.models.Messages.model.find({ ts:{ $lt: new Date(date) }, t:{ $exists:false } }, { limit:1 }).fetch().length > 0;
+		return Messages.model.find({ ts:{ $lt: new Date(date) }, t:{ $exists:false } }, { limit:1 }).fetch().length > 0;
 	}
 
 	_doesRoomCountDiffer() {
-		return RocketChat.models.Rooms.find({ t:{ $ne:'d' } }).count() !== this._backend.count('room');
+		return Rooms.find({ t:{ $ne:'d' } }).count() !== this._backend.count('room');
 	}
 
 	_doesUserCountDiffer() {
@@ -311,7 +311,7 @@ export default class Index {
 	 * @private
 	 */
 	_indexRooms() {
-		const cursor = RocketChat.models.Rooms.find({ t:{ $ne:'d' } });
+		const cursor = Rooms.find({ t:{ $ne:'d' } });
 
 		ChatpalLogger.debug(`Start indexing ${ cursor.count() } rooms`);
 
@@ -327,7 +327,7 @@ export default class Index {
 		const start = new Date(date - gap);
 		const end = new Date(date);
 
-		const cursor = RocketChat.models.Messages.model.find({ ts:{ $gt: start, $lt: end }, t:{ $exists:false } });
+		const cursor = Messages.model.find({ ts:{ $gt: start, $lt: end }, t:{ $exists:false } });
 
 		ChatpalLogger.debug(`Start indexing ${ cursor.count() } messages between ${ start.toString() } and ${ end.toString() }`);
 
diff --git a/packages/rocketchat-irc/package.js b/packages/rocketchat-irc/package.js
index 13dc5a9f73b..b586cd98c8b 100644
--- a/packages/rocketchat-irc/package.js
+++ b/packages/rocketchat-irc/package.js
@@ -11,7 +11,9 @@ Package.onUse(function(api) {
 		'underscore',
 		'rocketchat:utils',
 		'rocketchat:lib',
-		'rocketchat:ui',
+		'rocketchat:callbacks',
+		'rocketchat:settings',
+		'rocketchat:models',
 	]);
 	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-irc/server/irc-bridge/index.js b/packages/rocketchat-irc/server/irc-bridge/index.js
index e40d21006c3..235d40183e5 100644
--- a/packages/rocketchat-irc/server/irc-bridge/index.js
+++ b/packages/rocketchat-irc/server/irc-bridge/index.js
@@ -1,4 +1,4 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { callbacks } from 'meteor/rocketchat:callbacks';
 import Queue from 'queue-fifo';
 import * as servers from '../servers';
 import * as peerCommandHandlers from './peerHandlers';
@@ -117,18 +117,18 @@ class Bridge {
 	 */
 	setupLocalHandlers() {
 		// Auth
-		RocketChat.callbacks.add('afterValidateLogin', this.onMessageReceived.bind(this, 'local', 'onLogin'), RocketChat.callbacks.priority.LOW, 'irc-on-login');
-		RocketChat.callbacks.add('afterCreateUser', this.onMessageReceived.bind(this, 'local', 'onCreateUser'), RocketChat.callbacks.priority.LOW, 'irc-on-create-user');
+		callbacks.add('afterValidateLogin', this.onMessageReceived.bind(this, 'local', 'onLogin'), callbacks.priority.LOW, 'irc-on-login');
+		callbacks.add('afterCreateUser', this.onMessageReceived.bind(this, 'local', 'onCreateUser'), callbacks.priority.LOW, 'irc-on-create-user');
 		// Joining rooms or channels
-		RocketChat.callbacks.add('afterCreateChannel', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-create-channel');
-		RocketChat.callbacks.add('afterCreateRoom', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-create-room');
-		RocketChat.callbacks.add('afterJoinRoom', this.onMessageReceived.bind(this, 'local', 'onJoinRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-join-room');
+		callbacks.add('afterCreateChannel', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), callbacks.priority.LOW, 'irc-on-create-channel');
+		callbacks.add('afterCreateRoom', this.onMessageReceived.bind(this, 'local', 'onCreateRoom'), callbacks.priority.LOW, 'irc-on-create-room');
+		callbacks.add('afterJoinRoom', this.onMessageReceived.bind(this, 'local', 'onJoinRoom'), callbacks.priority.LOW, 'irc-on-join-room');
 		// Leaving rooms or channels
-		RocketChat.callbacks.add('afterLeaveRoom', this.onMessageReceived.bind(this, 'local', 'onLeaveRoom'), RocketChat.callbacks.priority.LOW, 'irc-on-leave-room');
+		callbacks.add('afterLeaveRoom', this.onMessageReceived.bind(this, 'local', 'onLeaveRoom'), callbacks.priority.LOW, 'irc-on-leave-room');
 		// Chatting
-		RocketChat.callbacks.add('afterSaveMessage', this.onMessageReceived.bind(this, 'local', 'onSaveMessage'), RocketChat.callbacks.priority.LOW, 'irc-on-save-message');
+		callbacks.add('afterSaveMessage', this.onMessageReceived.bind(this, 'local', 'onSaveMessage'), callbacks.priority.LOW, 'irc-on-save-message');
 		// Leaving
-		RocketChat.callbacks.add('afterLogoutCleanUp', this.onMessageReceived.bind(this, 'local', 'onLogout'), RocketChat.callbacks.priority.LOW, 'irc-on-logout');
+		callbacks.add('afterLogoutCleanUp', this.onMessageReceived.bind(this, 'local', 'onLogout'), callbacks.priority.LOW, 'irc-on-logout');
 	}
 
 	sendCommand(command, parameters) {
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
index efdb0068f47..31e2ed81eaf 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
@@ -1,7 +1,7 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 
 export default function handleOnCreateRoom(user, room) {
-	const users = RocketChat.models.Users.findByRoomId(room._id);
+	const users = Users.findByRoomId(room._id);
 
 	users.forEach((user) => {
 		if (user.profile.irc.fromIRC) {
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
index c55a7d1bc69..de47b1a7ed9 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 
 export default function handleOnCreateUser(newUser) {
 	if (!newUser) {
@@ -23,13 +23,13 @@ export default function handleOnCreateUser(newUser) {
 		},
 	});
 
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		_id: newUser._id,
 	});
 
 	this.sendCommand('registerUser', user);
 
-	const rooms = RocketChat.models.Rooms.findBySubscriptionUserId(user._id).fetch();
+	const rooms = Rooms.findBySubscriptionUserId(user._id).fetch();
 
 	rooms.forEach((room) => this.sendCommand('joinedChannel', { room, user }));
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
index 312b7a75f3c..69b70f79444 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 
 export default function handleOnLogin(login) {
 	if (login.user === null) {
@@ -23,13 +23,13 @@ export default function handleOnLogin(login) {
 		},
 	});
 
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		_id: login.user._id,
 	});
 
 	this.sendCommand('registerUser', user);
 
-	const rooms = RocketChat.models.Rooms.findBySubscriptionUserId(user._id).fetch();
+	const rooms = Rooms.findBySubscriptionUserId(user._id).fetch();
 
 	rooms.forEach((room) => this.sendCommand('joinedChannel', { room, user }));
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
index 9252d290beb..25ec81f5abd 100644
--- a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
+++ b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
@@ -1,13 +1,13 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Subscriptions, Users } from 'meteor/rocketchat:models';
 
 export default function handleOnSaveMessage(message, to) {
 	let toIdentification = '';
 	// Direct message
 	if (to.t === 'd') {
-		const subscriptions = RocketChat.models.Subscriptions.findByRoomId(to._id);
+		const subscriptions = Subscriptions.findByRoomId(to._id);
 		subscriptions.forEach((subscription) => {
 			if (subscription.u.username !== to.username) {
-				const userData = RocketChat.models.Users.findOne({ username: subscription.u.username });
+				const userData = Users.findOne({ username: subscription.u.username });
 				if (userData) {
 					if (userData.profile && userData.profile.irc && userData.profile.irc.nick) {
 						toIdentification = userData.profile.irc.nick;
@@ -28,7 +28,7 @@ export default function handleOnSaveMessage(message, to) {
 		toIdentification = `#${ to.name }`;
 	}
 
-	const user = RocketChat.models.Users.findOne({ _id: message.u._id });
+	const user = Users.findOne({ _id: message.u._id });
 
 	this.sendCommand('sentMessage', { to: toIdentification, user, message: message.msg });
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
index fefc7b37073..760b0ce3fcd 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
 
 export default function handleQUIT(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -12,5 +12,5 @@ export default function handleQUIT(args) {
 		},
 	});
 
-	RocketChat.models.Rooms.removeUsernameFromAll(user.username);
+	Rooms.removeUsernameFromAll(user.username);
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
index 517f06463d9..4d12fe9b6f9 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
@@ -1,7 +1,8 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
+import { createRoom, addUserToRoom } from 'meteor/rocketchat:lib';
 
 export default function handleJoinedChannel(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -9,15 +10,15 @@ export default function handleJoinedChannel(args) {
 		throw new Error(`Could not find a user with nick ${ args.nick }`);
 	}
 
-	let room = RocketChat.models.Rooms.findOneByName(args.roomName);
+	let room = Rooms.findOneByName(args.roomName);
 
 	if (!room) {
-		const createdRoom = RocketChat.createRoom('c', args.roomName, user.username, []);
-		room = RocketChat.models.Rooms.findOne({ _id: createdRoom.rid });
+		const createdRoom = createRoom('c', args.roomName, user.username, []);
+		room = Rooms.findOne({ _id: createdRoom.rid });
 
 		this.log(`${ user.username } created room ${ args.roomName }`);
 	} else {
-		RocketChat.addUserToRoom(room._id, user);
+		addUserToRoom(room._id, user);
 
 		this.log(`${ user.username } joined room ${ room.name }`);
 	}
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
index 0fac5da4a86..ce1e47c928b 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
@@ -1,7 +1,8 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms } from 'meteor/rocketchat:models';
+import { removeUserFromRoom } from 'meteor/rocketchat:lib';
 
 export default function handleLeftChannel(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -9,12 +10,12 @@ export default function handleLeftChannel(args) {
 		throw new Error(`Could not find a user with nick ${ args.nick }`);
 	}
 
-	const room = RocketChat.models.Rooms.findOneByName(args.roomName);
+	const room = Rooms.findOneByName(args.roomName);
 
 	if (!room) {
 		throw new Error(`Could not find a room with name ${ args.roomName }`);
 	}
 
 	this.log(`${ user.username } left room ${ room.name }`);
-	RocketChat.removeUserFromRoom(room._id, user);
+	removeUserFromRoom(room._id, user);
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
index 79ab997e7d4..02b3aeb71d4 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
@@ -1,7 +1,7 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 
 export default function handleNickChanged(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -12,7 +12,7 @@ export default function handleNickChanged(args) {
 	this.log(`${ user.username } changed nick: ${ args.nick } -> ${ args.newNick }`);
 
 	// Update on the database
-	RocketChat.models.Users.update({ _id: user._id }, {
+	Users.update({ _id: user._id }, {
 		$set: {
 			name: args.newNick,
 			'profile.irc.nick': args.newNick,
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
index 4433115dfbf..209e5e647d4 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
@@ -1,4 +1,5 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users, Rooms, Subscriptions } from 'meteor/rocketchat:models';
+import { sendMessage } from 'meteor/rocketchat:lib';
 /*
  *
  * Get direct chat room helper
@@ -8,7 +9,7 @@ import { RocketChat } from 'meteor/rocketchat:lib';
 const getDirectRoom = (source, target) => {
 	const rid = [source._id, target._id].sort().join('');
 
-	RocketChat.models.Rooms.upsert({ _id: rid }, {
+	Rooms.upsert({ _id: rid }, {
 		$setOnInsert: {
 			t: 'd',
 			msgs: 0,
@@ -16,7 +17,7 @@ const getDirectRoom = (source, target) => {
 		},
 	});
 
-	RocketChat.models.Subscriptions.upsert({ rid, 'u._id': target._id }, {
+	Subscriptions.upsert({ rid, 'u._id': target._id }, {
 		$setOnInsert: {
 			name: source.username,
 			t: 'd',
@@ -30,7 +31,7 @@ const getDirectRoom = (source, target) => {
 		},
 	});
 
-	RocketChat.models.Subscriptions.upsert({ rid, 'u._id': source._id }, {
+	Subscriptions.upsert({ rid, 'u._id': source._id }, {
 		$setOnInsert: {
 			name: target.username,
 			t: 'd',
@@ -51,7 +52,7 @@ const getDirectRoom = (source, target) => {
 };
 
 export default function handleSentMessage(args) {
-	const user = RocketChat.models.Users.findOne({
+	const user = Users.findOne({
 		'profile.irc.nick': args.nick,
 	});
 
@@ -62,9 +63,9 @@ export default function handleSentMessage(args) {
 	let room;
 
 	if (args.roomName) {
-		room = RocketChat.models.Rooms.findOneByName(args.roomName);
+		room = Rooms.findOneByName(args.roomName);
 	} else {
-		const recipientUser = RocketChat.models.Users.findOne({
+		const recipientUser = Users.findOne({
 			'profile.irc.nick': args.recipientNick,
 		});
 
@@ -76,5 +77,5 @@ export default function handleSentMessage(args) {
 		ts: new Date(),
 	};
 
-	RocketChat.sendMessage(user, message, room);
+	sendMessage(user, message, room);
 }
diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
index 540cd7cd1f2..83bad3a16dc 100644
--- a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
+++ b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Users } from 'meteor/rocketchat:models';
 
 export default async function handleUserRegistered(args) {
 	// Check if there is an user with the given username
-	let user = RocketChat.models.Users.findOne({
+	let user = Users.findOne({
 		'profile.irc.username': args.username,
 	});
 
@@ -28,7 +28,7 @@ export default async function handleUserRegistered(args) {
 			},
 		};
 
-		user = RocketChat.models.Users.create(userToInsert);
+		user = Users.create(userToInsert);
 	} else {
 		// ...otherwise, log the user in and update the information
 		this.log(`Logging in ${ args.username } with nick: ${ args.nick }`);
diff --git a/packages/rocketchat-irc/server/irc-settings.js b/packages/rocketchat-irc/server/irc-settings.js
index b434856f46e..8f6c692d9fd 100644
--- a/packages/rocketchat-irc/server/irc-settings.js
+++ b/packages/rocketchat-irc/server/irc-settings.js
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.startup(function() {
-	RocketChat.settings.addGroup('IRC_Federation', function() {
+	settings.addGroup('IRC_Federation', function() {
 		this.add('IRC_Enabled', false, {
 			type: 'boolean',
 			i18nLabel: 'Enabled',
diff --git a/packages/rocketchat-irc/server/irc.js b/packages/rocketchat-irc/server/irc.js
index bf99e07c13d..a5ce60e61c2 100644
--- a/packages/rocketchat-irc/server/irc.js
+++ b/packages/rocketchat-irc/server/irc.js
@@ -1,20 +1,20 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import Bridge from './irc-bridge';
 
-if (!!RocketChat.settings.get('IRC_Enabled') === true) {
+if (!!settings.get('IRC_Enabled') === true) {
 	// Normalize the config values
 	const config = {
 		server: {
-			protocol: RocketChat.settings.get('IRC_Protocol'),
-			host: RocketChat.settings.get('IRC_Host'),
-			port: RocketChat.settings.get('IRC_Port'),
-			name: RocketChat.settings.get('IRC_Name'),
-			description: RocketChat.settings.get('IRC_Description'),
+			protocol: settings.get('IRC_Protocol'),
+			host: settings.get('IRC_Host'),
+			port: settings.get('IRC_Port'),
+			name: settings.get('IRC_Name'),
+			description: settings.get('IRC_Description'),
 		},
 		passwords: {
-			local: RocketChat.settings.get('IRC_Local_Password'),
-			peer: RocketChat.settings.get('IRC_Peer_Password'),
+			local: settings.get('IRC_Local_Password'),
+			peer: settings.get('IRC_Peer_Password'),
 		},
 	};
 
diff --git a/packages/rocketchat-irc/server/methods/resetIrcConnection.js b/packages/rocketchat-irc/server/methods/resetIrcConnection.js
index 39e85122d94..d2dd477dee7 100644
--- a/packages/rocketchat-irc/server/methods/resetIrcConnection.js
+++ b/packages/rocketchat-irc/server/methods/resetIrcConnection.js
@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { t } from 'meteor/rocketchat:utils';
 import Bridge from '../irc-bridge';
 
 Meteor.methods({
 	resetIrcConnection() {
-		const ircEnabled = (!!RocketChat.settings.get('IRC_Enabled')) === true;
+		const ircEnabled = (!!settings.get('IRC_Enabled')) === true;
 
 		if (Meteor.ircBridge) {
 			Meteor.ircBridge.stop();
@@ -29,15 +29,15 @@ Meteor.methods({
 			// Normalize the config values
 			const config = {
 				server: {
-					protocol: RocketChat.settings.get('IRC_Protocol'),
-					host: RocketChat.settings.get('IRC_Host'),
-					port: RocketChat.settings.get('IRC_Port'),
-					name: RocketChat.settings.get('IRC_Name'),
-					description: RocketChat.settings.get('IRC_Description'),
+					protocol: settings.get('IRC_Protocol'),
+					host: settings.get('IRC_Host'),
+					port: settings.get('IRC_Port'),
+					name: settings.get('IRC_Name'),
+					description: settings.get('IRC_Description'),
 				},
 				passwords: {
-					local: RocketChat.settings.get('IRC_Local_Password'),
-					peer: RocketChat.settings.get('IRC_Peer_Password'),
+					local: settings.get('IRC_Local_Password'),
+					peer: settings.get('IRC_Peer_Password'),
 				},
 			};
 
diff --git a/packages/rocketchat-wordpress/lib/common.js b/packages/rocketchat-wordpress/lib/common.js
index d2c4dd52c65..1d09b2d0f73 100644
--- a/packages/rocketchat-wordpress/lib/common.js
+++ b/packages/rocketchat-wordpress/lib/common.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 import { CustomOAuth } from 'meteor/rocketchat:custom-oauth';
 import _ from 'underscore';
@@ -18,7 +18,7 @@ const config = {
 const WordPress = new CustomOAuth('wordpress', config);
 
 const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
-	config.serverURL = RocketChat.settings.get('API_Wordpress_URL');
+	config.serverURL = settings.get('API_Wordpress_URL');
 	if (!config.serverURL) {
 		if (config.serverURL === undefined) {
 			return fillSettings();
@@ -32,27 +32,27 @@ const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 	delete config.tokenPath;
 	delete config.scope;
 
-	const serverType = RocketChat.settings.get('Accounts_OAuth_Wordpress_server_type');
+	const serverType = settings.get('Accounts_OAuth_Wordpress_server_type');
 	switch (serverType) {
 		case 'custom':
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_path')) {
-				config.identityPath = RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_path');
+			if (settings.get('Accounts_OAuth_Wordpress_identity_path')) {
+				config.identityPath = settings.get('Accounts_OAuth_Wordpress_identity_path');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via')) {
-				config.identityTokenSentVia = RocketChat.settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via');
+			if (settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via')) {
+				config.identityTokenSentVia = settings.get('Accounts_OAuth_Wordpress_identity_token_sent_via');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_token_path')) {
-				config.tokenPath = RocketChat.settings.get('Accounts_OAuth_Wordpress_token_path');
+			if (settings.get('Accounts_OAuth_Wordpress_token_path')) {
+				config.tokenPath = settings.get('Accounts_OAuth_Wordpress_token_path');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_authorize_path')) {
-				config.authorizePath = RocketChat.settings.get('Accounts_OAuth_Wordpress_authorize_path');
+			if (settings.get('Accounts_OAuth_Wordpress_authorize_path')) {
+				config.authorizePath = settings.get('Accounts_OAuth_Wordpress_authorize_path');
 			}
 
-			if (RocketChat.settings.get('Accounts_OAuth_Wordpress_scope')) {
-				config.scope = RocketChat.settings.get('Accounts_OAuth_Wordpress_scope');
+			if (settings.get('Accounts_OAuth_Wordpress_scope')) {
+				config.scope = settings.get('Accounts_OAuth_Wordpress_scope');
 			}
 			break;
 		case 'wordpress-com':
@@ -69,7 +69,7 @@ const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 
 	const result = WordPress.configure(config);
 	if (Meteor.isServer) {
-		const enabled = RocketChat.settings.get('Accounts_OAuth_Wordpress');
+		const enabled = settings.get('Accounts_OAuth_Wordpress');
 		if (enabled) {
 			ServiceConfiguration.configurations.upsert({
 				service: 'wordpress',
@@ -88,7 +88,7 @@ const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 
 if (Meteor.isServer) {
 	Meteor.startup(function() {
-		return RocketChat.settings.get(/(API\_Wordpress\_URL)?(Accounts\_OAuth\_Wordpress\_)?/, () => fillSettings());
+		return settings.get(/(API\_Wordpress\_URL)?(Accounts\_OAuth\_Wordpress\_)?/, () => fillSettings());
 	});
 } else {
 	Meteor.startup(function() {
diff --git a/packages/rocketchat-wordpress/package.js b/packages/rocketchat-wordpress/package.js
index 710d0fd7a1d..fff092bbe45 100644
--- a/packages/rocketchat-wordpress/package.js
+++ b/packages/rocketchat-wordpress/package.js
@@ -7,7 +7,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
+		'rocketchat:settings',
 		'rocketchat:custom-oauth',
 		'templating',
 	]);
diff --git a/packages/rocketchat-wordpress/server/startup.js b/packages/rocketchat-wordpress/server/startup.js
index 3dd8d5391bf..b247f850d68 100644
--- a/packages/rocketchat-wordpress/server/startup.js
+++ b/packages/rocketchat-wordpress/server/startup.js
@@ -1,6 +1,6 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
-RocketChat.settings.addGroup('OAuth', function() {
+settings.addGroup('OAuth', function() {
 	return this.section('WordPress', function() {
 
 		const enableQuery = {