diff --git a/src/test/java/org/usb4java/libusb/BosDescriptorTest.java b/src/test/java/org/usb4java/libusb/BosDescriptorTest.java
index bf2456d..f7de17d 100644
--- a/src/test/java/org/usb4java/libusb/BosDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/BosDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/BosDevCapabilityDescriptorTest.java b/src/test/java/org/usb4java/libusb/BosDevCapabilityDescriptorTest.java
index a4fa435..e879928 100644
--- a/src/test/java/org/usb4java/libusb/BosDevCapabilityDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/BosDevCapabilityDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/ConfigDescriptorTest.java b/src/test/java/org/usb4java/libusb/ConfigDescriptorTest.java
index 413e460..b2d9571 100644
--- a/src/test/java/org/usb4java/libusb/ConfigDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/ConfigDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/ContainerIdDescriptorTest.java b/src/test/java/org/usb4java/libusb/ContainerIdDescriptorTest.java
index e1d722b..19ba2cc 100644
--- a/src/test/java/org/usb4java/libusb/ContainerIdDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/ContainerIdDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/DeviceDescriptorTest.java b/src/test/java/org/usb4java/libusb/DeviceDescriptorTest.java
index 735d96b..6d4df81 100644
--- a/src/test/java/org/usb4java/libusb/DeviceDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/DeviceDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/EndpointDescriptorTest.java b/src/test/java/org/usb4java/libusb/EndpointDescriptorTest.java
index f2adcdd..1216ce3 100644
--- a/src/test/java/org/usb4java/libusb/EndpointDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/EndpointDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/InterfaceDescriptorTest.java b/src/test/java/org/usb4java/libusb/InterfaceDescriptorTest.java
index be45992..1c6f057 100644
--- a/src/test/java/org/usb4java/libusb/InterfaceDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/InterfaceDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/InterfaceTest.java b/src/test/java/org/usb4java/libusb/InterfaceTest.java
index e1170ba..baff051 100644
--- a/src/test/java/org/usb4java/libusb/InterfaceTest.java
+++ b/src/test/java/org/usb4java/libusb/InterfaceTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/LibUSBDeviceTest.java b/src/test/java/org/usb4java/libusb/LibUSBDeviceTest.java
index de4b643..ecdc048 100644
--- a/src/test/java/org/usb4java/libusb/LibUSBDeviceTest.java
+++ b/src/test/java/org/usb4java/libusb/LibUSBDeviceTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 import static org.junit.Assert.assertEquals;
@@ -19,7 +19,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.usb4java.utils.BufferUtils;
+import org.libusb4java.utils.BufferUtils;
 
 /**
  * Tests the device-scope methods of the {@link LibUsb} class which need a open
diff --git a/src/test/java/org/usb4java/libusb/LibUSBGlobalTest.java b/src/test/java/org/usb4java/libusb/LibUSBGlobalTest.java
index e625966..115b16d 100644
--- a/src/test/java/org/usb4java/libusb/LibUSBGlobalTest.java
+++ b/src/test/java/org/usb4java/libusb/LibUSBGlobalTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/usb4java/libusb/LibUSBTest.java b/src/test/java/org/usb4java/libusb/LibUSBTest.java
index 3d43961..2b4342a 100644
--- a/src/test/java/org/usb4java/libusb/LibUSBTest.java
+++ b/src/test/java/org/usb4java/libusb/LibUSBTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 import static org.junit.Assert.assertEquals;
@@ -20,8 +20,8 @@ import java.nio.LongBuffer;
 
 import org.junit.Test;
 
-import org.usb4java.libusb.mocks.PollfdListenerMock;
-import org.usb4java.utils.BufferUtils;
+import org.libusb4java.mocks.PollfdListenerMock;
+import org.libusb4java.utils.BufferUtils;
 
 /**
  * Tests the {@link LibUsb} class.
diff --git a/src/test/java/org/usb4java/libusb/SsEndpointCompanionDescriptorTest.java b/src/test/java/org/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
index fcb5907..7915b41 100644
--- a/src/test/java/org/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptorTest.java b/src/test/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptorTest.java
index 32bd051..d38f48d 100644
--- a/src/test/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/TransferTest.java b/src/test/java/org/usb4java/libusb/TransferTest.java
index 367ee22..3b0b284 100644
--- a/src/test/java/org/usb4java/libusb/TransferTest.java
+++ b/src/test/java/org/usb4java/libusb/TransferTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/usb4java/libusb/Usb20ExtensionDescriptorTest.java b/src/test/java/org/usb4java/libusb/Usb20ExtensionDescriptorTest.java
index 58d60a1..39bd795 100644
--- a/src/test/java/org/usb4java/libusb/Usb20ExtensionDescriptorTest.java
+++ b/src/test/java/org/usb4java/libusb/Usb20ExtensionDescriptorTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/VersionTest.java b/src/test/java/org/usb4java/libusb/VersionTest.java
index 8593866..32aa945 100644
--- a/src/test/java/org/usb4java/libusb/VersionTest.java
+++ b/src/test/java/org/usb4java/libusb/VersionTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.libusb;
+package org.libusb4java;
 
 import static org.usb4java.test.UsbAssume.assumeUsbTestsEnabled;
 
diff --git a/src/test/java/org/usb4java/libusb/mocks/PollfdListenerMock.java b/src/test/java/org/usb4java/libusb/mocks/PollfdListenerMock.java
index 27d8a04..2e042ab 100644
--- a/src/test/java/org/usb4java/libusb/mocks/PollfdListenerMock.java
+++ b/src/test/java/org/usb4java/libusb/mocks/PollfdListenerMock.java
@@ -2,11 +2,11 @@
  * Copyright (C) 2013 Klaus Reimer <k@ailis.de>
  * See LICENSE.md for licensing information.
  */
-package org.usb4java.libusb.mocks;
+package org.libusb4java.mocks;
 
 import java.io.FileDescriptor;
 
-import org.usb4java.libusb.PollfdListener;
+import org.libusb4java.PollfdListener;
 
 /**
  * A mocked pollfd listener implementation.
diff --git a/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java b/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java
index e823d87..06e838c 100644
--- a/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java
+++ b/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.utils;
+package org.libusb4java.utils;
 
 import static org.junit.Assert.assertEquals;
 
@@ -16,7 +16,7 @@ import org.usb4java.descriptors.SimpleUsbConfigurationDescriptor;
 import org.usb4java.descriptors.SimpleUsbDeviceDescriptor;
 import org.usb4java.descriptors.SimpleUsbEndpointDescriptor;
 import org.usb4java.descriptors.SimpleUsbInterfaceDescriptor;
-import org.usb4java.libusb.LibUsb;
+import org.libusb4java.LibUsb;
 
 /**
  * Tests the {@link DescriptorUtils} class.