diff --git a/os/hal/ports/AVR/TINY/ATTinyxxx/platform.mk b/os/hal/ports/AVR/TINY/ATTinyxxx/platform.mk
index 87a6a5876..551ca284c 100644
--- a/os/hal/ports/AVR/TINY/ATTinyxxx/platform.mk
+++ b/os/hal/ports/AVR/TINY/ATTinyxxx/platform.mk
@@ -7,7 +7,7 @@ PLATFORMINC = ${CHIBIOS}/os/hal/ports/AVR/TINY/ATTinyxxx/
 # Drivers compatible with the platform.
 PLATFORMINC = ${CHIBIOS}/os/hal/ports/AVR/TINY/ATTinyxxx/
 include ${CHIBIOS}/os/hal/ports/AVR/TINY/LLD/GPIOv1/driver.mk
-include ${CHIBIOS}/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk
+include ${CHIBIOS}/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/driver.mk
 include ${CHIBIOS}/os/hal/ports/AVR/TINY/LLD/USARTv1/driver.mk
 
 # Shared variables
diff --git a/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/driver.mk b/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/driver.mk
new file mode 100644
index 000000000..7c62898bc
--- /dev/null
+++ b/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/driver.mk
@@ -0,0 +1,3 @@
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/hal_st_lld.c
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/TINY/LLD/SYSTICKv1
diff --git a/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c b/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/hal_st_lld.c
similarity index 100%
rename from os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.c
rename to os/hal/ports/AVR/TINY/LLD/SYSTICKv1/hal_st_lld.c
diff --git a/os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.h b/os/hal/ports/AVR/TINY/LLD/SYSTICKv1/hal_st_lld.h
similarity index 100%
rename from os/hal/ports/AVR/TINY/LLD/TIMv1/hal_st_lld.h
rename to os/hal/ports/AVR/TINY/LLD/SYSTICKv1/hal_st_lld.h
diff --git a/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk b/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk
deleted file mode 100644
index f7cb649b5..000000000
--- a/os/hal/ports/AVR/TINY/LLD/TIMv1/driver.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-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/LLD/TIMv1/hal_gpt_lld.c
-endif
-ifneq ($(findstring HAL_USE_ICU TRUE,$(HALCONF)),)
-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/LLD/TIMv1/hal_pwm_lld.c
-endif
-else
-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/LLD/TIMv1