diff --git a/src/se/vidstige/jadb/DeviceDetectionHandler.java b/src/se/vidstige/jadb/AsyncActionHandler.java
similarity index 71%
rename from src/se/vidstige/jadb/DeviceDetectionHandler.java
rename to src/se/vidstige/jadb/AsyncActionHandler.java
index d530e54..b10e879 100644
--- a/src/se/vidstige/jadb/DeviceDetectionHandler.java
+++ b/src/se/vidstige/jadb/AsyncActionHandler.java
@@ -3,9 +3,9 @@ package se.vidstige.jadb;
 import java.util.List;
 import java.io.IOException;
 
-public class DeviceDetectionHandler {
+public class AsyncActionHandler {
     private Transport transport;
-    public DeviceDetectionHandler(Transport transport) {
+    public AsyncActionHandler(Transport transport) {
         this.transport = transport;
     };
 
diff --git a/src/se/vidstige/jadb/JadbConnection.java b/src/se/vidstige/jadb/JadbConnection.java
index 5aef9a1..43db0f7 100644
--- a/src/se/vidstige/jadb/JadbConnection.java
+++ b/src/se/vidstige/jadb/JadbConnection.java
@@ -43,7 +43,7 @@ public class JadbConnection implements ITransportFactory {
         return parseDevices(body);
     }
 
-    public DeviceDetectionHandler watchDevices(final DeviceDetectionListener listener) throws IOException, JadbException {
+    public AsyncActionHandler watchDevices(final DeviceDetectionListener listener) throws IOException, JadbException {
         final Transport transport = createTransport();
         new Thread(new Runnable() {
             @Override
@@ -65,7 +65,7 @@ public class JadbConnection implements ITransportFactory {
             }
         }).start();
 
-        return new DeviceDetectionHandler(transport);
+        return new AsyncActionHandler(transport);
     }
 
     private List<JadbDevice> parseDevices(String body) {