diff --git a/src/adb/command/host-serial/waitfordevice.coffee b/src/adb/command/host-serial/waitfordevice.coffee
index 6041e8ce..55005dd6 100644
--- a/src/adb/command/host-serial/waitfordevice.coffee
+++ b/src/adb/command/host-serial/waitfordevice.coffee
@@ -3,7 +3,7 @@ Protocol = require '../../protocol'
 
 class WaitForDeviceCommand extends Command
   execute: (serial) ->
-    this._send "host-serial:#{serial}:wait-for-any"
+    this._send "host-serial:#{serial}:wait-for-any-device"
     @parser.readAscii 4
       .then (reply) =>
         switch reply
diff --git a/test/adb/command/host-serial/waitfordevice.coffee b/test/adb/command/host-serial/waitfordevice.coffee
index 1c8250c9..7f301300 100644
--- a/test/adb/command/host-serial/waitfordevice.coffee
+++ b/test/adb/command/host-serial/waitfordevice.coffee
@@ -11,12 +11,12 @@ WaitForDeviceCommand = \
 
 describe 'WaitForDeviceCommand', ->
 
-  it "should send 'host-serial:<serial>:wait-for-any'", (done) ->
+  it "should send 'host-serial:<serial>:wait-for-any-device'", (done) ->
     conn = new MockConnection
     cmd = new WaitForDeviceCommand conn
     conn.socket.on 'write', (chunk) ->
       expect(chunk.toString()).to.equal \
-        Protocol.encodeData('host-serial:abba:wait-for-any').toString()
+        Protocol.encodeData('host-serial:abba:wait-for-any-device').toString()
     setImmediate ->
       conn.socket.causeRead Protocol.OKAY
       conn.socket.causeRead Protocol.OKAY