diff --git a/firmware/ChibiOS-Contrib b/firmware/ChibiOS-Contrib
index 61baa6b036..0a0aa7491d 160000
--- a/firmware/ChibiOS-Contrib
+++ b/firmware/ChibiOS-Contrib
@@ -1 +1 @@
-Subproject commit 61baa6b036138c155f7cfc5646d833d9423f3243
+Subproject commit 0a0aa7491dc24b7d984c4d391b9647e270af7c53
diff --git a/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c b/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c
index 98795bdb42..b41a83031d 100644
--- a/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c
+++ b/firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c
@@ -251,48 +251,35 @@ static const USBDescriptor *get_descriptor(USBDriver *usbp,
   return NULL;
 }
 
-/**
- * @brief   IN EP1 state.
- */
-static USBInEndpointState ep1instate;
-
-/**
- * @brief   OUT EP1 state.
- */
-static USBOutEndpointState ep1outstate;
-
-/**
- * @brief   EP1 initialization structure (both IN and OUT).
- */
-static const USBEndpointConfig ep1config = {
+// IN CDC data state.
+static USBInEndpointState cdcDataInstate;
+// OUT CDC data state.
+static USBOutEndpointState cdcDataOutstate;
+// CDC data initialization structure (both IN and OUT).
+static const USBEndpointConfig cdcDataEpConfig = {
   USB_EP_MODE_TYPE_BULK,
   NULL,
   sduDataTransmitted,
   sduDataReceived,
   0x0040,
   0x0040,
-  &ep1instate,
-  &ep1outstate,
+  &cdcDataInstate,
+  &cdcDataOutstate,
   4,
   NULL
 };
 
-/**
- * @brief   IN EP2 state.
- */
-static USBInEndpointState ep2instate;
-
-/**
- * @brief   EP2 initialization structure (IN only).
- */
-static const USBEndpointConfig ep2config = {
+// IN CDC interrupt state.
+static USBInEndpointState cdcInterruptInstate;
+// CDC interrupt initialization structure (IN only).
+static const USBEndpointConfig cdcInterruptEpConfig = {
   USB_EP_MODE_TYPE_INTR,
   NULL,
   sduInterruptTransmitted,
   NULL,
   0x0010,
   0x0000,
-  &ep2instate,
+  &cdcInterruptInstate,
   NULL,
   1,
   NULL
@@ -311,8 +298,8 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
     /* Enables the endpoints specified into the configuration.
        Note, this callback is invoked from an ISR so I-Class functions
        must be used.*/
-    usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &ep1config);
-    usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &ep2config);
+    usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &cdcDataEpConfig);
+    usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &cdcInterruptEpConfig);
 
     /* Resetting the state of the CDC subsystem.*/
     sduConfigureHookI(&SDU1);