diff --git a/.meteor/packages b/.meteor/packages
index 98e3d061be48..2b2740310c74 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -72,7 +72,7 @@ rocketchat:push
 raix:ui-dropped-event
 todda00:friendly-slugs
 
-tap:i18n
+rocketchat:tap-i18n
 underscore@1.0.10
 juliancwirko:postcss
 littledata:synced-cron
diff --git a/.meteor/versions b/.meteor/versions
index babbbf8f8b29..efc1dda7ea31 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -145,7 +145,7 @@ spacebars-compiler@1.1.3
 srp@1.0.12
 standard-minifier-js@2.4.0
 swydo:graphql@0.4.0
-tap:i18n@1.8.2
+rocketchat:tap-i18n@1.9.1
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
diff --git a/app/api/server/v1/misc.js b/app/api/server/v1/misc.js
index d5fee67418fc..8aa8f7b973b5 100644
--- a/app/api/server/v1/misc.js
+++ b/app/api/server/v1/misc.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import s from 'underscore.string';
 
 import { hasRole } from '../../../authorization';
diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 317b6e8a6bf8..602605d9c4d6 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import Busboy from 'busboy';
 
diff --git a/app/apps/client/admin/appLogs.js b/app/apps/client/admin/appLogs.js
index fc6500abfdd1..46e82534c05b 100644
--- a/app/apps/client/admin/appLogs.js
+++ b/app/apps/client/admin/appLogs.js
@@ -1,7 +1,7 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
 import hljs from 'highlight.js';
diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js
index e94565cca3cb..233acd09e4aa 100644
--- a/app/apps/client/admin/appManage.js
+++ b/app/apps/client/admin/appManage.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveDict } from 'meteor/reactive-dict';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n, TAPi18next } from 'meteor/tap:i18n';
+import { TAPi18n, TAPi18next } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 
diff --git a/app/apps/client/i18n.js b/app/apps/client/i18n.js
index 3a33d17f111b..9b9b1a9755e2 100644
--- a/app/apps/client/i18n.js
+++ b/app/apps/client/i18n.js
@@ -1,4 +1,4 @@
-import { TAPi18next } from 'meteor/tap:i18n';
+import { TAPi18next } from 'meteor/rocketchat:tap-i18n';
 
 import { Apps } from './orchestrator';
 import { Utilities } from '../lib/misc/Utilities';
diff --git a/app/apps/server/cron.js b/app/apps/server/cron.js
index bbd40f7c0016..0dbed66a9bd3 100644
--- a/app/apps/server/cron.js
+++ b/app/apps/server/cron.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import { SyncedCron } from 'meteor/littledata:synced-cron';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 
 import { Apps } from './orchestrator';
diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
index 04d010a3394d..cb3e4379ad76 100644
--- a/app/channel-settings/client/views/channelSettings.js
+++ b/app/channel-settings/client/views/channelSettings.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';
diff --git a/app/channel-settings/server/functions/saveRoomType.js b/app/channel-settings/server/functions/saveRoomType.js
index 9bf6cb4503ba..00b181d72812 100644
--- a/app/channel-settings/server/functions/saveRoomType.js
+++ b/app/channel-settings/server/functions/saveRoomType.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Subscriptions, Messages } from '../../../models';
 import { settings } from '../../../settings';
diff --git a/app/chatpal-search/client/template/admin.js b/app/chatpal-search/client/template/admin.js
index bcbf71c873e6..625d8c4b2e0f 100644
--- a/app/chatpal-search/client/template/admin.js
+++ b/app/chatpal-search/client/template/admin.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { settings } from '../../../settings';
diff --git a/app/chatpal-search/client/template/result.js b/app/chatpal-search/client/template/result.js
index 08c3512905d5..2ef230fccc8a 100644
--- a/app/chatpal-search/client/template/result.js
+++ b/app/chatpal-search/client/template/result.js
@@ -1,7 +1,7 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { DateFormat } from '../../../lib';
 import { roomTypes, getURL } from '../../../utils';
diff --git a/app/custom-sounds/client/admin/soundEdit.js b/app/custom-sounds/client/admin/soundEdit.js
index f28aa360b421..c55f2f5a03d3 100644
--- a/app/custom-sounds/client/admin/soundEdit.js
+++ b/app/custom-sounds/client/admin/soundEdit.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import s from 'underscore.string';
 
diff --git a/app/discussion/client/views/creationDialog/CreateDiscussion.js b/app/discussion/client/views/creationDialog/CreateDiscussion.js
index a786507c330f..2ef97369e2b1 100755
--- a/app/discussion/client/views/creationDialog/CreateDiscussion.js
+++ b/app/discussion/client/views/creationDialog/CreateDiscussion.js
@@ -3,7 +3,7 @@ import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { AutoComplete } from 'meteor/mizzao:autocomplete';
 import { Blaze } from 'meteor/blaze';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { roomTypes } from '../../../../utils/client';
diff --git a/app/e2e/client/rocketchat.e2e.js b/app/e2e/client/rocketchat.e2e.js
index 243713b9fa91..536d1b5a495f 100644
--- a/app/e2e/client/rocketchat.e2e.js
+++ b/app/e2e/client/rocketchat.e2e.js
@@ -4,7 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { EJSON } from 'meteor/ejson';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { E2ERoom } from './rocketchat.e2e.room';
 import {
diff --git a/app/emoji-custom/client/admin/emojiEdit.js b/app/emoji-custom/client/admin/emojiEdit.js
index b226ea27c470..09404693aa5e 100644
--- a/app/emoji-custom/client/admin/emojiEdit.js
+++ b/app/emoji-custom/client/admin/emojiEdit.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import s from 'underscore.string';
 
diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
index 9258da3fcd1e..337d1e865b2a 100644
--- a/app/file-upload/server/lib/FileUpload.js
+++ b/app/file-upload/server/lib/FileUpload.js
@@ -8,7 +8,7 @@ import sharp from 'sharp';
 import { Cookies } from 'meteor/ostrio:cookies';
 import { UploadFS } from 'meteor/jalik:ufs';
 import { Match } from 'meteor/check';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import filesize from 'filesize';
 
 import { settings } from '../../../settings/server';
diff --git a/app/google-vision/server/googlevision.js b/app/google-vision/server/googlevision.js
index 35717a623243..33494b398c1a 100644
--- a/app/google-vision/server/googlevision.js
+++ b/app/google-vision/server/googlevision.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../settings';
 import { callbacks } from '../../callbacks';
diff --git a/app/importer/client/admin/adminImport.js b/app/importer/client/admin/adminImport.js
index 834a3ecf66da..f04242721898 100644
--- a/app/importer/client/admin/adminImport.js
+++ b/app/importer/client/admin/adminImport.js
@@ -5,7 +5,7 @@ import { Importers } from '..';
 
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { hasRole } from '../../../authorization';
 import { t, handleError } from '../../../utils';
diff --git a/app/importer/client/admin/adminImportPrepare.js b/app/importer/client/admin/adminImportPrepare.js
index 82cf2be02548..269057c3820b 100644
--- a/app/importer/client/admin/adminImportPrepare.js
+++ b/app/importer/client/admin/adminImportPrepare.js
@@ -6,7 +6,7 @@ import { Importers } from '..';
 
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { hasRole } from '../../../authorization';
diff --git a/app/integrations/client/views/integrations.js b/app/integrations/client/views/integrations.js
index aaf73c2b183e..a1432daaad01 100644
--- a/app/integrations/client/views/integrations.js
+++ b/app/integrations/client/views/integrations.js
@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
 
diff --git a/app/integrations/client/views/integrationsIncoming.js b/app/integrations/client/views/integrationsIncoming.js
index e419033ff408..f1d9a48842c0 100644
--- a/app/integrations/client/views/integrationsIncoming.js
+++ b/app/integrations/client/views/integrationsIncoming.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import hljs from 'highlight.js';
 import toastr from 'toastr';
diff --git a/app/integrations/client/views/integrationsOutgoing.js b/app/integrations/client/views/integrationsOutgoing.js
index ba136d3fbc3f..b41788117c3c 100644
--- a/app/integrations/client/views/integrationsOutgoing.js
+++ b/app/integrations/client/views/integrationsOutgoing.js
@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import hljs from 'highlight.js';
 import toastr from 'toastr';
diff --git a/app/integrations/client/views/integrationsOutgoingHistory.js b/app/integrations/client/views/integrationsOutgoingHistory.js
index 02252347c462..a6b37dcb68f0 100644
--- a/app/integrations/client/views/integrationsOutgoingHistory.js
+++ b/app/integrations/client/views/integrationsOutgoingHistory.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 import hljs from 'highlight.js';
diff --git a/app/lib/client/CustomTranslations.js b/app/lib/client/CustomTranslations.js
index 2530da32269e..6c128512c4dd 100644
--- a/app/lib/client/CustomTranslations.js
+++ b/app/lib/client/CustomTranslations.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 
 import { applyCustomTranslations } from '../../utils';
diff --git a/app/lib/server/functions/cleanRoomHistory.js b/app/lib/server/functions/cleanRoomHistory.js
index 6aacf66444eb..e1aed74cbfa2 100644
--- a/app/lib/server/functions/cleanRoomHistory.js
+++ b/app/lib/server/functions/cleanRoomHistory.js
@@ -1,4 +1,4 @@
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { deleteRoom } from './deleteRoom';
 import { FileUpload } from '../../../file-upload';
diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
index e96c9e36f6ac..e40b6c88f491 100644
--- a/app/lib/server/functions/deleteUser.js
+++ b/app/lib/server/functions/deleteUser.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { FileUpload } from '../../../file-upload';
 import { Users, Subscriptions, Messages, Rooms, Integrations, FederationPeers } from '../../../models';
diff --git a/app/lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js
index a0ce6309ef25..80584abc4a61 100644
--- a/app/lib/server/functions/notifications/email.js
+++ b/app/lib/server/functions/notifications/email.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import s from 'underscore.string';
 
 import * as Mailer from '../../../../mailer';
diff --git a/app/lib/server/functions/notifications/index.js b/app/lib/server/functions/notifications/index.js
index 92a3733961f9..6dbe07fb0402 100644
--- a/app/lib/server/functions/notifications/index.js
+++ b/app/lib/server/functions/notifications/index.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import s from 'underscore.string';
 
 import { settings } from '../../../../settings';
diff --git a/app/lib/server/methods/addUsersToRoom.js b/app/lib/server/methods/addUsersToRoom.js
index d414ff4eca44..63eaa7594a83 100644
--- a/app/lib/server/methods/addUsersToRoom.js
+++ b/app/lib/server/methods/addUsersToRoom.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Subscriptions, Users } from '../../../models';
 import { hasPermission } from '../../../authorization';
diff --git a/app/lib/server/methods/filterATAllTag.js b/app/lib/server/methods/filterATAllTag.js
index 3966a5c90bd7..9ada82426f3b 100644
--- a/app/lib/server/methods/filterATAllTag.js
+++ b/app/lib/server/methods/filterATAllTag.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import moment from 'moment';
 
diff --git a/app/lib/server/methods/filterATHereTag.js b/app/lib/server/methods/filterATHereTag.js
index e105a8d76aad..79198e1aaf5d 100644
--- a/app/lib/server/methods/filterATHereTag.js
+++ b/app/lib/server/methods/filterATHereTag.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import moment from 'moment';
 
diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js
index 67b20c05327c..126aee112969 100644
--- a/app/lib/server/methods/sendMessage.js
+++ b/app/lib/server/methods/sendMessage.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import moment from 'moment';
 
 import { hasPermission } from '../../../authorization';
diff --git a/app/livechat/client/lib/chartHandler.js b/app/livechat/client/lib/chartHandler.js
index 4b65d57737a8..a58592df5391 100644
--- a/app/livechat/client/lib/chartHandler.js
+++ b/app/livechat/client/lib/chartHandler.js
@@ -1,5 +1,5 @@
 import Chart from 'chart.js';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 const lineChartConfiguration = ({ legends = false, anim = false, smallTicks = false }) => {
 	const config = {
diff --git a/app/livechat/client/views/app/livechatOfficeHours.js b/app/livechat/client/views/app/livechatOfficeHours.js
index 870128a2824e..47243391c7d0 100644
--- a/app/livechat/client/views/app/livechatOfficeHours.js
+++ b/app/livechat/client/views/app/livechatOfficeHours.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import moment from 'moment';
 
diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
index 50bfcaddd6b4..d6d83fa46edb 100644
--- a/app/livechat/client/views/app/tabbar/visitorInfo.js
+++ b/app/livechat/client/views/app/tabbar/visitorInfo.js
@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';
diff --git a/app/livechat/lib/messageTypes.js b/app/livechat/lib/messageTypes.js
index 6bef53f4d6fa..23be1740cdc2 100644
--- a/app/livechat/lib/messageTypes.js
+++ b/app/livechat/lib/messageTypes.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Livechat } from 'meteor/rocketchat:livechat';
 
 import { MessageTypes } from '../../ui-utils';
diff --git a/app/livechat/server/api/v1/offlineMessage.js b/app/livechat/server/api/v1/offlineMessage.js
index 26e8794a7c34..1859b5dde3a8 100644
--- a/app/livechat/server/api/v1/offlineMessage.js
+++ b/app/livechat/server/api/v1/offlineMessage.js
@@ -1,5 +1,5 @@
 import { Match, check } from 'meteor/check';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { API } from '../../../../api';
 import { Livechat } from '../../lib/Livechat';
diff --git a/app/livechat/server/api/v1/room.js b/app/livechat/server/api/v1/room.js
index a024d52078f2..c479e8b4c103 100644
--- a/app/livechat/server/api/v1/room.js
+++ b/app/livechat/server/api/v1/room.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings as rcSettings } from '../../../../settings';
 import { Messages, Rooms } from '../../../../models';
diff --git a/app/livechat/server/api/v1/transcript.js b/app/livechat/server/api/v1/transcript.js
index b93fd3b93ed8..02c0d9d27561 100644
--- a/app/livechat/server/api/v1/transcript.js
+++ b/app/livechat/server/api/v1/transcript.js
@@ -1,5 +1,5 @@
 import { check } from 'meteor/check';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { API } from '../../../../api';
 import { Livechat } from '../../lib/Livechat';
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index 6b487baeb71b..1abea5cf8677 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -3,7 +3,7 @@ import dns from 'dns';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { HTTP } from 'meteor/http';
 import _ from 'underscore';
 import s from 'underscore.string';
diff --git a/app/livechat/server/lib/QueueMethods.js b/app/livechat/server/lib/QueueMethods.js
index 92262256e6aa..ca5a37bce1e3 100644
--- a/app/livechat/server/lib/QueueMethods.js
+++ b/app/livechat/server/lib/QueueMethods.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
 import { Livechat } from './Livechat';
diff --git a/app/livechat/server/methods/closeByVisitor.js b/app/livechat/server/methods/closeByVisitor.js
index bd9354bb837c..dcde6c2df0ed 100644
--- a/app/livechat/server/methods/closeByVisitor.js
+++ b/app/livechat/server/methods/closeByVisitor.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../../settings';
 import { Rooms, LivechatVisitors } from '../../../models';
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
index c76325cb4e04..f57a663e62b6 100644
--- a/app/livechat/server/startup.js
+++ b/app/livechat/server/startup.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { roomTypes } from '../../utils';
 import { Rooms } from '../../models';
diff --git a/app/livestream/client/views/liveStreamTab.js b/app/livestream/client/views/liveStreamTab.js
index 9722540a9428..19f64cde9299 100644
--- a/app/livestream/client/views/liveStreamTab.js
+++ b/app/livestream/client/views/liveStreamTab.js
@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Blaze } from 'meteor/blaze';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { auth } from '../oauth.js';
diff --git a/app/mail-messages/client/views/mailer.js b/app/mail-messages/client/views/mailer.js
index 0f8f7e566985..673681f422d0 100644
--- a/app/mail-messages/client/views/mailer.js
+++ b/app/mail-messages/client/views/mailer.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { Tracker } from 'meteor/tracker';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { settings } from '../../../settings';
diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js
index cb2a550bc959..afe190862081 100644
--- a/app/mailer/server/api.js
+++ b/app/mailer/server/api.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Email } from 'meteor/email';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import juice from 'juice';
diff --git a/app/mapview/client/mapview.js b/app/mapview/client/mapview.js
index d12382a36908..6200203c287d 100644
--- a/app/mapview/client/mapview.js
+++ b/app/mapview/client/mapview.js
@@ -1,4 +1,4 @@
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../settings';
 import { callbacks } from '../../callbacks';
diff --git a/app/mentions/server/server.js b/app/mentions/server/server.js
index bd6109787856..9c515e4ecdec 100644
--- a/app/mentions/server/server.js
+++ b/app/mentions/server/server.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
 import MentionsServer from './Mentions';
diff --git a/app/message-pin/client/actionButton.js b/app/message-pin/client/actionButton.js
index 7ea7f5913f4e..91b5d29dde5d 100644
--- a/app/message-pin/client/actionButton.js
+++ b/app/message-pin/client/actionButton.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { RoomHistoryManager, MessageAction } from '../../ui-utils';
diff --git a/app/message-star/client/actionButton.js b/app/message-star/client/actionButton.js
index c6898ef9d50f..bdb86a5530b7 100644
--- a/app/message-star/client/actionButton.js
+++ b/app/message-star/client/actionButton.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { handleError } from '../../utils';
diff --git a/app/oauth2-server-config/client/admin/views/oauthApp.js b/app/oauth2-server-config/client/admin/views/oauthApp.js
index e0f4cc0f71c6..8854e4459a41 100644
--- a/app/oauth2-server-config/client/admin/views/oauthApp.js
+++ b/app/oauth2-server-config/client/admin/views/oauthApp.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Tracker } from 'meteor/tracker';
 import toastr from 'toastr';
 
diff --git a/app/otr/client/rocketchat.otr.room.js b/app/otr/client/rocketchat.otr.room.js
index 0a852d1eb638..35c2304bbfb9 100644
--- a/app/otr/client/rocketchat.otr.room.js
+++ b/app/otr/client/rocketchat.otr.room.js
@@ -4,7 +4,7 @@ import { Random } from 'meteor/random';
 import { EJSON } from 'meteor/ejson';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { TimeSync } from 'meteor/mizzao:timesync';
 import _ from 'underscore';
 import toastr from 'toastr';
diff --git a/app/reactions/server/setReaction.js b/app/reactions/server/setReaction.js
index 14fb9fdaaa5b..f9a6751e6134 100644
--- a/app/reactions/server/setReaction.js
+++ b/app/reactions/server/setReaction.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
 import { Messages, EmojiCustom, Subscriptions, Rooms } from '../../models';
diff --git a/app/search/client/search/search.js b/app/search/client/search/search.js
index 7e1d475e78ba..fbaed0bab153 100644
--- a/app/search/client/search/search.js
+++ b/app/search/client/search/search.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import _ from 'underscore';
 
diff --git a/app/setup-wizard/client/setupWizard.js b/app/setup-wizard/client/setupWizard.js
index f07f58b0ca84..093c0925c577 100644
--- a/app/setup-wizard/client/setupWizard.js
+++ b/app/setup-wizard/client/setupWizard.js
@@ -4,7 +4,7 @@ import { ReactiveDict } from 'meteor/reactive-dict';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { settings } from '../../settings';
diff --git a/app/slackbridge/server/slackbridge_import.server.js b/app/slackbridge/server/slackbridge_import.server.js
index 3c5e29f03ca9..978af4f89f33 100644
--- a/app/slackbridge/server/slackbridge_import.server.js
+++ b/app/slackbridge/server/slackbridge_import.server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { SlackBridge } from './slackbridge';
 import { Rooms } from '../../models';
diff --git a/app/slashcommands-archiveroom/server/server.js b/app/slashcommands-archiveroom/server/server.js
index 493c4a0d35d3..95ca4f7a6bca 100644
--- a/app/slashcommands-archiveroom/server/server.js
+++ b/app/slashcommands-archiveroom/server/server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Messages } from '../../models';
 import { slashCommands } from '../../utils';
diff --git a/app/slashcommands-create/server/server.js b/app/slashcommands-create/server/server.js
index 619a19f2f75a..bee6e25c58c5 100644
--- a/app/slashcommands-create/server/server.js
+++ b/app/slashcommands-create/server/server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../settings';
 import { Notifications } from '../../notifications';
diff --git a/app/slashcommands-help/server/server.js b/app/slashcommands-help/server/server.js
index 85f9c55bd541..ba76736dc9a5 100644
--- a/app/slashcommands-help/server/server.js
+++ b/app/slashcommands-help/server/server.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { slashCommands } from '../../utils';
 import { Notifications } from '../../notifications';
diff --git a/app/slashcommands-hide/server/hide.js b/app/slashcommands-hide/server/hide.js
index 00e0ab82a9c9..2a316417d4d5 100644
--- a/app/slashcommands-hide/server/hide.js
+++ b/app/slashcommands-hide/server/hide.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Subscriptions } from '../../models';
 import { Notifications } from '../../notifications';
diff --git a/app/slashcommands-invite/server/server.js b/app/slashcommands-invite/server/server.js
index cc68561dc3f0..52791303b264 100644
--- a/app/slashcommands-invite/server/server.js
+++ b/app/slashcommands-invite/server/server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Notifications } from '../../notifications';
 import { slashCommands } from '../../utils';
diff --git a/app/slashcommands-inviteall/server/server.js b/app/slashcommands-inviteall/server/server.js
index 97a63d8fea28..4ffc1d44ffed 100644
--- a/app/slashcommands-inviteall/server/server.js
+++ b/app/slashcommands-inviteall/server/server.js
@@ -5,7 +5,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Subscriptions } from '../../models';
 import { slashCommands } from '../../utils';
diff --git a/app/slashcommands-join/server/server.js b/app/slashcommands-join/server/server.js
index 5d8cc8ac2e04..53acecdc5840 100644
--- a/app/slashcommands-join/server/server.js
+++ b/app/slashcommands-join/server/server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Subscriptions } from '../../models';
 import { Notifications } from '../../notifications';
diff --git a/app/slashcommands-kick/server/server.js b/app/slashcommands-kick/server/server.js
index 159503c23b6a..5bc785cc8214 100644
--- a/app/slashcommands-kick/server/server.js
+++ b/app/slashcommands-kick/server/server.js
@@ -3,7 +3,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Notifications } from '../../notifications';
 import { Users, Subscriptions } from '../../models';
diff --git a/app/slashcommands-leave/server/leave.js b/app/slashcommands-leave/server/leave.js
index 5f21152fba2f..29d61b402d67 100644
--- a/app/slashcommands-leave/server/leave.js
+++ b/app/slashcommands-leave/server/leave.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Notifications } from '../../notifications';
 import { slashCommands } from '../../utils';
diff --git a/app/slashcommands-msg/server/server.js b/app/slashcommands-msg/server/server.js
index a00906699258..5eec44e11ffb 100644
--- a/app/slashcommands-msg/server/server.js
+++ b/app/slashcommands-msg/server/server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { slashCommands } from '../../utils';
 import { Notifications } from '../../notifications';
diff --git a/app/slashcommands-mute/server/mute.js b/app/slashcommands-mute/server/mute.js
index 3b5776542318..e5db5d07aff7 100644
--- a/app/slashcommands-mute/server/mute.js
+++ b/app/slashcommands-mute/server/mute.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { slashCommands } from '../../utils';
 import { Users, Subscriptions } from '../../models';
diff --git a/app/slashcommands-mute/server/unmute.js b/app/slashcommands-mute/server/unmute.js
index 25e79d6442de..a709f3b37c12 100644
--- a/app/slashcommands-mute/server/unmute.js
+++ b/app/slashcommands-mute/server/unmute.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { slashCommands } from '../../utils';
 import { Users, Subscriptions } from '../../models';
diff --git a/app/slashcommands-status/lib/status.js b/app/slashcommands-status/lib/status.js
index a03a9e516117..0141fdc1b1b2 100644
--- a/app/slashcommands-status/lib/status.js
+++ b/app/slashcommands-status/lib/status.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Random } from 'meteor/random';
 
 import { handleError, slashCommands } from '../../utils';
diff --git a/app/slashcommands-unarchiveroom/server/server.js b/app/slashcommands-unarchiveroom/server/server.js
index 3d04f7b8b40f..63fd5211736e 100644
--- a/app/slashcommands-unarchiveroom/server/server.js
+++ b/app/slashcommands-unarchiveroom/server/server.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Random } from 'meteor/random';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Messages } from '../../models';
 import { slashCommands } from '../../utils';
diff --git a/app/smarsh-connector/server/functions/generateEml.js b/app/smarsh-connector/server/functions/generateEml.js
index e60ae2de2b91..8633fd1ca0ca 100644
--- a/app/smarsh-connector/server/functions/generateEml.js
+++ b/app/smarsh-connector/server/functions/generateEml.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import moment from 'moment';
 
diff --git a/app/tokenpass/client/tokenpassChannelSettings.js b/app/tokenpass/client/tokenpassChannelSettings.js
index 541d45476aa4..63525138d9f1 100644
--- a/app/tokenpass/client/tokenpassChannelSettings.js
+++ b/app/tokenpass/client/tokenpassChannelSettings.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { t, handleError } from '../../utils';
diff --git a/app/ui-account/client/accountPreferences.js b/app/ui-account/client/accountPreferences.js
index cd4058b3664d..6dc1b0220c09 100644
--- a/app/ui-account/client/accountPreferences.js
+++ b/app/ui-account/client/accountPreferences.js
@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Reload } from 'meteor/reload';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/app/ui-admin/client/admin.js b/app/ui-admin/client/admin.js
index 0167a036e680..0f2891c41f90 100644
--- a/app/ui-admin/client/admin.js
+++ b/app/ui-admin/client/admin.js
@@ -5,7 +5,7 @@ import { Random } from 'meteor/random';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/app/ui-admin/client/adminFlex.js b/app/ui-admin/client/adminFlex.js
index 98929d9c8336..e360b51eddf7 100644
--- a/app/ui-admin/client/adminFlex.js
+++ b/app/ui-admin/client/adminFlex.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import s from 'underscore.string';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../settings';
 import { CachedCollection } from '../../ui-cached-collection';
diff --git a/app/ui-admin/client/adminInfo.js b/app/ui-admin/client/adminInfo.js
index 0fb0397debc1..d534cf44be65 100644
--- a/app/ui-admin/client/adminInfo.js
+++ b/app/ui-admin/client/adminInfo.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import s from 'underscore.string';
 import moment from 'moment';
 
diff --git a/app/ui-admin/client/rooms/adminRoomInfo.js b/app/ui-admin/client/rooms/adminRoomInfo.js
index 53695b9af36c..62a49d5f2793 100644
--- a/app/ui-admin/client/rooms/adminRoomInfo.js
+++ b/app/ui-admin/client/rooms/adminRoomInfo.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { AdminChatRoom } from './adminRooms';
diff --git a/app/ui-admin/client/rooms/adminRooms.js b/app/ui-admin/client/rooms/adminRooms.js
index 989417a72908..96a30d949da8 100644
--- a/app/ui-admin/client/rooms/adminRooms.js
+++ b/app/ui-admin/client/rooms/adminRooms.js
@@ -4,7 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 
diff --git a/app/ui-admin/client/rooms/channelSettingsDefault.js b/app/ui-admin/client/rooms/channelSettingsDefault.js
index d584a3af2101..f18a8535bc2b 100644
--- a/app/ui-admin/client/rooms/channelSettingsDefault.js
+++ b/app/ui-admin/client/rooms/channelSettingsDefault.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { AdminChatRoom } from './adminRooms';
diff --git a/app/ui-flextab/client/flexTabBar.js b/app/ui-flextab/client/flexTabBar.js
index a2f34329e776..865c757a5fb0 100644
--- a/app/ui-flextab/client/flexTabBar.js
+++ b/app/ui-flextab/client/flexTabBar.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
 import { hasAllPermission } from '../../authorization';
diff --git a/app/ui-flextab/client/tabs/userActions.js b/app/ui-flextab/client/tabs/userActions.js
index 2e5657cd0809..36db23341e0d 100644
--- a/app/ui-flextab/client/tabs/userActions.js
+++ b/app/ui-flextab/client/tabs/userActions.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import _ from 'underscore';
 
diff --git a/app/ui-flextab/client/tabs/userEdit.js b/app/ui-flextab/client/tabs/userEdit.js
index d1a9771ab21e..dcd109bceeb3 100644
--- a/app/ui-flextab/client/tabs/userEdit.js
+++ b/app/ui-flextab/client/tabs/userEdit.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 import s from 'underscore.string';
 
diff --git a/app/ui-flextab/client/tabs/userInfo.js b/app/ui-flextab/client/tabs/userInfo.js
index 1ee515ef3fe8..dac998f69aa4 100644
--- a/app/ui-flextab/client/tabs/userInfo.js
+++ b/app/ui-flextab/client/tabs/userInfo.js
@@ -1,7 +1,7 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';
diff --git a/app/ui-login/client/login/footer.js b/app/ui-login/client/login/footer.js
index 454ec5de57e7..89eb5c4d4a38 100644
--- a/app/ui-login/client/login/footer.js
+++ b/app/ui-login/client/login/footer.js
@@ -1,6 +1,6 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../../settings';
 
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index 0bc7739bbc9e..7eacc00d6d24 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -4,7 +4,7 @@ import { Blaze } from 'meteor/blaze';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { timeAgo, formatDateAndTime } from '../../lib/client/lib/formatDate';
 import { DateFormat } from '../../lib/client';
diff --git a/app/ui-message/client/popup/messagePopupConfig.js b/app/ui-message/client/popup/messagePopupConfig.js
index 11de8dceca40..7b157cddb382 100644
--- a/app/ui-message/client/popup/messagePopupConfig.js
+++ b/app/ui-message/client/popup/messagePopupConfig.js
@@ -5,7 +5,7 @@ import { Mongo } from 'meteor/mongo';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Messages, Subscriptions, Users } from '../../../models';
 import { hasAllPermission, hasAtLeastOnePermission } from '../../../authorization';
diff --git a/app/ui-sidenav/client/toolbar.js b/app/ui-sidenav/client/toolbar.js
index d8bcbfaaa78f..f535f7b63b4d 100644
--- a/app/ui-sidenav/client/toolbar.js
+++ b/app/ui-sidenav/client/toolbar.js
@@ -4,7 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
 import { toolbarSearch } from './sidebarHeader';
diff --git a/app/ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js
index b35e04f887ef..d28b16fa9afb 100644
--- a/app/ui-utils/client/lib/MessageAction.js
+++ b/app/ui-utils/client/lib/MessageAction.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 import toastr from 'toastr';
 import mem from 'mem';
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
diff --git a/app/ui-utils/lib/Message.js b/app/ui-utils/lib/Message.js
index 36ff9c9830d3..7d6a2026e11f 100644
--- a/app/ui-utils/lib/Message.js
+++ b/app/ui-utils/lib/Message.js
@@ -1,4 +1,4 @@
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import s from 'underscore.string';
 
 import { MessageTypes } from './MessageTypes';
diff --git a/app/ui-vrecord/client/vrecord.js b/app/ui-vrecord/client/vrecord.js
index daea0e04b81e..a978c86e1dd4 100644
--- a/app/ui-vrecord/client/vrecord.js
+++ b/app/ui-vrecord/client/vrecord.js
@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { VRecDialog } from './VRecDialog';
 import { VideoRecorder, fileUpload } from '../../ui';
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index b96f9d432256..55beeb34927e 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -6,7 +6,7 @@ import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { KonchatNotification } from './notification';
 import { MsgTyping } from './msgTyping';
diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
index bd76ea49e1a7..180f48fd3a59 100644
--- a/app/user-data-download/server/cronProcessDownloads.js
+++ b/app/user-data-download/server/cronProcessDownloads.js
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { SyncedCron } from 'meteor/littledata:synced-cron';
 import archiver from 'archiver';
 
diff --git a/app/user-status/client/admin/userStatusEdit.js b/app/user-status/client/admin/userStatusEdit.js
index 7aaa668cdf35..d554df76d846 100644
--- a/app/user-status/client/admin/userStatusEdit.js
+++ b/app/user-status/client/admin/userStatusEdit.js
@@ -2,7 +2,7 @@ import toastr from 'toastr';
 import s from 'underscore.string';
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { t, handleError } from '../../../utils';
 
diff --git a/app/utils/client/lib/CustomTranslations.js b/app/utils/client/lib/CustomTranslations.js
index 1996a7718d85..7754e9a609e5 100644
--- a/app/utils/client/lib/CustomTranslations.js
+++ b/app/utils/client/lib/CustomTranslations.js
@@ -1,4 +1,4 @@
-import { TAPi18n, TAPi18next } from 'meteor/tap:i18n';
+import { TAPi18n, TAPi18next } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../../settings';
 
diff --git a/app/utils/client/lib/handleError.js b/app/utils/client/lib/handleError.js
index 9e54e8cacf48..eb041954736e 100644
--- a/app/utils/client/lib/handleError.js
+++ b/app/utils/client/lib/handleError.js
@@ -1,4 +1,4 @@
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/app/utils/lib/tapi18n.js b/app/utils/lib/tapi18n.js
index 665913b57879..c4dcf13aec6b 100644
--- a/app/utils/lib/tapi18n.js
+++ b/app/utils/lib/tapi18n.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 export const t = function(key, ...replaces) {
 	if (_.isObject(replaces[0])) {
diff --git a/app/version-check/client/index.js b/app/version-check/client/index.js
index 2409e39f4840..b5dae4e54b55 100644
--- a/app/version-check/client/index.js
+++ b/app/version-check/client/index.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { alerts } from '../../ui-utils';
 
diff --git a/app/version-check/server/functions/checkVersionUpdate.js b/app/version-check/server/functions/checkVersionUpdate.js
index 702c74e1e853..bb2664391470 100644
--- a/app/version-check/server/functions/checkVersionUpdate.js
+++ b/app/version-check/server/functions/checkVersionUpdate.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import semver from 'semver';
 
 import getNewUpdates from './getNewUpdates';
diff --git a/app/videobridge/client/actionLink.js b/app/videobridge/client/actionLink.js
index dffb509114f6..666059649d32 100644
--- a/app/videobridge/client/actionLink.js
+++ b/app/videobridge/client/actionLink.js
@@ -1,5 +1,5 @@
 import { Session } from 'meteor/session';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { actionLinks } from '../../action-links';
diff --git a/app/videobridge/lib/messageType.js b/app/videobridge/lib/messageType.js
index 2ad1871fa3fd..c25f7c8a95fe 100644
--- a/app/videobridge/lib/messageType.js
+++ b/app/videobridge/lib/messageType.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { MessageTypes } from '../../ui-utils';
 
diff --git a/app/videobridge/server/methods/jitsiSetTimeout.js b/app/videobridge/server/methods/jitsiSetTimeout.js
index 71b892f4f7e7..af0351a6d4b2 100644
--- a/app/videobridge/server/methods/jitsiSetTimeout.js
+++ b/app/videobridge/server/methods/jitsiSetTimeout.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { Rooms, Messages } from '../../../models';
 import { callbacks } from '../../../callbacks';
diff --git a/app/webrtc/client/WebRTCClass.js b/app/webrtc/client/WebRTCClass.js
index 7198f3d51531..c18437c3de84 100644
--- a/app/webrtc/client/WebRTCClass.js
+++ b/app/webrtc/client/WebRTCClass.js
@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { ChromeScreenShare } from './screenShare';
 import { t } from '../../utils';
diff --git a/client/startup/emailVerification.js b/client/startup/emailVerification.js
index 690817dbf622..d70e6fd709ff 100644
--- a/client/startup/emailVerification.js
+++ b/client/startup/emailVerification.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import toastr from 'toastr';
 
 import { settings } from '../../app/settings';
diff --git a/client/startup/i18n.js b/client/startup/i18n.js
index 57ddf0348221..50d4264ac135 100644
--- a/client/startup/i18n.js
+++ b/client/startup/i18n.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import moment from 'moment';
 
 import { isRtl } from '../../app/utils';
diff --git a/packages/rocketchat-i18n/package.js b/packages/rocketchat-i18n/package.js
index 756bb74d0c64..9d0c51b020ce 100644
--- a/packages/rocketchat-i18n/package.js
+++ b/packages/rocketchat-i18n/package.js
@@ -32,5 +32,5 @@ Package.onUse(function(api) {
 		}
 	});
 
-	api.use('tap:i18n@1.8.2');
+	api.use('rocketchat:tap-i18n@1.9.1');
 });
diff --git a/packages/rocketchat-livechat/.app/.meteor/packages b/packages/rocketchat-livechat/.app/.meteor/packages
index e9d59f5381ae..4cb36615f8ae 100644
--- a/packages/rocketchat-livechat/.app/.meteor/packages
+++ b/packages/rocketchat-livechat/.app/.meteor/packages
@@ -30,7 +30,7 @@ momentjs:moment
 mizzao:timesync
 reactive-var@1.0.11
 accounts-password@1.5.1
-tap:i18n
+rocketchat:tap-i18n
 ecmascript@0.12.3
 es5-shim@4.8.0
 standard-minifier-css@1.5.2
diff --git a/packages/rocketchat-livechat/.app/.meteor/versions b/packages/rocketchat-livechat/.app/.meteor/versions
index da786418e46b..0b95b4547655 100644
--- a/packages/rocketchat-livechat/.app/.meteor/versions
+++ b/packages/rocketchat-livechat/.app/.meteor/versions
@@ -85,7 +85,7 @@ spacebars-compiler@1.1.3
 srp@1.0.12
 standard-minifier-css@1.5.2
 standard-minifier-js@2.4.0
-tap:i18n@1.8.2
+rocketchat:tap-i18n@1.9.1
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
diff --git a/packages/rocketchat-livechat/.app/client/lib/_livechat.js b/packages/rocketchat-livechat/.app/client/lib/_livechat.js
index 76871f73d0d8..580e2a26e487 100644
--- a/packages/rocketchat-livechat/.app/client/lib/_livechat.js
+++ b/packages/rocketchat-livechat/.app/client/lib/_livechat.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import visitor from '../../imports/client/visitor';
 
diff --git a/packages/rocketchat-livechat/.app/client/lib/commands.js b/packages/rocketchat-livechat/.app/client/lib/commands.js
index 169315925336..29a8f66662f8 100644
--- a/packages/rocketchat-livechat/.app/client/lib/commands.js
+++ b/packages/rocketchat-livechat/.app/client/lib/commands.js
@@ -2,7 +2,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import swal from 'sweetalert2';
 
 import visitor from '../../imports/client/visitor';
diff --git a/packages/rocketchat-livechat/.app/client/lib/tapi18n.js b/packages/rocketchat-livechat/.app/client/lib/tapi18n.js
index c4a8b55b7e2c..97346471cad5 100644
--- a/packages/rocketchat-livechat/.app/client/lib/tapi18n.js
+++ b/packages/rocketchat-livechat/.app/client/lib/tapi18n.js
@@ -1,4 +1,4 @@
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
 this.t = function(key, ...replaces) {
diff --git a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js
index 0512c71950c4..d80f800c6658 100644
--- a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js
+++ b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js
@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import visitor from '../../imports/client/visitor';
 
diff --git a/packages/rocketchat-livechat/.app/client/views/offlineForm.js b/packages/rocketchat-livechat/.app/client/views/offlineForm.js
index 0a9e61f8f4d1..0e2dc512f9f0 100644
--- a/packages/rocketchat-livechat/.app/client/views/offlineForm.js
+++ b/packages/rocketchat-livechat/.app/client/views/offlineForm.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 
diff --git a/packages/rocketchat-livechat/.app/client/views/register.js b/packages/rocketchat-livechat/.app/client/views/register.js
index bee093dfd66e..56f3fd3c79a0 100644
--- a/packages/rocketchat-livechat/.app/client/views/register.js
+++ b/packages/rocketchat-livechat/.app/client/views/register.js
@@ -2,7 +2,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index 9773695e2cf9..1afba367c5ae 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 
diff --git a/server/lib/cordova.js b/server/lib/cordova.js
index 363921fdf301..bd332179f7b9 100644
--- a/server/lib/cordova.js
+++ b/server/lib/cordova.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Push } from 'meteor/rocketchat:push';
 
 import { SystemLogger } from '../../app/logger';
diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js
index e3d8ee6024d6..e5a7a8d2f141 100644
--- a/server/startup/serverRunning.js
+++ b/server/startup/serverRunning.js
@@ -3,7 +3,7 @@ import path from 'path';
 
 import semver from 'semver';
 import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { SystemLogger } from '../../app/logger';
 import { settings } from '../../app/settings';