diff --git a/src/main/c/src/BOSDescriptor.c b/src/main/c/src/BosDescriptor.c
similarity index 60%
rename from src/main/c/src/BOSDescriptor.c
rename to src/main/c/src/BosDescriptor.c
index 5634a47..12aadc5 100644
--- a/src/main/c/src/BOSDescriptor.c
+++ b/src/main/c/src/BosDescriptor.c
@@ -3,23 +3,23 @@
  * See COPYING file for copying conditions
  */
 
-#include "BOSDescriptor.h"
-#include "BOSDevCapabilityDescriptor.h"
+#include "BosDescriptor.h"
+#include "BosDevCapabilityDescriptor.h"
 
-void setBOSDescriptor(JNIEnv* env,
+void setBosDescriptor(JNIEnv* env,
     struct libusb_bos_descriptor* descriptor, jobject object)
 {
     SET_POINTER(env, descriptor, object, "bosDescriptorPointer");
 }
 
-struct libusb_bos_descriptor* unwrapBOSDescriptor(JNIEnv* env,
+struct libusb_bos_descriptor* unwrapBosDescriptor(JNIEnv* env,
     jobject descriptor)
 {
     UNWRAP_POINTER(env, descriptor, struct libusb_bos_descriptor*,
         "bosDescriptorPointer");
 }
 
-void resetBOSDescriptor(JNIEnv* env, jobject obj)
+void resetBosDescriptor(JNIEnv* env, jobject obj)
 {
     RESET_POINTER(env, obj, "bosDescriptorPointer");
 }
@@ -27,13 +27,13 @@ void resetBOSDescriptor(JNIEnv* env, jobject obj)
 /**
  * byte bLength()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDescriptor, bLength)
+JNIEXPORT jbyte JNICALL METHOD_NAME(BosDescriptor, bLength)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_descriptor *descriptor =
-        unwrapBOSDescriptor(env, this);
+        unwrapBosDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bLength;
 }
@@ -41,13 +41,13 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDescriptor, bLength)
 /**
  * byte bDescriptorType()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDescriptor, bDescriptorType)
+JNIEXPORT jbyte JNICALL METHOD_NAME(BosDescriptor, bDescriptorType)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_descriptor *descriptor =
-        unwrapBOSDescriptor(env, this);
+        unwrapBosDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bDescriptorType;
 }
@@ -55,13 +55,13 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDescriptor, bDescriptorType)
 /**
  * short wTotalLength()
  */
-JNIEXPORT jshort JNICALL METHOD_NAME(BOSDescriptor, wTotalLength)
+JNIEXPORT jshort JNICALL METHOD_NAME(BosDescriptor, wTotalLength)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_descriptor *descriptor =
-        unwrapBOSDescriptor(env, this);
+        unwrapBosDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->wTotalLength;
 }
@@ -69,28 +69,28 @@ JNIEXPORT jshort JNICALL METHOD_NAME(BOSDescriptor, wTotalLength)
 /**
  * byte bNumDeviceCaps()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDescriptor, bNumDeviceCaps)
+JNIEXPORT jbyte JNICALL METHOD_NAME(BosDescriptor, bNumDeviceCaps)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_descriptor *descriptor =
-        unwrapBOSDescriptor(env, this);
+        unwrapBosDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bNumDeviceCaps;
 }
 
 /**
- * BOSDevCapabilityDescriptor[] devCapability()
+ * BosDevCapabilityDescriptor[] devCapability()
  */
-JNIEXPORT jobjectArray JNICALL METHOD_NAME(BOSDescriptor, devCapability)
+JNIEXPORT jobjectArray JNICALL METHOD_NAME(BosDescriptor, devCapability)
 (
     JNIEnv *env, jobject this
 )
 {
-    struct libusb_bos_descriptor *descriptor = unwrapBOSDescriptor(
+    struct libusb_bos_descriptor *descriptor = unwrapBosDescriptor(
         env, this);
     if (!descriptor) return NULL;
-    return wrapBOSDevCapabilityDescriptors(env, descriptor->bNumDeviceCaps,
+    return wrapBosDevCapabilityDescriptors(env, descriptor->bNumDeviceCaps,
         descriptor->dev_capability);
 }
diff --git a/src/main/c/src/BOSDescriptor.h b/src/main/c/src/BosDescriptor.h
similarity index 55%
rename from src/main/c/src/BOSDescriptor.h
rename to src/main/c/src/BosDescriptor.h
index 5e67aa3..c7e0fd4 100644
--- a/src/main/c/src/BOSDescriptor.h
+++ b/src/main/c/src/BosDescriptor.h
@@ -8,8 +8,8 @@
 
 #include "usb4java.h"
 
-void setBOSDescriptor(JNIEnv*, struct libusb_bos_descriptor*, jobject);
-struct libusb_bos_descriptor* unwrapBOSDescriptor(JNIEnv*, jobject);
-void resetBOSDescriptor(JNIEnv*, jobject);
+void setBosDescriptor(JNIEnv*, struct libusb_bos_descriptor*, jobject);
+struct libusb_bos_descriptor* unwrapBosDescriptor(JNIEnv*, jobject);
+void resetBosDescriptor(JNIEnv*, jobject);
 
 #endif
diff --git a/src/main/c/src/BOSDevCapabilityDescriptor.c b/src/main/c/src/BosDevCapabilityDescriptor.c
similarity index 65%
rename from src/main/c/src/BOSDevCapabilityDescriptor.c
rename to src/main/c/src/BosDevCapabilityDescriptor.c
index b532449..eed2fb9 100644
--- a/src/main/c/src/BOSDevCapabilityDescriptor.c
+++ b/src/main/c/src/BosDevCapabilityDescriptor.c
@@ -3,31 +3,31 @@
  * See COPYING file for copying conditions
  */
 
-#include "BOSDevCapabilityDescriptor.h"
+#include "BosDevCapabilityDescriptor.h"
 
-jobject wrapBOSDevCapabilityDescriptor(JNIEnv *env,
+jobject wrapBosDevCapabilityDescriptor(JNIEnv *env,
     const struct libusb_bos_dev_capability_descriptor *descriptor)
 {
-    WRAP_POINTER(env, descriptor, "BOSDevCapabilityDescriptor",
+    WRAP_POINTER(env, descriptor, "BosDevCapabilityDescriptor",
         "bosDevCapabilityDescriptorPointer");
 }
 
-jobjectArray wrapBOSDevCapabilityDescriptors(JNIEnv *env, int count,
+jobjectArray wrapBosDevCapabilityDescriptors(JNIEnv *env, int count,
     struct libusb_bos_dev_capability_descriptor **descriptors)
 {
     int i;
 
     jobjectArray array = (jobjectArray) (*env)->NewObjectArray(env,
-        count, (*env)->FindClass(env, PACKAGE_DIR"/BOSDevCapabilityDescriptor"),
+        count, (*env)->FindClass(env, PACKAGE_DIR"/BosDevCapabilityDescriptor"),
         NULL);
     for (i = 0; i < count; i++)
         (*env)->SetObjectArrayElement(env, array, i,
-            wrapBOSDevCapabilityDescriptor(env, descriptors[i]));
+            wrapBosDevCapabilityDescriptor(env, descriptors[i]));
     return array;
 }
 
 struct libusb_bos_dev_capability_descriptor
-    *unwrapBOSDevCapabilityDescriptor(JNIEnv *env, jobject obj)
+    *unwrapBosDevCapabilityDescriptor(JNIEnv *env, jobject obj)
 {
     UNWRAP_POINTER(env, obj, struct libusb_bos_dev_capability_descriptor*,
         "bosDevCapabilityDescriptorPointer");
@@ -36,13 +36,13 @@ struct libusb_bos_dev_capability_descriptor
 /**
  * byte bLength()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDevCapabilityDescriptor, bLength)
+JNIEXPORT jbyte JNICALL METHOD_NAME(BosDevCapabilityDescriptor, bLength)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_dev_capability_descriptor* descriptor =
-        unwrapBOSDevCapabilityDescriptor(env, this);
+        unwrapBosDevCapabilityDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bLength;
 }
@@ -50,14 +50,14 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDevCapabilityDescriptor, bLength)
 /**
  * byte bDescriptorType()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDevCapabilityDescriptor,
+JNIEXPORT jbyte JNICALL METHOD_NAME(BosDevCapabilityDescriptor,
     bDescriptorType)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_dev_capability_descriptor* descriptor =
-        unwrapBOSDevCapabilityDescriptor(env, this);
+        unwrapBosDevCapabilityDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bDescriptorType;
 }
@@ -65,14 +65,14 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDevCapabilityDescriptor,
 /**
  * byte bDevCapabilityType()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDevCapabilityDescriptor,
+JNIEXPORT jbyte JNICALL METHOD_NAME(BosDevCapabilityDescriptor,
     bDevCapabilityType)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_dev_capability_descriptor* descriptor =
-        unwrapBOSDevCapabilityDescriptor(env, this);
+        unwrapBosDevCapabilityDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bDevCapabilityType;
 }
@@ -80,14 +80,14 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(BOSDevCapabilityDescriptor,
 /**
  * ByteBuffer devCapabilityData()
  */
-JNIEXPORT jobject JNICALL METHOD_NAME(BOSDevCapabilityDescriptor,
+JNIEXPORT jobject JNICALL METHOD_NAME(BosDevCapabilityDescriptor,
     devCapabilityData)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_bos_dev_capability_descriptor *descriptor =
-        unwrapBOSDevCapabilityDescriptor(env, this);
+        unwrapBosDevCapabilityDescriptor(env, this);
     if (!descriptor) return NULL;
     return (*env)->NewDirectByteBuffer(env, (void *)
         descriptor->dev_capability_data, descriptor->bLength - 3);
diff --git a/src/main/c/src/BOSDevCapabilityDescriptor.h b/src/main/c/src/BosDevCapabilityDescriptor.h
similarity index 73%
rename from src/main/c/src/BOSDevCapabilityDescriptor.h
rename to src/main/c/src/BosDevCapabilityDescriptor.h
index 2d92cad..82d553c 100644
--- a/src/main/c/src/BOSDevCapabilityDescriptor.h
+++ b/src/main/c/src/BosDevCapabilityDescriptor.h
@@ -8,9 +8,9 @@
 
 #include "usb4java.h"
 
-jobjectArray wrapBOSDevCapabilityDescriptors(JNIEnv*, int,
+jobjectArray wrapBosDevCapabilityDescriptors(JNIEnv*, int,
     struct libusb_bos_dev_capability_descriptor**);
 struct libusb_bos_dev_capability_descriptor
-    *unwrapBOSDevCapabilityDescriptor(JNIEnv *, jobject);
+    *unwrapBosDevCapabilityDescriptor(JNIEnv *, jobject);
 
 #endif
diff --git a/src/main/c/src/LibUsb.c b/src/main/c/src/LibUsb.c
index c59b5d4..bb19c5d 100644
--- a/src/main/c/src/LibUsb.c
+++ b/src/main/c/src/LibUsb.c
@@ -22,9 +22,9 @@
 #include "DeviceDescriptor.h"
 #include "ConfigDescriptor.h"
 #include "EndpointDescriptor.h"
-#include "SSEndpointCompanionDescriptor.h"
-#include "BOSDescriptor.h"
-#include "BOSDevCapabilityDescriptor.h"
+#include "SsEndpointCompanionDescriptor.h"
+#include "BosDescriptor.h"
+#include "BosDevCapabilityDescriptor.h"
 #include "Usb20ExtensionDescriptor.h"
 #include "Transfer.h"
 
@@ -711,9 +711,9 @@ JNIEXPORT void JNICALL METHOD_NAME(LibUsb, freeConfigDescriptor)
 }
 
 /**
- * int getSSEndpointCompanionDescriptor(Device, int, SSEndpointCompanionDescriptor)
+ * int getSsEndpointCompanionDescriptor(Device, int, SsEndpointCompanionDescriptor)
  */
-JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getSSEndpointCompanionDescriptor)
+JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getSsEndpointCompanionDescriptor)
 (
     JNIEnv *env, jclass class, jobject context, jobject endpointDescriptor,
     jobject companionDescriptor
@@ -728,31 +728,31 @@ JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getSSEndpointCompanionDescriptor)
     struct libusb_ss_endpoint_companion_descriptor *companion_descriptor;
     int result = libusb_get_ss_endpoint_companion_descriptor(ctx,
         endpoint_descriptor, &companion_descriptor);
-    if (!result) setSSEndpointCompanionDescriptor(env, companion_descriptor,
+    if (!result) setSsEndpointCompanionDescriptor(env, companion_descriptor,
         companionDescriptor);
     return result;
 }
 
 /**
- * void freeSSEndpointCompanionDescriptor(SSEndpointCompanionDescriptor)
+ * void freeSsEndpointCompanionDescriptor(SsEndpointCompanionDescriptor)
  */
-JNIEXPORT void JNICALL METHOD_NAME(LibUsb, freeSSEndpointCompanionDescriptor)
+JNIEXPORT void JNICALL METHOD_NAME(LibUsb, freeSsEndpointCompanionDescriptor)
 (
     JNIEnv *env, jclass class, jobject companionDescriptor
 )
 {
     if (!companionDescriptor) return;
     struct libusb_ss_endpoint_companion_descriptor *companion_descriptor =
-        unwrapSSEndpointCompanionDescriptor(env, companionDescriptor);
+        unwrapSsEndpointCompanionDescriptor(env, companionDescriptor);
     if (!companion_descriptor) return;
     libusb_free_ss_endpoint_companion_descriptor(companion_descriptor);
-    resetSSEndpointCompanionDescriptor(env, companionDescriptor);
+    resetSsEndpointCompanionDescriptor(env, companionDescriptor);
 }
 
 /**
- * int getBOSDescriptor(DeviceHandle, BOSDescriptor)
+ * int getBosDescriptor(DeviceHandle, BosDescriptor)
  */
-JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getBOSDescriptor)
+JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getBosDescriptor)
 (
     JNIEnv *env, jclass class, jobject handle, jobject descriptor
 )
@@ -763,28 +763,28 @@ JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getBOSDescriptor)
     if (!dev_handle) return 0;
     struct libusb_bos_descriptor *bos_descriptor;
     int result = libusb_get_bos_descriptor(dev_handle, &bos_descriptor);
-    if (!result) setBOSDescriptor(env, bos_descriptor, descriptor);
+    if (!result) setBosDescriptor(env, bos_descriptor, descriptor);
     return result;
 }
 
 /**
- * void freeBOSDescriptor(BOSDescriptor)
+ * void freeBosDescriptor(BosDescriptor)
  */
-JNIEXPORT void JNICALL METHOD_NAME(LibUsb, freeBOSDescriptor)
+JNIEXPORT void JNICALL METHOD_NAME(LibUsb, freeBosDescriptor)
 (
     JNIEnv *env, jclass class, jobject bosDescriptor
 )
 {
     if (!bosDescriptor) return;
     struct libusb_bos_descriptor *bos_descriptor =
-        unwrapBOSDescriptor(env, bosDescriptor);
+        unwrapBosDescriptor(env, bosDescriptor);
     if (!bos_descriptor) return;
     libusb_free_bos_descriptor(bos_descriptor);
-    resetBOSDescriptor(env, bosDescriptor);
+    resetBosDescriptor(env, bosDescriptor);
 }
 
 /**
- * int getUsb20ExtensionDescriptor(Context, BOSDevCapabilityDescriptor, Usb20ExtensionDescriptor)
+ * int getUsb20ExtensionDescriptor(Context, BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)
  */
 JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getUsb20ExtensionDescriptor)
 (
@@ -796,7 +796,7 @@ JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getUsb20ExtensionDescriptor)
     NOT_NULL(env, extensionDescriptor, return 0);
     libusb_context *ctx = unwrapContext(env, context);
     struct libusb_bos_dev_capability_descriptor *devcap_descriptor =
-        unwrapBOSDevCapabilityDescriptor(env, devCapDescriptor);
+        unwrapBosDevCapabilityDescriptor(env, devCapDescriptor);
     if (!devcap_descriptor) return 0;
     struct libusb_usb_2_0_extension_descriptor *extension_descriptor;
     int result = libusb_get_usb_2_0_extension_descriptor(ctx,
diff --git a/src/main/c/src/Makefile.am b/src/main/c/src/Makefile.am
index 1f1af70..e81ef89 100644
--- a/src/main/c/src/Makefile.am
+++ b/src/main/c/src/Makefile.am
@@ -18,7 +18,7 @@ libusb4java_la_SOURCES = \
     InterfaceDescriptor.c \
     EndpointDescriptor.c \
     Transfer.c \
-    SSEndpointCompanionDescriptor.c \
-    BOSDescriptor.c \
-    BOSDevCapabilityDescriptor.c \
+    SsEndpointCompanionDescriptor.c \
+    BosDescriptor.c \
+    BosDevCapabilityDescriptor.c \
     Usb20ExtensionDescriptor.c
diff --git a/src/main/c/src/SSEndpointCompanionDescriptor.c b/src/main/c/src/SsEndpointCompanionDescriptor.c
similarity index 66%
rename from src/main/c/src/SSEndpointCompanionDescriptor.c
rename to src/main/c/src/SsEndpointCompanionDescriptor.c
index f8b0755..eeb329c 100644
--- a/src/main/c/src/SSEndpointCompanionDescriptor.c
+++ b/src/main/c/src/SsEndpointCompanionDescriptor.c
@@ -3,24 +3,24 @@
  * See COPYING file for copying conditions
  */
 
-#include "SSEndpointCompanionDescriptor.h"
+#include "SsEndpointCompanionDescriptor.h"
 #include "Interface.h"
 
-void setSSEndpointCompanionDescriptor(JNIEnv* env,
+void setSsEndpointCompanionDescriptor(JNIEnv* env,
     struct libusb_ss_endpoint_companion_descriptor* descriptor, jobject object)
 {
     SET_POINTER(env, descriptor, object, "ssEndpointCompanionDescriptor");
 }
 
 struct libusb_ss_endpoint_companion_descriptor*
-    unwrapSSEndpointCompanionDescriptor(JNIEnv* env, jobject descriptor)
+    unwrapSsEndpointCompanionDescriptor(JNIEnv* env, jobject descriptor)
 {
     UNWRAP_POINTER(env, descriptor,
         struct libusb_ss_endpoint_companion_descriptor*,
         "ssEndpointCompanionDescriptor");
 }
 
-void resetSSEndpointCompanionDescriptor(JNIEnv* env, jobject obj)
+void resetSsEndpointCompanionDescriptor(JNIEnv* env, jobject obj)
 {
     RESET_POINTER(env, obj, "ssEndpointCompanionDescriptor");
 }
@@ -28,13 +28,13 @@ void resetSSEndpointCompanionDescriptor(JNIEnv* env, jobject obj)
 /**
  * byte bLength()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, bLength)
+JNIEXPORT jbyte JNICALL METHOD_NAME(SsEndpointCompanionDescriptor, bLength)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_ss_endpoint_companion_descriptor *descriptor =
-        unwrapSSEndpointCompanionDescriptor(env, this);
+        unwrapSsEndpointCompanionDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bLength;
 }
@@ -42,14 +42,14 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, bLength)
 /**
  * byte bDescriptorType()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor,
+JNIEXPORT jbyte JNICALL METHOD_NAME(SsEndpointCompanionDescriptor,
     bDescriptorType)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_ss_endpoint_companion_descriptor *descriptor =
-        unwrapSSEndpointCompanionDescriptor(env, this);
+        unwrapSsEndpointCompanionDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bDescriptorType;
 }
@@ -57,13 +57,13 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor,
 /**
  * byte bMaxBurst()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, bMaxBurst)
+JNIEXPORT jbyte JNICALL METHOD_NAME(SsEndpointCompanionDescriptor, bMaxBurst)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_ss_endpoint_companion_descriptor *descriptor =
-        unwrapSSEndpointCompanionDescriptor(env, this);
+        unwrapSsEndpointCompanionDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bMaxBurst;
 }
@@ -71,13 +71,13 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, bMaxBurst)
 /**
  * byte bmAttributes()
  */
-JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, bmAttributes)
+JNIEXPORT jbyte JNICALL METHOD_NAME(SsEndpointCompanionDescriptor, bmAttributes)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_ss_endpoint_companion_descriptor *descriptor =
-        unwrapSSEndpointCompanionDescriptor(env, this);
+        unwrapSsEndpointCompanionDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->bmAttributes;
 }
@@ -85,13 +85,13 @@ JNIEXPORT jbyte JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, bmAttributes)
 /**
  * short wBytesPerInterval()
  */
-JNIEXPORT jshort JNICALL METHOD_NAME(SSEndpointCompanionDescriptor, wBytesPerInterval)
+JNIEXPORT jshort JNICALL METHOD_NAME(SsEndpointCompanionDescriptor, wBytesPerInterval)
 (
     JNIEnv *env, jobject this
 )
 {
     struct libusb_ss_endpoint_companion_descriptor *descriptor =
-        unwrapSSEndpointCompanionDescriptor(env, this);
+        unwrapSsEndpointCompanionDescriptor(env, this);
     if (!descriptor) return 0;
     return descriptor->wBytesPerInterval;
 }
diff --git a/src/main/c/src/SSEndpointCompanionDescriptor.h b/src/main/c/src/SsEndpointCompanionDescriptor.h
similarity index 67%
rename from src/main/c/src/SSEndpointCompanionDescriptor.h
rename to src/main/c/src/SsEndpointCompanionDescriptor.h
index 58a71d6..e05d2be 100644
--- a/src/main/c/src/SSEndpointCompanionDescriptor.h
+++ b/src/main/c/src/SsEndpointCompanionDescriptor.h
@@ -8,10 +8,10 @@
 
 #include "usb4java.h"
 
-void setSSEndpointCompanionDescriptor(JNIEnv*,
+void setSsEndpointCompanionDescriptor(JNIEnv*,
     struct libusb_ss_endpoint_companion_descriptor*, jobject);
 struct libusb_ss_endpoint_companion_descriptor*
-    unwrapSSEndpointCompanionDescriptor(JNIEnv*, jobject);
-void resetSSEndpointCompanionDescriptor(JNIEnv*, jobject);
+    unwrapSsEndpointCompanionDescriptor(JNIEnv*, jobject);
+void resetSsEndpointCompanionDescriptor(JNIEnv*, jobject);
 
 #endif
diff --git a/src/main/java/de/ailis/usb4java/libusb/BOSDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/BosDescriptor.java
similarity index 92%
rename from src/main/java/de/ailis/usb4java/libusb/BOSDescriptor.java
rename to src/main/java/de/ailis/usb4java/libusb/BosDescriptor.java
index d7d0541..5b87d7d 100644
--- a/src/main/java/de/ailis/usb4java/libusb/BOSDescriptor.java
+++ b/src/main/java/de/ailis/usb4java/libusb/BosDescriptor.java
@@ -29,17 +29,17 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-public final class BOSDescriptor
+public final class BosDescriptor
 {
     /** The native pointer to the descriptor structure. */
     private long bosDescriptorPointer;
 
     /**
      * Constructs a new BOS descriptor which can be passed to the
-     * {@link LibUsb#getBOSDescriptor(DeviceHandle, BOSDescriptor)}
+     * {@link LibUsb#getBosDescriptor(DeviceHandle, BosDescriptor)}
      * method.
      */
-    public BOSDescriptor()
+    public BosDescriptor()
     {
         // Empty
     }
@@ -87,7 +87,7 @@ public final class BOSDescriptor
      * 
      * @return The array with device capability descriptors.
      */
-    public native BOSDevCapabilityDescriptor[] devCapability();
+    public native BosDevCapabilityDescriptor[] devCapability();
 
     /**
      * Returns a dump of this descriptor.
@@ -106,7 +106,7 @@ public final class BOSDescriptor
             bDescriptorType() & 0xff,
             wTotalLength() & 0xffff,
             bNumDeviceCaps() & 0xff));
-        for (final BOSDevCapabilityDescriptor descriptor: devCapability())
+        for (final BosDevCapabilityDescriptor descriptor: devCapability())
         {
             builder.append(descriptor.dump().replaceAll("(?m)^", "  "));
         }
@@ -119,8 +119,8 @@ public final class BOSDescriptor
         if (obj == null) return false;
         if (obj == this) return true;
         if (obj.getClass() != getClass()) return false;
-        final BOSDescriptor other =
-            (BOSDescriptor) obj;
+        final BosDescriptor other =
+            (BosDescriptor) obj;
         return new EqualsBuilder()
             .append(bDescriptorType(), other.bDescriptorType())
             .append(bLength(), other.bLength())
diff --git a/src/main/java/de/ailis/usb4java/libusb/BOSDevCapabilityDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/BosDevCapabilityDescriptor.java
similarity index 95%
rename from src/main/java/de/ailis/usb4java/libusb/BOSDevCapabilityDescriptor.java
rename to src/main/java/de/ailis/usb4java/libusb/BosDevCapabilityDescriptor.java
index f70157d..76d4445 100644
--- a/src/main/java/de/ailis/usb4java/libusb/BOSDevCapabilityDescriptor.java
+++ b/src/main/java/de/ailis/usb4java/libusb/BosDevCapabilityDescriptor.java
@@ -33,7 +33,7 @@ import de.ailis.usb4java.utils.DescriptorUtils;
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-public final class BOSDevCapabilityDescriptor
+public final class BosDevCapabilityDescriptor
 {
     /** The native pointer to the descriptor structure. */
     private long bosDevCapabilityDescriptorPointer;
@@ -42,7 +42,7 @@ public final class BOSDevCapabilityDescriptor
      * Package-private constructor to prevent manual instantiation. BOS device
      * capability descriptors are always created by JNI.
      */
-    BOSDevCapabilityDescriptor()
+    BosDevCapabilityDescriptor()
     {
         // Empty
     }
@@ -111,8 +111,8 @@ public final class BOSDevCapabilityDescriptor
         if (obj == null) return false;
         if (obj == this) return true;
         if (obj.getClass() != getClass()) return false;
-        final BOSDevCapabilityDescriptor other =
-            (BOSDevCapabilityDescriptor) obj;
+        final BosDevCapabilityDescriptor other =
+            (BosDevCapabilityDescriptor) obj;
         return new EqualsBuilder()
             .append(bDescriptorType(), other.bDescriptorType())
             .append(bLength(), other.bLength())
diff --git a/src/main/java/de/ailis/usb4java/libusb/LibUsb.java b/src/main/java/de/ailis/usb4java/libusb/LibUsb.java
index 5f8e29f..b6d7030 100644
--- a/src/main/java/de/ailis/usb4java/libusb/LibUsb.java
+++ b/src/main/java/de/ailis/usb4java/libusb/LibUsb.java
@@ -353,14 +353,14 @@ public final class LibUsb
     /**
      * BOS descriptor.
      * 
-     * @see BOSDescriptor
+     * @see BosDescriptor
      */
     public static final int DT_BOS = 0x0f;
 
     /**
      * Device Capability descriptor.
      * 
-     * @see BOSDevCapabilityDescriptor
+     * @see BosDevCapabilityDescriptor
      */
     public static final int DT_DEVICE_CAPABILITY = 0x10;
 
@@ -382,7 +382,7 @@ public final class LibUsb
     /**
      * SuperSpeed Endpoint Companion descriptor.
      * 
-     * @see SSEndpointCompanionDescriptor
+     * @see SsEndpointCompanionDescriptor
      */
     public static final int DT_SS_ENDPOINT_COMPANION = 0x30;
 
@@ -1441,20 +1441,20 @@ public final class LibUsb
      * @param companionDescriptor
      *            Output location for the superspeed endpoint companion
      *            descriptor. Only valid if 0 was returned. Must be freed with
-     *            {@link #freeSSEndpointCompanionDescriptor(
-     *            SSEndpointCompanionDescriptor)}
+     *            {@link #freeSsEndpointCompanionDescriptor(
+     *            SsEndpointCompanionDescriptor)}
      *            after use.
      * @return {@link #SUCCESS} on success, {@link #ERROR_NOT_FOUND} if the
      *         descriptor does not exist, another error code on error
      */
-    public static native int getSSEndpointCompanionDescriptor(
+    public static native int getSsEndpointCompanionDescriptor(
         final Context context, final EndpointDescriptor endpointDescriptor,
-        final SSEndpointCompanionDescriptor companionDescriptor);
+        final SsEndpointCompanionDescriptor companionDescriptor);
 
     /**
      * Free a superspeed endpoint companion descriptor obtained from
-     * {@link #getSSEndpointCompanionDescriptor(Context, EndpointDescriptor, 
-     * SSEndpointCompanionDescriptor)}.
+     * {@link #getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, 
+     * SsEndpointCompanionDescriptor)}.
      * 
      * It is safe to call this function with a NULL parameter, in which case the
      * function simply returns.
@@ -1462,8 +1462,8 @@ public final class LibUsb
      * @param companionDescriptor
      *            The superspeed endpoint companion descriptor to free
      */
-    public static native void freeSSEndpointCompanionDescriptor(
-        final SSEndpointCompanionDescriptor companionDescriptor);
+    public static native void freeSsEndpointCompanionDescriptor(
+        final SsEndpointCompanionDescriptor companionDescriptor);
 
     /**
      * Get a Binary Object Store (BOS) descriptor. This is a BLOCKING function,
@@ -1474,16 +1474,16 @@ public final class LibUsb
      * @param descriptor
      *            Output location for the BOS descriptor. Only valid if 0 was
      *            returned. Must be freed with
-     *            {@link #freeBOSDescriptor(BOSDescriptor)} after use.
+     *            {@link #freeBosDescriptor(BosDescriptor)} after use.
      * @return {@link #SUCCESS} on success, {@link #ERROR_NOT_FOUND} if the
      *         device doesn't have a BOS descriptor, another error code on error
      */
-    public static native int getBOSDescriptor(final DeviceHandle handle,
-        final BOSDescriptor descriptor);
+    public static native int getBosDescriptor(final DeviceHandle handle,
+        final BosDescriptor descriptor);
 
     /**
      * Free a BOS descriptor obtained from
-     * {@link #getBOSDescriptor(DeviceHandle, BOSDescriptor)}.
+     * {@link #getBosDescriptor(DeviceHandle, BosDescriptor)}.
      * 
      * It is safe to call this function with a NULL parameter, in which case the
      * function simply returns.
@@ -1491,7 +1491,7 @@ public final class LibUsb
      * @param descriptor
      *            The BOS descriptor to free.
      */
-    public static native void freeBOSDescriptor(final BOSDescriptor
+    public static native void freeBosDescriptor(final BosDescriptor
         descriptor);
 
     /**
@@ -1511,12 +1511,12 @@ public final class LibUsb
      */
     public static native int getUsb20ExtensionDescriptor(
         final Context context,
-        final BOSDevCapabilityDescriptor devCapDescriptor,
+        final BosDevCapabilityDescriptor devCapDescriptor,
         final Usb20ExtensionDescriptor extensionDescriptor);
 
     /**
      * Free a USB 2.0 Extension descriptor obtained from
-     * {@link #getUsb20ExtensionDescriptor(Context, BOSDevCapabilityDescriptor, 
+     * {@link #getUsb20ExtensionDescriptor(Context, BosDevCapabilityDescriptor, 
      * Usb20ExtensionDescriptor)}.
      * 
      * It is safe to call this function with a NULL parameter, in which case 
diff --git a/src/main/java/de/ailis/usb4java/libusb/SSEndpointCompanionDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/SsEndpointCompanionDescriptor.java
similarity index 93%
rename from src/main/java/de/ailis/usb4java/libusb/SSEndpointCompanionDescriptor.java
rename to src/main/java/de/ailis/usb4java/libusb/SsEndpointCompanionDescriptor.java
index 0b2a445..7c7b19c 100644
--- a/src/main/java/de/ailis/usb4java/libusb/SSEndpointCompanionDescriptor.java
+++ b/src/main/java/de/ailis/usb4java/libusb/SsEndpointCompanionDescriptor.java
@@ -29,18 +29,18 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-public final class SSEndpointCompanionDescriptor
+public final class SsEndpointCompanionDescriptor
 {
     /** The native pointer to the descriptor structure. */
     private long ssEndpointCompanionDescriptor;
 
     /**
      * Constructs a new descriptor which can be passed to the
-     * {@link LibUsb#getSSEndpointCompanionDescriptor(Context, 
-     * EndpointDescriptor, SSEndpointCompanionDescriptor)}
+     * {@link LibUsb#getSsEndpointCompanionDescriptor(Context, 
+     * EndpointDescriptor, SsEndpointCompanionDescriptor)}
      * method.
      */
-    public SSEndpointCompanionDescriptor()
+    public SsEndpointCompanionDescriptor()
     {
         // Empty
     }
@@ -121,8 +121,8 @@ public final class SSEndpointCompanionDescriptor
         if (obj == null) return false;
         if (obj == this) return true;
         if (obj.getClass() != getClass()) return false;
-        final SSEndpointCompanionDescriptor other =
-            (SSEndpointCompanionDescriptor) obj;
+        final SsEndpointCompanionDescriptor other =
+            (SsEndpointCompanionDescriptor) obj;
         return new EqualsBuilder()
             .append(bDescriptorType(), other.bDescriptorType())
             .append(bLength(), other.bLength())
diff --git a/src/main/java/de/ailis/usb4java/libusb/Usb20ExtensionDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/Usb20ExtensionDescriptor.java
index 25ee5e4..73d3e27 100644
--- a/src/main/java/de/ailis/usb4java/libusb/Usb20ExtensionDescriptor.java
+++ b/src/main/java/de/ailis/usb4java/libusb/Usb20ExtensionDescriptor.java
@@ -37,7 +37,7 @@ public final class Usb20ExtensionDescriptor
     /**
      * Constructs a new BOS descriptor which can be passed to the
      * {@link LibUsb#getUsb20ExtensionDescriptor(Context, 
-     * BOSDevCapabilityDescriptor, Usb20ExtensionDescriptor)} method.
+     * BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)} method.
      */
     public Usb20ExtensionDescriptor()
     {
diff --git a/src/test/java/de/ailis/usb4java/libusb/BOSDescriptorTest.java b/src/test/java/de/ailis/usb4java/libusb/BosDescriptorTest.java
similarity index 82%
rename from src/test/java/de/ailis/usb4java/libusb/BOSDescriptorTest.java
rename to src/test/java/de/ailis/usb4java/libusb/BosDescriptorTest.java
index 7c64121..70a164e 100644
--- a/src/test/java/de/ailis/usb4java/libusb/BOSDescriptorTest.java
+++ b/src/test/java/de/ailis/usb4java/libusb/BosDescriptorTest.java
@@ -12,14 +12,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Tests the {@link BOSDescriptor} class.
+ * Tests the {@link BosDescriptor} class.
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-public class BOSDescriptorTest
+public class BosDescriptorTest
 {
     /** The test subject. */
-    private BOSDescriptor descriptor;
+    private BosDescriptor descriptor;
 
     /**
      * Setup test.
@@ -29,7 +29,7 @@ public class BOSDescriptorTest
     {
         assumeUsbTestsEnabled();
         LibUsb.init(null);
-        this.descriptor = new BOSDescriptor();
+        this.descriptor = new BosDescriptor();
     }
     
     /**
@@ -43,7 +43,7 @@ public class BOSDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDescriptor#bLength()}
+     * {@link BosDescriptor#bLength()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedLength()
@@ -54,7 +54,7 @@ public class BOSDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDescriptor#bDescriptorType()}
+     * {@link BosDescriptor#bDescriptorType()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDescriptorType()
@@ -65,7 +65,7 @@ public class BOSDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDescriptor#wTotalLength()}
+     * {@link BosDescriptor#wTotalLength()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedTotalLength()
@@ -76,7 +76,7 @@ public class BOSDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDescriptor#bNumDeviceCaps()}
+     * {@link BosDescriptor#bNumDeviceCaps()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedNumDeviceCaps()
@@ -87,7 +87,7 @@ public class BOSDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDescriptor#devCapability()}
+     * {@link BosDescriptor#devCapability()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDevCapability()
diff --git a/src/test/java/de/ailis/usb4java/libusb/BOSDevCapabilityDescriptorTest.java b/src/test/java/de/ailis/usb4java/libusb/BosDevCapabilityDescriptorTest.java
similarity index 78%
rename from src/test/java/de/ailis/usb4java/libusb/BOSDevCapabilityDescriptorTest.java
rename to src/test/java/de/ailis/usb4java/libusb/BosDevCapabilityDescriptorTest.java
index 3a3cb75..fbb01b6 100644
--- a/src/test/java/de/ailis/usb4java/libusb/BOSDevCapabilityDescriptorTest.java
+++ b/src/test/java/de/ailis/usb4java/libusb/BosDevCapabilityDescriptorTest.java
@@ -12,14 +12,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Tests the {@link BOSDevCapabilityDescriptor} class.
+ * Tests the {@link BosDevCapabilityDescriptor} class.
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-public class BOSDevCapabilityDescriptorTest
+public class BosDevCapabilityDescriptorTest
 {
     /** The test subject. */
-    private BOSDevCapabilityDescriptor descriptor;
+    private BosDevCapabilityDescriptor descriptor;
 
     /**
      * Setup test.
@@ -29,7 +29,7 @@ public class BOSDevCapabilityDescriptorTest
     {
         assumeUsbTestsEnabled();
         LibUsb.init(null);
-        this.descriptor = new BOSDevCapabilityDescriptor();
+        this.descriptor = new BosDevCapabilityDescriptor();
     }
     
     /**
@@ -43,7 +43,7 @@ public class BOSDevCapabilityDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDevCapabilityDescriptor#bLength()}
+     * {@link BosDevCapabilityDescriptor#bLength()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedLength()
@@ -54,7 +54,7 @@ public class BOSDevCapabilityDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDevCapabilityDescriptor#bDescriptorType()}
+     * {@link BosDevCapabilityDescriptor#bDescriptorType()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDescriptorType()
@@ -65,7 +65,7 @@ public class BOSDevCapabilityDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDevCapabilityDescriptor#bDevCapabilityType()}
+     * {@link BosDevCapabilityDescriptor#bDevCapabilityType()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDevCapabilityType()
@@ -76,7 +76,7 @@ public class BOSDevCapabilityDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link BOSDevCapabilityDescriptor#devCapabilityData()}
+     * {@link BosDevCapabilityDescriptor#devCapabilityData()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDevCapabilityData()
diff --git a/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java b/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java
index 280b3c5..bc1882d 100644
--- a/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java
+++ b/src/test/java/de/ailis/usb4java/libusb/LibUSBTest.java
@@ -636,105 +636,105 @@ public class LibUSBTest
 
     /**
      * Tests the
-     * {@link LibUsb#getSSEndpointCompanionDescriptor(Context, EndpointDescriptor, SSEndpointCompanionDescriptor)}
+     * {@link LibUsb#getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, SsEndpointCompanionDescriptor)}
      * method with uninitialized endpoint.
      */
     @Test(expected = IllegalStateException.class)
-    public void testGetSSEndpointCompanionDescriptorWithUninitializedEndpoint()
+    public void testGetSsEndpointCompanionDescriptorWithUninitializedEndpoint()
     {
         assumeUsbTestsEnabled();
-        LibUsb.getSSEndpointCompanionDescriptor(null, new EndpointDescriptor(), 
-            new SSEndpointCompanionDescriptor());
+        LibUsb.getSsEndpointCompanionDescriptor(null, new EndpointDescriptor(), 
+            new SsEndpointCompanionDescriptor());
     }
 
     /**
      * Tests the
-     * {@link LibUsb#getSSEndpointCompanionDescriptor(Context, EndpointDescriptor, SSEndpointCompanionDescriptor)}
+     * {@link LibUsb#getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, SsEndpointCompanionDescriptor)}
      * method without descriptors.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testGetSSEndpointCompanionDescriptorWithoutDescriptors()
+    public void testGetSsEndpointCompanionDescriptorWithoutDescriptors()
     {
         assumeUsbTestsEnabled();
-        LibUsb.getSSEndpointCompanionDescriptor(null, null, null);
+        LibUsb.getSsEndpointCompanionDescriptor(null, null, null);
     }
 
     /**
      * Tests the
-     * {@link LibUsb#freeSSEndpointCompanionDescriptor(SSEndpointCompanionDescriptor)}
+     * {@link LibUsb#freeSsEndpointCompanionDescriptor(SsEndpointCompanionDescriptor)}
      * method with uninitialized descriptor.
      */
     @Test(expected = IllegalStateException.class)
-    public void testFreeSSEndpointCompanionDescriptorWithUninitializedDescriptor()
+    public void testFreeSsEndpointCompanionDescriptorWithUninitializedDescriptor()
     {
         assumeUsbTestsEnabled();
-        LibUsb.freeSSEndpointCompanionDescriptor(new SSEndpointCompanionDescriptor());
+        LibUsb.freeSsEndpointCompanionDescriptor(new SsEndpointCompanionDescriptor());
     }
 
     /**
      * Tests the
-     * {@link LibUsb#freeSSEndpointCompanionDescriptor(SSEndpointCompanionDescriptor)}
+     * {@link LibUsb#freeSsEndpointCompanionDescriptor(SsEndpointCompanionDescriptor)}
      * method with null parameter. Must do nothing.
      */
     @Test
-    public void testFreeSSEndpointCompanionDescriptorWithNull()
+    public void testFreeSsEndpointCompanionDescriptorWithNull()
     {
         assumeUsbTestsEnabled();
-        LibUsb.freeSSEndpointCompanionDescriptor(null);
+        LibUsb.freeSsEndpointCompanionDescriptor(null);
     }
     
     /**
      * Tests the
-     * {@link LibUsb#getBOSDescriptor(DeviceHandle, BOSDescriptor)}
+     * {@link LibUsb#getBosDescriptor(DeviceHandle, BosDescriptor)}
      * method with uninitialized handled.
      */
     @Test(expected = IllegalStateException.class)
-    public void testGetBOSDescriptorWithUninitializedHandle()
+    public void testGetBosDescriptorWithUninitializedHandle()
     {
         assumeUsbTestsEnabled();
-        LibUsb.getBOSDescriptor(new DeviceHandle(), new BOSDescriptor());
+        LibUsb.getBosDescriptor(new DeviceHandle(), new BosDescriptor());
     }
 
     /**
      * Tests the
-     * {@link LibUsb#getBOSDescriptor(DeviceHandle, BOSDescriptor)}
+     * {@link LibUsb#getBosDescriptor(DeviceHandle, BosDescriptor)}
      * method without handle.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testGetBOSDescriptorWithoutHandle()
+    public void testGetBosDescriptorWithoutHandle()
     {
         assumeUsbTestsEnabled();
-        LibUsb.getBOSDescriptor(null, new BOSDescriptor());
+        LibUsb.getBosDescriptor(null, new BosDescriptor());
     }
 
     /**
      * Tests the
-     * {@link LibUsb#freeBOSDescriptor(BOSDescriptor)}
+     * {@link LibUsb#freeBosDescriptor(BosDescriptor)}
      * method with uninitialized descriptor.
      */
     @Test(expected = IllegalStateException.class)
-    public void testFreeBOSDescriptorWithUninitializedDescriptor()
+    public void testFreeBosDescriptorWithUninitializedDescriptor()
     {
         assumeUsbTestsEnabled();
-        LibUsb.freeBOSDescriptor(new BOSDescriptor());
+        LibUsb.freeBosDescriptor(new BosDescriptor());
     }
 
     /**
      * Tests the
-     * {@link LibUsb#freeBOSDescriptor(BOSDescriptor)}
+     * {@link LibUsb#freeBosDescriptor(BosDescriptor)}
      * method with null parameter. Must do nothing.
      */
     @Test
-    public void testFreeBOSDescriptorWithNull()
+    public void testFreeBosDescriptorWithNull()
     {
         assumeUsbTestsEnabled();
-        LibUsb.freeBOSDescriptor(null);
+        LibUsb.freeBosDescriptor(null);
     }
     
     /**
      * Tests the
      * {@link LibUsb#getUsb20ExtensionDescriptor(Context, 
-     * BOSDevCapabilityDescriptor, Usb20ExtensionDescriptor)}
+     * BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)}
      * method with uninitialized endpoint.
      */
     @Test(expected = IllegalStateException.class)
@@ -742,14 +742,14 @@ public class LibUSBTest
     {
         assumeUsbTestsEnabled();
         LibUsb.getUsb20ExtensionDescriptor(null, 
-            new BOSDevCapabilityDescriptor(), 
+            new BosDevCapabilityDescriptor(), 
             new Usb20ExtensionDescriptor());
     }
 
     /**
      * Tests the
      * {@link LibUsb#getUsb20ExtensionDescriptor(Context, 
-     * BOSDevCapabilityDescriptor, Usb20ExtensionDescriptor)}
+     * BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)}
      * method without descriptors.
      */
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/de/ailis/usb4java/libusb/SSEndpointCompanionDescriptorTest.java b/src/test/java/de/ailis/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
similarity index 77%
rename from src/test/java/de/ailis/usb4java/libusb/SSEndpointCompanionDescriptorTest.java
rename to src/test/java/de/ailis/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
index 09100d4..bbdc84c 100644
--- a/src/test/java/de/ailis/usb4java/libusb/SSEndpointCompanionDescriptorTest.java
+++ b/src/test/java/de/ailis/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
@@ -12,14 +12,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Tests the {@link SSEndpointCompanionDescriptor} class.
+ * Tests the {@link SsEndpointCompanionDescriptor} class.
  * 
  * @author Klaus Reimer (k@ailis.de)
  */
-public class SSEndpointCompanionDescriptorTest
+public class SsEndpointCompanionDescriptorTest
 {
     /** The test subject. */
-    private SSEndpointCompanionDescriptor descriptor;
+    private SsEndpointCompanionDescriptor descriptor;
 
     /**
      * Setup test.
@@ -29,7 +29,7 @@ public class SSEndpointCompanionDescriptorTest
     {
         assumeUsbTestsEnabled();
         LibUsb.init(null);
-        this.descriptor = new SSEndpointCompanionDescriptor();
+        this.descriptor = new SsEndpointCompanionDescriptor();
     }
     
     /**
@@ -43,7 +43,7 @@ public class SSEndpointCompanionDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link SSEndpointCompanionDescriptor#bLength()}
+     * {@link SsEndpointCompanionDescriptor#bLength()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedLength()
@@ -54,7 +54,7 @@ public class SSEndpointCompanionDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link SSEndpointCompanionDescriptor#bDescriptorType()}
+     * {@link SsEndpointCompanionDescriptor#bDescriptorType()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDescriptorType()
@@ -65,7 +65,7 @@ public class SSEndpointCompanionDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link SSEndpointCompanionDescriptor#bMaxBurst()}
+     * {@link SsEndpointCompanionDescriptor#bMaxBurst()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDescriptorMaxBurst()
@@ -76,7 +76,7 @@ public class SSEndpointCompanionDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link SSEndpointCompanionDescriptor#bmAttributes()}
+     * {@link SsEndpointCompanionDescriptor#bmAttributes()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDescriptorAttributes()
@@ -87,7 +87,7 @@ public class SSEndpointCompanionDescriptorTest
 
     /**
      * Tests uninitialized access to
-     * {@link SSEndpointCompanionDescriptor#wBytesPerInterval()}
+     * {@link SsEndpointCompanionDescriptor#wBytesPerInterval()}
      */
     @Test(expected = IllegalStateException.class)
     public void testUninitializedDescriptorBytesPerInterval()