diff --git a/_targets/Makefile.sparcv8leon3-generic b/_targets/Makefile.sparcv8leon-generic
similarity index 79%
rename from _targets/Makefile.sparcv8leon3-generic
rename to _targets/Makefile.sparcv8leon-generic
index b9c56eebd..0f994e978 100644
--- a/_targets/Makefile.sparcv8leon3-generic
+++ b/_targets/Makefile.sparcv8leon-generic
@@ -1,7 +1,7 @@
 #
 # Makefile for Phoenix-RTOS 3 device drivers
 #
-# sparcv8leon3-generic drivers
+# sparcv8leon-generic drivers
 #
 # Copyright 2024 Phoenix Systems
 #
diff --git a/_targets/Makefile.sparcv8leon3-gr712rc b/_targets/Makefile.sparcv8leon-gr712rc
similarity index 81%
rename from _targets/Makefile.sparcv8leon3-gr712rc
rename to _targets/Makefile.sparcv8leon-gr712rc
index 7b3a57383..0724bd6ef 100644
--- a/_targets/Makefile.sparcv8leon3-gr712rc
+++ b/_targets/Makefile.sparcv8leon-gr712rc
@@ -1,7 +1,7 @@
 #
 # Makefile for Phoenix-RTOS 3 device drivers
 #
-# sparcv8leon3-gr712rc drivers
+# sparcv8leon-gr712rc drivers
 #
 # Copyright 2023 Phoenix Systems
 #
diff --git a/_targets/Makefile.sparcv8leon3-gr716 b/_targets/Makefile.sparcv8leon-gr716
similarity index 83%
rename from _targets/Makefile.sparcv8leon3-gr716
rename to _targets/Makefile.sparcv8leon-gr716
index 3489293b3..9abc8b070 100644
--- a/_targets/Makefile.sparcv8leon3-gr716
+++ b/_targets/Makefile.sparcv8leon-gr716
@@ -1,7 +1,7 @@
 #
 # Makefile for Phoenix-RTOS 3 device drivers
 #
-# sparcv8leon3-gr716 drivers
+# sparcv8leon-gr716 drivers
 #
 # Copyright 2023 Phoenix Systems
 #
diff --git a/dma/grdmac2/grdmac2.c b/dma/grdmac2/grdmac2.c
index 5f029c4e7..6b2a2114f 100644
--- a/dma/grdmac2/grdmac2.c
+++ b/dma/grdmac2/grdmac2.c
@@ -18,7 +18,7 @@
 #include <sys/platform.h>
 
 #include <phoenix/gaisler/ambapp.h>
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 
 #include "grdmac2.h"
 
diff --git a/multi/grlib-multi/adc.c b/multi/grlib-multi/adc.c
index da664ad20..352da4bf6 100644
--- a/multi/grlib-multi/adc.c
+++ b/multi/grlib-multi/adc.c
@@ -20,7 +20,7 @@
 #include <sys/threads.h>
 #include <posix/utils.h>
 
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 
 #include "adc.h"
 #include "grlib-multi.h"
diff --git a/multi/grlib-multi/gpio.c b/multi/grlib-multi/gpio.c
index ce9a066d3..4fe8ade43 100644
--- a/multi/grlib-multi/gpio.c
+++ b/multi/grlib-multi/gpio.c
@@ -22,7 +22,7 @@
 #include "gpio.h"
 #include "grlib-multi.h"
 
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 
 #define GPIO_PORT_0 0
 #define GPIO_PORT_1 1
diff --git a/multi/grlib-multi/spacewire.c b/multi/grlib-multi/spacewire.c
index 21bbef3eb..bdcbf4c99 100644
--- a/multi/grlib-multi/spacewire.c
+++ b/multi/grlib-multi/spacewire.c
@@ -27,14 +27,14 @@
 #include <posix/utils.h>
 
 #if defined(__CPU_GR716)
-#include <phoenix/arch/sparcv8leon3/gr716/gr716.h>
+#include <phoenix/arch/sparcv8leon/gr716/gr716.h>
 #elif defined(__CPU_GR712RC)
-#include <phoenix/arch/sparcv8leon3/gr712rc/gr712rc.h>
+#include <phoenix/arch/sparcv8leon/gr712rc/gr712rc.h>
 #else
 #error Unsupported target
 #endif
 
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 
 #include "spacewire.h"
 #include "grlib-multi.h"
diff --git a/multi/grlib-multi/spi.c b/multi/grlib-multi/spi.c
index 159e56f8e..f61886bb7 100644
--- a/multi/grlib-multi/spi.c
+++ b/multi/grlib-multi/spi.c
@@ -22,7 +22,7 @@
 #include <sys/threads.h>
 #include <posix/utils.h>
 
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 
 #include "spi.h"
 #include "grlib-multi.h"
diff --git a/multi/grlib-multi/uart.c b/multi/grlib-multi/uart.c
index 30841c7a8..50b45464a 100644
--- a/multi/grlib-multi/uart.c
+++ b/multi/grlib-multi/uart.c
@@ -30,7 +30,7 @@
 
 #include <phoenix/ioctl.h>
 
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 
 #include <grdmac2.h>
 
diff --git a/storage/gr716-flash/spimctrl.h b/storage/gr716-flash/spimctrl.h
index dfcad4ca7..154387279 100644
--- a/storage/gr716-flash/spimctrl.h
+++ b/storage/gr716-flash/spimctrl.h
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#include <phoenix/arch/sparcv8leon3/gr716/gr716.h>
+#include <phoenix/arch/sparcv8leon/gr716/gr716.h>
 
 
 #define SPIMCTRL_NUM 2
diff --git a/tty/grlib-uart/grlib-uart.c b/tty/grlib-uart/grlib-uart.c
index a094dc24a..41cca4737 100644
--- a/tty/grlib-uart/grlib-uart.c
+++ b/tty/grlib-uart/grlib-uart.c
@@ -1,7 +1,7 @@
 /*
  * Phoenix-RTOS
  *
- * sparcv8leon3-grlib UART driver
+ * sparcv8leon-grlib UART driver
  *
  * Copyright 2023 Phoenix Systems
  * Author: Lukasz Leczkowski
@@ -34,8 +34,8 @@
 
 #include <phoenix/ioctl.h>
 
-#if defined(__TARGET_SPARCV8LEON3)
-#include <phoenix/arch/sparcv8leon3/sparcv8leon3.h>
+#if defined(__TARGET_SPARCV8LEON)
+#include <phoenix/arch/sparcv8leon/sparcv8leon.h>
 #elif defined(__TARGET_RISCV64)
 #include <phoenix/arch/riscv64/riscv64.h>
 #endif