diff --git a/lib/units/device/index.js b/lib/units/device/index.js
index 7dd6ddc2..1e1b904b 100644
--- a/lib/units/device/index.js
+++ b/lib/units/device/index.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('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 e7f68120..53950c37 100644
--- a/lib/units/device/plugins/account.js
+++ b/lib/units/device/plugins/account.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('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 2665b3f8..a20e5953 100644
--- a/lib/units/device/plugins/browser.js
+++ b/lib/units/device/plugins/browser.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var browsers = require('stf-browser-db')
 
diff --git a/lib/units/device/plugins/clipboard.js b/lib/units/device/plugins/clipboard.js
index 9e645beb..275a9713 100644
--- a/lib/units/device/plugins/clipboard.js
+++ b/lib/units/device/plugins/clipboard.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('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 a79d0eba..8e20936b 100644
--- a/lib/units/device/plugins/connect.js
+++ b/lib/units/device/plugins/connect.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 var Promise = require('bluebird')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/data.js b/lib/units/device/plugins/data.js
index 545d0aea..8106974b 100644
--- a/lib/units/device/plugins/data.js
+++ b/lib/units/device/plugins/data.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 var deviceData = require('stf-device-db')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/display.js b/lib/units/device/plugins/display.js
index 604f6056..7cf2c179 100644
--- a/lib/units/device/plugins/display.js
+++ b/lib/units/device/plugins/display.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/plugins/flags.js b/lib/units/device/plugins/flags.js
index 3999e387..16879079 100644
--- a/lib/units/device/plugins/flags.js
+++ b/lib/units/device/plugins/flags.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 module.exports = syrup.serial()
   .dependency(require('./data'))
diff --git a/lib/units/device/plugins/forward/index.js b/lib/units/device/plugins/forward/index.js
index e0eb0018..1c8a1307 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('syrup')
+var syrup = require('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 2efa1d81..35083ca2 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('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/http.js b/lib/units/device/plugins/http.js
index ff6228aa..776e7771 100644
--- a/lib/units/device/plugins/http.js
+++ b/lib/units/device/plugins/http.js
@@ -3,7 +3,7 @@ var assert = require('assert')
 var http = require('http')
 
 var Promise = require('bluebird')
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 var request = Promise.promisifyAll(require('request'))
 var httpProxy = require('http-proxy')
 
diff --git a/lib/units/device/plugins/identity.js b/lib/units/device/plugins/identity.js
index 1f46f674..c1818a2b 100644
--- a/lib/units/device/plugins/identity.js
+++ b/lib/units/device/plugins/identity.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/install.js b/lib/units/device/plugins/install.js
index eb31eae6..9e5268bf 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('syrup')
+var syrup = require('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 9ac600a1..76a49b87 100644
--- a/lib/units/device/plugins/logcat.js
+++ b/lib/units/device/plugins/logcat.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('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 6c01ff36..658e5016 100644
--- a/lib/units/device/plugins/logger.js
+++ b/lib/units/device/plugins/logger.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/phone.js b/lib/units/device/plugins/phone.js
index aa8d4fc2..37dcb3bf 100644
--- a/lib/units/device/plugins/phone.js
+++ b/lib/units/device/plugins/phone.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/plugins/reboot.js b/lib/units/device/plugins/reboot.js
index 69b22b9b..0402246d 100644
--- a/lib/units/device/plugins/reboot.js
+++ b/lib/units/device/plugins/reboot.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('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 0d3ce9a3..eaf8c31a 100644
--- a/lib/units/device/plugins/ringer.js
+++ b/lib/units/device/plugins/ringer.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/screenshot.js b/lib/units/device/plugins/screenshot.js
index 2b32ac10..5d987b6b 100644
--- a/lib/units/device/plugins/screenshot.js
+++ b/lib/units/device/plugins/screenshot.js
@@ -1,7 +1,7 @@
 var http = require('http')
 var util = require('util')
 
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 var Promise = require('bluebird')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/plugins/sd.js b/lib/units/device/plugins/sd.js
index 61f670d5..755b96e0 100644
--- a/lib/units/device/plugins/sd.js
+++ b/lib/units/device/plugins/sd.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('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 6cf08b2e..534efc12 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('syrup')
+var syrup = require('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 8804ba35..a5673a6e 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('syrup')
+var syrup = require('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 8908788e..d38ec108 100644
--- a/lib/units/device/plugins/solo.js
+++ b/lib/units/device/plugins/solo.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/stats.js b/lib/units/device/plugins/stats.js
index b9bc3a82..1595d467 100644
--- a/lib/units/device/plugins/stats.js
+++ b/lib/units/device/plugins/stats.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
diff --git a/lib/units/device/plugins/store.js b/lib/units/device/plugins/store.js
index b7e29270..b81fb21d 100644
--- a/lib/units/device/plugins/store.js
+++ b/lib/units/device/plugins/store.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/touch.js b/lib/units/device/plugins/touch.js
index 968f29fc..cea3db7e 100644
--- a/lib/units/device/plugins/touch.js
+++ b/lib/units/device/plugins/touch.js
@@ -1,7 +1,7 @@
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 var split = require('split')
 
 var wire = require('../../../wire')
diff --git a/lib/units/device/plugins/wifi.js b/lib/units/device/plugins/wifi.js
index e26c0fc4..ebae0cbc 100644
--- a/lib/units/device/plugins/wifi.js
+++ b/lib/units/device/plugins/wifi.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var wire = require('../../../wire')
diff --git a/lib/units/device/resources/minirev.js b/lib/units/device/resources/minirev.js
index 30bf14d7..abf3ec04 100644
--- a/lib/units/device/resources/minirev.js
+++ b/lib/units/device/resources/minirev.js
@@ -1,7 +1,7 @@
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('syrup')
+var syrup = require('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 f5a9acd8..27412728 100644
--- a/lib/units/device/resources/minitouch.js
+++ b/lib/units/device/resources/minitouch.js
@@ -1,7 +1,7 @@
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var pathutil = require('../../../util/pathutil')
diff --git a/lib/units/device/resources/remote.js b/lib/units/device/resources/remote.js
index 97bc5f5d..54cbb519 100644
--- a/lib/units/device/resources/remote.js
+++ b/lib/units/device/resources/remote.js
@@ -1,7 +1,7 @@
 var util = require('util')
 
 var Promise = require('bluebird')
-var syrup = require('syrup')
+var syrup = require('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 75401205..c9f136a4 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('syrup')
+var syrup = require('stf-syrup')
 var ProtoBuf = require('protobufjs')
 var semver = require('semver')
 
diff --git a/lib/units/device/support/adb.js b/lib/units/device/support/adb.js
index e2545952..85de547c 100644
--- a/lib/units/device/support/adb.js
+++ b/lib/units/device/support/adb.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var adbkit = require('adbkit')
 
diff --git a/lib/units/device/support/channels.js b/lib/units/device/support/channels.js
index 2470de5a..e8102520 100644
--- a/lib/units/device/support/channels.js
+++ b/lib/units/device/support/channels.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 var ChannelManager = require('../../../wire/channelmanager')
diff --git a/lib/units/device/support/http.js b/lib/units/device/support/http.js
index d743e60a..5d4aa685 100644
--- a/lib/units/device/support/http.js
+++ b/lib/units/device/support/http.js
@@ -1,7 +1,7 @@
 var http = require('http')
 var util = require('util')
 
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 var express = require('express')
 
 var logger = require('../../../util/logger')
diff --git a/lib/units/device/support/properties.js b/lib/units/device/support/properties.js
index 01b52a37..520c5656 100644
--- a/lib/units/device/support/properties.js
+++ b/lib/units/device/support/properties.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var logger = require('../../../util/logger')
 
diff --git a/lib/units/device/support/push.js b/lib/units/device/support/push.js
index d5276af3..8ebb40a6 100644
--- a/lib/units/device/support/push.js
+++ b/lib/units/device/support/push.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var zmq = require('zmq')
 
diff --git a/lib/units/device/support/router.js b/lib/units/device/support/router.js
index 83361929..6f7692d2 100644
--- a/lib/units/device/support/router.js
+++ b/lib/units/device/support/router.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var wirerouter = require('../../../wire/router')
 
diff --git a/lib/units/device/support/storage.js b/lib/units/device/support/storage.js
index 6815c80c..df196deb 100644
--- a/lib/units/device/support/storage.js
+++ b/lib/units/device/support/storage.js
@@ -1,6 +1,6 @@
 var util = require('util')
 
-var syrup = require('syrup')
+var syrup = require('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 a4d4d220..687b80cd 100644
--- a/lib/units/device/support/sub.js
+++ b/lib/units/device/support/sub.js
@@ -1,4 +1,4 @@
-var syrup = require('syrup')
+var syrup = require('stf-syrup')
 
 var zmq = require('zmq')