diff --git a/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk b/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk
index 982db5635..f7cb649b5 100644
--- a/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk
+++ b/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk
@@ -1,19 +1,19 @@
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_st_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c
 
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_GPT TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_gpt_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_gpt_lld.c
 endif
 ifneq ($(findstring HAL_USE_ICU TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_icu_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_icu_lld.c
 endif
 ifneq ($(findstring HAL_USE_PWM TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_pwm_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_pwm_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_gpt_lld.c
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_icu_lld.c
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1/hal_pwm_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_gpt_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_icu_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_pwm_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/TINY/TIMv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/TIMv1
diff --git a/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c b/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c
index 4732ec7dd..ad9e3b4ba 100644
--- a/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c
+++ b/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c
@@ -15,8 +15,8 @@
 */
 
 /**
- * @file    hal_st_lld.c
- * @brief   AVR ST subsystem low level driver source.
+ * @file    TIMv1/hal_st_lld.c
+ * @brief   AVR Tiny ST subsystem low level driver source file.
  *
  * @addtogroup ST
  * @{
diff --git a/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.h b/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.h
index a5b58e693..35ae441b9 100644
--- a/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.h
+++ b/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.h
@@ -15,8 +15,8 @@
 */
 
 /**
- * @file    hal_st_lld.h
- * @brief   ST Driver subsystem low level driver header.
+ * @file    TIMv1/hal_st_lld.h
+ * @brief   AVR Tiny ST Driver subsystem low level driver header file.
  * @details This header is designed to be include-able without having to
  *          include other files from the HAL.
  *