diff --git a/src/main/java/de/ailis/usb4java/AbstractDevice.java b/src/main/java/de/ailis/usb4java/AbstractDevice.java
index d53d270..5914bc3 100644
--- a/src/main/java/de/ailis/usb4java/AbstractDevice.java
+++ b/src/main/java/de/ailis/usb4java/AbstractDevice.java
@@ -62,7 +62,7 @@ abstract class AbstractDevice implements UsbDevice
         new HashMap<Byte, Configuration>();
 
     /** The USB device listener list. */
-    private final UsbDeviceListenerList listeners = new UsbDeviceListenerList();
+    private final DeviceListenerList listeners = new DeviceListenerList();
 
     /** The device handle. Null if not open. */
     private DeviceHandle handle;
diff --git a/src/main/java/de/ailis/usb4java/ControlIrpQueue.java b/src/main/java/de/ailis/usb4java/ControlIrpQueue.java
index 5a5a4b3..3db81c3 100644
--- a/src/main/java/de/ailis/usb4java/ControlIrpQueue.java
+++ b/src/main/java/de/ailis/usb4java/ControlIrpQueue.java
@@ -25,7 +25,7 @@ import de.ailis.usb4java.libusb.LibUsbException;
 final class ControlIrpQueue extends AbstractIrpQueue<UsbControlIrp>
 {
     /** The USB device listener list. */
-    private final UsbDeviceListenerList listeners;
+    private final DeviceListenerList listeners;
 
     /**
      * Constructor.
@@ -36,7 +36,7 @@ final class ControlIrpQueue extends AbstractIrpQueue<UsbControlIrp>
      *            The USB device listener list.
      */
     ControlIrpQueue(final AbstractDevice device,
-        final UsbDeviceListenerList listeners)
+        final DeviceListenerList listeners)
     {
         super(device);
         this.listeners = listeners;
diff --git a/src/main/java/de/ailis/usb4java/UsbDeviceListenerList.java b/src/main/java/de/ailis/usb4java/DeviceListenerList.java
similarity index 96%
rename from src/main/java/de/ailis/usb4java/UsbDeviceListenerList.java
rename to src/main/java/de/ailis/usb4java/DeviceListenerList.java
index 81e7772..f71754c 100644
--- a/src/main/java/de/ailis/usb4java/UsbDeviceListenerList.java
+++ b/src/main/java/de/ailis/usb4java/DeviceListenerList.java
@@ -15,7 +15,7 @@ import javax.usb.event.UsbDeviceListener;
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-final class UsbDeviceListenerList extends
+final class DeviceListenerList extends
     EventListenerList<UsbDeviceListener> implements UsbDeviceListener
 {
     @Override
diff --git a/src/main/java/de/ailis/usb4java/Pipe.java b/src/main/java/de/ailis/usb4java/Pipe.java
index 8662208..b5e8e95 100644
--- a/src/main/java/de/ailis/usb4java/Pipe.java
+++ b/src/main/java/de/ailis/usb4java/Pipe.java
@@ -35,7 +35,7 @@ final class Pipe implements UsbPipe
     private final Endpoint endpoint;
 
     /** The USB pipe listeners. */
-    private final UsbPipeListenerList listeners = new UsbPipeListenerList();
+    private final PipeListenerList listeners = new PipeListenerList();
 
     /** If pipe is open or not. */
     private boolean opened;
diff --git a/src/main/java/de/ailis/usb4java/UsbPipeListenerList.java b/src/main/java/de/ailis/usb4java/PipeListenerList.java
similarity index 96%
rename from src/main/java/de/ailis/usb4java/UsbPipeListenerList.java
rename to src/main/java/de/ailis/usb4java/PipeListenerList.java
index ae258f3..5ddb5c5 100644
--- a/src/main/java/de/ailis/usb4java/UsbPipeListenerList.java
+++ b/src/main/java/de/ailis/usb4java/PipeListenerList.java
@@ -14,7 +14,7 @@ import javax.usb.event.UsbPipeListener;
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-final class UsbPipeListenerList extends
+final class PipeListenerList extends
     EventListenerList<UsbPipeListener> implements UsbPipeListener
 {
     @Override
diff --git a/src/main/java/de/ailis/usb4java/RootHub.java b/src/main/java/de/ailis/usb4java/RootHub.java
index d3d7231..0ff7dc3 100644
--- a/src/main/java/de/ailis/usb4java/RootHub.java
+++ b/src/main/java/de/ailis/usb4java/RootHub.java
@@ -61,7 +61,7 @@ final class RootHub implements UsbHub,
             (byte) 1);
 
     /** The device listeners. */
-    private final UsbDeviceListenerList listeners = new UsbDeviceListenerList();
+    private final DeviceListenerList listeners = new DeviceListenerList();
 
     /** The hub ports. */
     private final Ports ports = new Ports(this);
diff --git a/src/main/java/de/ailis/usb4java/Services.java b/src/main/java/de/ailis/usb4java/Services.java
index a656ba8..f4bfc2f 100644
--- a/src/main/java/de/ailis/usb4java/Services.java
+++ b/src/main/java/de/ailis/usb4java/Services.java
@@ -33,8 +33,8 @@ public final class Services implements UsbServices
     private static final String API_VERSION = "1.0.2";
 
     /** The USB services listeners. */
-    private final UsbServicesListenerList listeners =
-        new UsbServicesListenerList();
+    private final ServicesListenerList listeners =
+        new ServicesListenerList();
 
     /** The virtual USB root hub. */
     private final RootHub rootHub;
diff --git a/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java b/src/main/java/de/ailis/usb4java/ServicesListenerList.java
similarity index 95%
rename from src/main/java/de/ailis/usb4java/UsbServicesListenerList.java
rename to src/main/java/de/ailis/usb4java/ServicesListenerList.java
index 05c9187..494ebb0 100644
--- a/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java
+++ b/src/main/java/de/ailis/usb4java/ServicesListenerList.java
@@ -13,7 +13,7 @@ import javax.usb.event.UsbServicesListener;
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-final class UsbServicesListenerList extends
+final class ServicesListenerList extends
     EventListenerList<UsbServicesListener> implements UsbServicesListener
 {
     @Override