diff --git a/Core/Src/canlog.c b/Core/Src/canlog.c
index 2363247..5d3f85f 100644
--- a/Core/Src/canlog.c
+++ b/Core/Src/canlog.c
@@ -93,34 +93,31 @@ void CAN_Logger_Init(CAN_HandleTypeDef *hcan1, CAN_HandleTypeDef *hcan2)
 }
 /* END CAN_Logger_Init */
 
-static void CAN_Listen(void *argument){}
-
-/* BEGIN vCAN_Get */
+/* BEGIN vCAN_Logger_Listen */
 /**
   * @brief  Log incoming CAN bus traffic in FIFO buffer
   * @param  argument: Not used
   * @retval None
   */
-void vCAN_Get(void *argument)
+static void vCAN_Logger_Listen(void *argument)
 {
-  /* CODE BEGIN */
-  /* Infinite loop */
-  for(;;)
-  {
-    osDelay(1);
-  }
-  /* CODE END */
+    /* CODE BEGIN */
+    /* Infinite loop */
+    for(;;)
+    {
+      osDelay(1);
+    }
+    /* CODE END */
 }
-/* END vCAN_Get */
+/* END vCAN_Logger_Listen */
 
-
-/* BEGIN vLED_HeartbeatOnCanRx */
+/* BEGIN vLED_Heartbeat */
 /**
-  * @brief  Blink a LED in heartbeat mode when there is CAN traffic detected
+  * @brief  Blink a LED in heartbeat mode when CAN traffic is detected
   * @param  argument: LED GPIO (port and pin)
   * @retval None
   */
-void vLED_HeartbeatOnCanRx(void *argument)
+void vLED_Heartbeat(void *argument)
 {
   /* CODE BEGIN */
   LED_Config *led = (LED_Config*)argument;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index cee9f46..d3c4ab3 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -66,8 +66,8 @@ static void MX_CAN2_Init(void);
 static void MX_SDIO_SD_Init(void);
 
 /* USER CODE BEGIN PFP */
-void vCAN_Get(void *argument);
-void vLED_HeartbeatOnCanRx(void *argument);
+void vCAN_Logger_Listen(void *argument);
+void vLED_Heartbeat(void *argument);
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/
@@ -134,10 +134,10 @@ int main(void)
   /* USER CODE END RTOS_QUEUES */
 
   /* USER CODE BEGIN RTOS_THREADS */
-  vCAN1_rx = osThreadNew(vCAN_Get, &hcan1, &vCAN1_rx_attributes);
-  vCAN2_rx = osThreadNew(vCAN_Get, &hcan2, &vCAN2_rx_attributes);
-  vLED_CAN1_Heartbeat = osThreadNew(vLED_HeartbeatOnCanRx, &led_can1, &vLED_CAN1_Heartbeat_attributes);
-  vLED_CAN2_Heartbeat = osThreadNew(vLED_HeartbeatOnCanRx, &led_can2, &vLED_CAN2_Heartbeat_attributes);
+  vCAN1_rx = osThreadNew(vCAN_Logger_Listen, &hcan1, &vCAN1_rx_attributes);
+  vCAN2_rx = osThreadNew(vCAN_Logger_Listen, &hcan2, &vCAN2_rx_attributes);
+  vLED_CAN1_Heartbeat = osThreadNew(vLED_Heartbeat, &led_can1, &vLED_CAN1_Heartbeat_attributes);
+  vLED_CAN2_Heartbeat = osThreadNew(vLED_Heartbeat, &led_can2, &vLED_CAN2_Heartbeat_attributes);
   /* USER CODE END RTOS_THREADS */
 
   /* USER CODE BEGIN RTOS_EVENTS */