diff --git a/lib/units/api/controllers/user.js b/lib/units/api/controllers/user.js
index 43953c2a..2710e4da 100644
--- a/lib/units/api/controllers/user.js
+++ b/lib/units/api/controllers/user.js
@@ -7,7 +7,7 @@ var util = require('util')
 var _ = require('lodash')
 var Promise = require('bluebird')
 var uuid = require('uuid')
-var adbkit = require('adbkit')
+var adbkit = require('@devicefarmer/adbkit')
 var dbapi = require('../../../db/api')
 var logger = require('../../../util/logger')
 var datautil = require('../../../util/datautil')
diff --git a/lib/units/device/index.js b/lib/units/device/index.js
index 08be946b..6f50f5ec 100644
--- a/lib/units/device/index.js
+++ b/lib/units/device/index.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../util/logger')
 var lifecycle = require('../../util/lifecycle')
diff --git a/lib/units/device/plugins/account.js b/lib/units/device/plugins/account.js
index 025ad74e..724bcb54 100644
--- a/lib/units/device/plugins/account.js
+++ b/lib/units/device/plugins/account.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/browser.js b/lib/units/device/plugins/browser.js
index afb397e2..e8b0a744 100644
--- a/lib/units/device/plugins/browser.js
+++ b/lib/units/device/plugins/browser.js
@@ -1,6 +1,6 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
-var browsers = require('stf-browser-db')
+var browsers = require('@devicefarmer/stf-browser-db')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/cleanup.js b/lib/units/device/plugins/cleanup.js
index fdd2cd9c..ba77582b 100644
--- a/lib/units/device/plugins/cleanup.js
+++ b/lib/units/device/plugins/cleanup.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var Promise = require('bluebird')
 var _ = require('lodash')
 
diff --git a/lib/units/device/plugins/clipboard.js b/lib/units/device/plugins/clipboard.js
index 275a9713..88e2c855 100644
--- a/lib/units/device/plugins/clipboard.js
+++ b/lib/units/device/plugins/clipboard.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/connect.js b/lib/units/device/plugins/connect.js
index b70efc34..1aba2703 100644
--- a/lib/units/device/plugins/connect.js
+++ b/lib/units/device/plugins/connect.js
@@ -4,7 +4,7 @@
 
 var util = require('util')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var Promise = require('bluebird')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/filesystem.js b/lib/units/device/plugins/filesystem.js
index 8825aa11..ed91c8b6 100644
--- a/lib/units/device/plugins/filesystem.js
+++ b/lib/units/device/plugins/filesystem.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var path = require('path')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/forward/index.js b/lib/units/device/plugins/forward/index.js
index 4b481656..681c3654 100644
--- a/lib/units/device/plugins/forward/index.js
+++ b/lib/units/device/plugins/forward/index.js
@@ -1,7 +1,7 @@
 var net = require('net')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var _ = require('lodash')
 
 var wire = require('../../../../wire')
diff --git a/lib/units/device/plugins/group.js b/lib/units/device/plugins/group.js
index facf5f7f..5302b33f 100644
--- a/lib/units/device/plugins/group.js
+++ b/lib/units/device/plugins/group.js
@@ -1,7 +1,7 @@
 var events = require('events')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/heartbeat.js b/lib/units/device/plugins/heartbeat.js
index 0e585f8c..4000fa64 100644
--- a/lib/units/device/plugins/heartbeat.js
+++ b/lib/units/device/plugins/heartbeat.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var lifecycle = require('../../../util/lifecycle')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/install.js b/lib/units/device/plugins/install.js
index 894fbe2f..b06a6179 100644
--- a/lib/units/device/plugins/install.js
+++ b/lib/units/device/plugins/install.js
@@ -2,7 +2,7 @@ var stream = require('stream')
 var url = require('url')
 var util = require('util')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var request = require('request')
 var Promise = require('bluebird')
 
diff --git a/lib/units/device/plugins/logcat.js b/lib/units/device/plugins/logcat.js
index c63f2083..22b055b8 100644
--- a/lib/units/device/plugins/logcat.js
+++ b/lib/units/device/plugins/logcat.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var Promise = require('bluebird')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/logger.js b/lib/units/device/plugins/logger.js
index 658e5016..af622096 100644
--- a/lib/units/device/plugins/logger.js
+++ b/lib/units/device/plugins/logger.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/mute.js b/lib/units/device/plugins/mute.js
index 7afef3f3..2be0afed 100644
--- a/lib/units/device/plugins/mute.js
+++ b/lib/units/device/plugins/mute.js
@@ -1,5 +1,5 @@
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/plugins/reboot.js b/lib/units/device/plugins/reboot.js
index 0402246d..ec0bacba 100644
--- a/lib/units/device/plugins/reboot.js
+++ b/lib/units/device/plugins/reboot.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/ringer.js b/lib/units/device/plugins/ringer.js
index eaf8c31a..7283748f 100644
--- a/lib/units/device/plugins/ringer.js
+++ b/lib/units/device/plugins/ringer.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/screen/capture.js b/lib/units/device/plugins/screen/capture.js
index 1ccf8c4c..ea34dd87 100644
--- a/lib/units/device/plugins/screen/capture.js
+++ b/lib/units/device/plugins/screen/capture.js
@@ -1,7 +1,7 @@
 var util = require('util')
 
-var syrup = require('stf-syrup')
-var adbkit = require('adbkit')
+var syrup = require('@devicefarmer/stf-syrup')
+var adbkit = require('@devicefarmer/adbkit')
 
 var logger = require('../../../../util/logger')
 var wire = require('../../../../wire')
diff --git a/lib/units/device/plugins/screen/options.js b/lib/units/device/plugins/screen/options.js
index 9a2f6883..045cb68c 100644
--- a/lib/units/device/plugins/screen/options.js
+++ b/lib/units/device/plugins/screen/options.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var _ = require('lodash')
 
 module.exports = syrup.serial()
diff --git a/lib/units/device/plugins/screen/stream.js b/lib/units/device/plugins/screen/stream.js
index 94f45289..5d1bb888 100644
--- a/lib/units/device/plugins/screen/stream.js
+++ b/lib/units/device/plugins/screen/stream.js
@@ -1,12 +1,12 @@
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var WebSocket = require('ws')
 var uuid = require('uuid')
 var EventEmitter = require('eventemitter3')
 var split = require('split')
-var adbkit = require('adbkit')
+var adbkit = require('@devicefarmer/adbkit')
 
 var logger = require('../../../../util/logger')
 var lifecycle = require('../../../../util/lifecycle')
diff --git a/lib/units/device/plugins/sd.js b/lib/units/device/plugins/sd.js
index 755b96e0..da07f0a3 100644
--- a/lib/units/device/plugins/sd.js
+++ b/lib/units/device/plugins/sd.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/service.js b/lib/units/device/plugins/service.js
index b2e132b5..28136c9a 100644
--- a/lib/units/device/plugins/service.js
+++ b/lib/units/device/plugins/service.js
@@ -1,7 +1,7 @@
 var util = require('util')
 var events = require('events')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var Promise = require('bluebird')
 
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/shell.js b/lib/units/device/plugins/shell.js
index 93493d07..8064e9cd 100644
--- a/lib/units/device/plugins/shell.js
+++ b/lib/units/device/plugins/shell.js
@@ -1,5 +1,5 @@
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/solo.js b/lib/units/device/plugins/solo.js
index e3ba1f40..be6895b5 100644
--- a/lib/units/device/plugins/solo.js
+++ b/lib/units/device/plugins/solo.js
@@ -1,6 +1,6 @@
 var crypto = require('crypto')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/store.js b/lib/units/device/plugins/store.js
index b81fb21d..8b30c94f 100644
--- a/lib/units/device/plugins/store.js
+++ b/lib/units/device/plugins/store.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/touch/index.js b/lib/units/device/plugins/touch/index.js
index 88c62a3c..5daa64cc 100644
--- a/lib/units/device/plugins/touch/index.js
+++ b/lib/units/device/plugins/touch/index.js
@@ -1,11 +1,11 @@
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var split = require('split')
 var EventEmitter = require('eventemitter3')
-var adbkit = require('adbkit')
-var Parser = require('adbkit/lib/adb/parser')
+var adbkit = require('@devicefarmer/adbkit')
+var Parser = require('@devicefarmer/adbkit/lib/adb/parser')
 
 var wire = require('../../../../wire')
 var logger = require('../../../../util/logger')
diff --git a/lib/units/device/plugins/util/data.js b/lib/units/device/plugins/util/data.js
index a0aa6a66..6f0518aa 100644
--- a/lib/units/device/plugins/util/data.js
+++ b/lib/units/device/plugins/util/data.js
@@ -1,5 +1,5 @@
-var syrup = require('stf-syrup')
-var deviceData = require('stf-device-db')
+var syrup = require('@devicefarmer/stf-syrup')
+var deviceData = require('@devicefarmer/stf-device-db')
 
 var logger = require('../../../../util/logger')
 
diff --git a/lib/units/device/plugins/util/display.js b/lib/units/device/plugins/util/display.js
index 93a44078..6f38d7e4 100644
--- a/lib/units/device/plugins/util/display.js
+++ b/lib/units/device/plugins/util/display.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var EventEmitter = require('eventemitter3')
 
 var logger = require('../../../../util/logger')
diff --git a/lib/units/device/plugins/util/flags.js b/lib/units/device/plugins/util/flags.js
index 45fee2a2..209aa2dd 100644
--- a/lib/units/device/plugins/util/flags.js
+++ b/lib/units/device/plugins/util/flags.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 module.exports = syrup.serial()
   .dependency(require('./data'))
diff --git a/lib/units/device/plugins/util/identity.js b/lib/units/device/plugins/util/identity.js
index 1d14f3e3..d303092f 100644
--- a/lib/units/device/plugins/util/identity.js
+++ b/lib/units/device/plugins/util/identity.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var devutil = require('../../../../util/devutil')
 var logger = require('../../../../util/logger')
diff --git a/lib/units/device/plugins/util/phone.js b/lib/units/device/plugins/util/phone.js
index 1afa4a2b..737473b7 100644
--- a/lib/units/device/plugins/util/phone.js
+++ b/lib/units/device/plugins/util/phone.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../../util/logger')
 
diff --git a/lib/units/device/plugins/util/urlformat.js b/lib/units/device/plugins/util/urlformat.js
index 4a473e5e..2575cdea 100644
--- a/lib/units/device/plugins/util/urlformat.js
+++ b/lib/units/device/plugins/util/urlformat.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var _ = require('lodash')
 var tr = require('transliteration')
 
diff --git a/lib/units/device/plugins/vnc/index.js b/lib/units/device/plugins/vnc/index.js
index fabb268e..a0c10dd2 100644
--- a/lib/units/device/plugins/vnc/index.js
+++ b/lib/units/device/plugins/vnc/index.js
@@ -2,10 +2,10 @@ var net = require('net')
 var util = require('util')
 var os = require('os')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var Promise = require('bluebird')
 var uuid = require('uuid')
-var jpeg = require('jpeg-turbo')
+var jpeg = require('@devicefarmer/jpeg-turbo')
 
 var logger = require('../../../../util/logger')
 var grouputil = require('../../../../util/grouputil')
diff --git a/lib/units/device/plugins/wifi.js b/lib/units/device/plugins/wifi.js
index 1f43781f..52acd898 100644
--- a/lib/units/device/plugins/wifi.js
+++ b/lib/units/device/plugins/wifi.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/resources/minicap.js b/lib/units/device/resources/minicap.js
index 7b5665dc..c7ea4272 100644
--- a/lib/units/device/resources/minicap.js
+++ b/lib/units/device/resources/minicap.js
@@ -3,7 +3,7 @@ var util = require('util')
 var path = require('path')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var pathutil = require('../../../util/pathutil')
diff --git a/lib/units/device/resources/minirev.js b/lib/units/device/resources/minirev.js
index 802998c3..63d3048e 100644
--- a/lib/units/device/resources/minirev.js
+++ b/lib/units/device/resources/minirev.js
@@ -2,7 +2,7 @@ var fs = require('fs')
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var pathutil = require('../../../util/pathutil')
diff --git a/lib/units/device/resources/minitouch.js b/lib/units/device/resources/minitouch.js
index 725d297b..3c821dbb 100644
--- a/lib/units/device/resources/minitouch.js
+++ b/lib/units/device/resources/minitouch.js
@@ -2,7 +2,7 @@ var util = require('util')
 var fs = require('fs')
 
 var Promise = require('bluebird')
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var pathutil = require('../../../util/pathutil')
diff --git a/lib/units/device/resources/service.js b/lib/units/device/resources/service.js
index 7225bedc..741c1533 100644
--- a/lib/units/device/resources/service.js
+++ b/lib/units/device/resources/service.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var ProtoBuf = require('protobufjs')
 var semver = require('semver')
 
diff --git a/lib/units/device/support/abi.js b/lib/units/device/support/abi.js
index 92bbdda0..d668fc6a 100644
--- a/lib/units/device/support/abi.js
+++ b/lib/units/device/support/abi.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/support/adb.js b/lib/units/device/support/adb.js
index ff67b914..4a3b3ea3 100644
--- a/lib/units/device/support/adb.js
+++ b/lib/units/device/support/adb.js
@@ -1,6 +1,6 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
-var adbkit = require('adbkit')
+var adbkit = require('@devicefarmer/adbkit')
 
 var logger = require('../../../util/logger')
 var promiseutil = require('../../../util/promiseutil')
diff --git a/lib/units/device/support/channels.js b/lib/units/device/support/channels.js
index e8102520..f51f8559 100644
--- a/lib/units/device/support/channels.js
+++ b/lib/units/device/support/channels.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 var ChannelManager = require('../../../wire/channelmanager')
diff --git a/lib/units/device/support/properties.js b/lib/units/device/support/properties.js
index 520c5656..3f7c17c1 100644
--- a/lib/units/device/support/properties.js
+++ b/lib/units/device/support/properties.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/support/push.js b/lib/units/device/support/push.js
index c68bf47d..dc3a2ce4 100644
--- a/lib/units/device/support/push.js
+++ b/lib/units/device/support/push.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var Promise = require('bluebird')
 
diff --git a/lib/units/device/support/router.js b/lib/units/device/support/router.js
index 6f7692d2..cad2bfa7 100644
--- a/lib/units/device/support/router.js
+++ b/lib/units/device/support/router.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var wirerouter = require('../../../wire/router')
 
diff --git a/lib/units/device/support/sdk.js b/lib/units/device/support/sdk.js
index 859d16f8..ad7a95c6 100644
--- a/lib/units/device/support/sdk.js
+++ b/lib/units/device/support/sdk.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/support/storage.js b/lib/units/device/support/storage.js
index 35ea2ffb..bd09613b 100644
--- a/lib/units/device/support/storage.js
+++ b/lib/units/device/support/storage.js
@@ -1,7 +1,7 @@
 var util = require('util')
 var url = require('url')
 
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 var Promise = require('bluebird')
 var request = require('request')
 
diff --git a/lib/units/device/support/sub.js b/lib/units/device/support/sub.js
index 6e1d26a2..57a77ac8 100644
--- a/lib/units/device/support/sub.js
+++ b/lib/units/device/support/sub.js
@@ -1,4 +1,4 @@
-var syrup = require('stf-syrup')
+var syrup = require('@devicefarmer/stf-syrup')
 
 var Promise = require('bluebird')
 
diff --git a/lib/units/provider/index.js b/lib/units/provider/index.js
index ad8de2b8..d4ada8bb 100644
--- a/lib/units/provider/index.js
+++ b/lib/units/provider/index.js
@@ -1,4 +1,4 @@
-var adb = require('adbkit')
+var adb = require('@devicefarmer/adbkit')
 var Promise = require('bluebird')
 var _ = require('lodash')
 var EventEmitter = require('eventemitter3')
diff --git a/lib/units/storage/plugins/apk/task/manifest.js b/lib/units/storage/plugins/apk/task/manifest.js
index 988d9c14..c6d3faf4 100644
--- a/lib/units/storage/plugins/apk/task/manifest.js
+++ b/lib/units/storage/plugins/apk/task/manifest.js
@@ -1,4 +1,4 @@
-var ApkReader = require('adbkit-apkreader')
+var ApkReader = require('@devicefarmer/adbkit-apkreader')
 
 module.exports = function(file) {
   return ApkReader.open(file.path).then(function(reader) {
diff --git a/lib/units/websocket/index.js b/lib/units/websocket/index.js
index 31d8c943..b7071d03 100644
--- a/lib/units/websocket/index.js
+++ b/lib/units/websocket/index.js
@@ -10,7 +10,7 @@ var socketio = require('socket.io')
 var Promise = require('bluebird')
 var _ = require('lodash')
 var request = Promise.promisifyAll(require('request'))
-var adbkit = require('adbkit')
+var adbkit = require('@devicefarmer/adbkit')
 var uuid = require('uuid')
 
 var logger = require('../../util/logger')
diff --git a/lib/util/datautil.js b/lib/util/datautil.js
index eb691d74..38b90f15 100644
--- a/lib/util/datautil.js
+++ b/lib/util/datautil.js
@@ -2,8 +2,8 @@
 * Copyright © 2019 contains code contributed by Orange SA, authors: Denis Barbaron - Licensed under the Apache license 2.0
 **/
 
-var deviceData = require('stf-device-db')
-var browserData = require('stf-browser-db')
+var deviceData = require('@devicefarmer/stf-device-db')
+var browserData = require('@devicefarmer/stf-browser-db')
 
 var logger = require('./logger')
 
diff --git a/lib/util/fakedevice.js b/lib/util/fakedevice.js
index 6a6de91f..f6aa54ea 100644
--- a/lib/util/fakedevice.js
+++ b/lib/util/fakedevice.js
@@ -8,7 +8,7 @@ var uuid = require('uuid')
 var _ = require('lodash')
 
 var dbapi = require('../db/api')
-var devices = require('stf-device-db/dist/devices-latest')
+var devices = require('@devicefarmer/stf-device-db/dist/devices-latest')
 
 module.exports.generate = function(wantedModel) {
   // no base64 because some characters as '=' or '/' are not compatible through API (delete devices)
diff --git a/lib/util/keyutil.js b/lib/util/keyutil.js
index cf494c91..9d9ccff7 100644
--- a/lib/util/keyutil.js
+++ b/lib/util/keyutil.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var adb = require('adbkit')
+var adb = require('@devicefarmer/adbkit')
 var Promise = require('bluebird')
 
 var keyutil = module.exports = Object.create(null)