diff --git a/bsp/stm32/stm32l4r9-eval/.config b/bsp/stm32/stm32l4r9-st-eval/.config
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/.config
rename to bsp/stm32/stm32l4r9-st-eval/.config
diff --git a/bsp/stm32/stm32l4r9-eval/.gitignore b/bsp/stm32/stm32l4r9-st-eval/.gitignore
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/.gitignore
rename to bsp/stm32/stm32l4r9-st-eval/.gitignore
diff --git a/bsp/stm32/stm32l4r9-eval/Kconfig b/bsp/stm32/stm32l4r9-st-eval/Kconfig
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/Kconfig
rename to bsp/stm32/stm32l4r9-st-eval/Kconfig
diff --git a/bsp/stm32/stm32l4r9-eval/README.md b/bsp/stm32/stm32l4r9-st-eval/README.md
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/README.md
rename to bsp/stm32/stm32l4r9-st-eval/README.md
diff --git a/bsp/stm32/stm32l4r9-eval/SConscript b/bsp/stm32/stm32l4r9-st-eval/SConscript
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/SConscript
rename to bsp/stm32/stm32l4r9-st-eval/SConscript
diff --git a/bsp/stm32/stm32l4r9-eval/SConstruct b/bsp/stm32/stm32l4r9-st-eval/SConstruct
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/SConstruct
rename to bsp/stm32/stm32l4r9-st-eval/SConstruct
diff --git a/bsp/stm32/stm32l4r9-eval/applications/SConscript b/bsp/stm32/stm32l4r9-st-eval/applications/SConscript
similarity index 87%
rename from bsp/stm32/stm32l4r9-eval/applications/SConscript
rename to bsp/stm32/stm32l4r9-st-eval/applications/SConscript
index 7910cba9e23e620a153e3a299e8c274f7087a113..705efc3466891dff6c0a1d4bc0efcc6e3585b54b 100644
--- a/bsp/stm32/stm32l4r9-eval/applications/SConscript
+++ b/bsp/stm32/stm32l4r9-st-eval/applications/SConscript
@@ -2,7 +2,7 @@ from building import *
 
 cwd     = GetCurrentDir()
 src     = Glob('*.c')
-CPPPATH = [str(), cwd]
+CPPPATH = cwd
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/stm32/stm32l4r9-eval/applications/main.c b/bsp/stm32/stm32l4r9-st-eval/applications/main.c
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/applications/main.c
rename to bsp/stm32/stm32l4r9-st-eval/applications/main.c
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/.mxproject b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/.mxproject
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/.mxproject
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/.mxproject
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/CubeMX_Config.ioc b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/CubeMX_Config.ioc
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/CubeMX_Config.ioc
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/CubeMX_Config.ioc
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Inc/main.h b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Inc/main.h
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Inc/main.h
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Inc/main.h
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Inc/stm32l4xx_hal_conf.h b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Inc/stm32l4xx_hal_conf.h
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Inc/stm32l4xx_hal_conf.h
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Inc/stm32l4xx_hal_conf.h
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Inc/stm32l4xx_it.h b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Inc/stm32l4xx_it.h
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Inc/stm32l4xx_it.h
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Inc/stm32l4xx_it.h
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/main.c b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/main.c
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/main.c
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/main.c
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/stm32l4xx_hal_msp.c
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/stm32l4xx_it.c b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/stm32l4xx_it.c
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/stm32l4xx_it.c
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/stm32l4xx_it.c
diff --git a/bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/system_stm32l4xx.c b/bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/system_stm32l4xx.c
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/CubeMX_Config/Src/system_stm32l4xx.c
rename to bsp/stm32/stm32l4r9-st-eval/board/CubeMX_Config/Src/system_stm32l4xx.c
diff --git a/bsp/stm32/stm32l4r9-eval/board/Kconfig b/bsp/stm32/stm32l4r9-st-eval/board/Kconfig
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/Kconfig
rename to bsp/stm32/stm32l4r9-st-eval/board/Kconfig
diff --git a/bsp/stm32/stm32l4r9-eval/board/SConscript b/bsp/stm32/stm32l4r9-st-eval/board/SConscript
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/SConscript
rename to bsp/stm32/stm32l4r9-st-eval/board/SConscript
diff --git a/bsp/stm32/stm32l4r9-eval/board/board.c b/bsp/stm32/stm32l4r9-st-eval/board/board.c
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/board.c
rename to bsp/stm32/stm32l4r9-st-eval/board/board.c
diff --git a/bsp/stm32/stm32l4r9-eval/board/board.h b/bsp/stm32/stm32l4r9-st-eval/board/board.h
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/board.h
rename to bsp/stm32/stm32l4r9-st-eval/board/board.h
diff --git a/bsp/stm32/stm32l4r9-eval/board/linker_scripts/link.icf b/bsp/stm32/stm32l4r9-st-eval/board/linker_scripts/link.icf
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/linker_scripts/link.icf
rename to bsp/stm32/stm32l4r9-st-eval/board/linker_scripts/link.icf
diff --git a/bsp/stm32/stm32l4r9-eval/board/linker_scripts/link.lds b/bsp/stm32/stm32l4r9-st-eval/board/linker_scripts/link.lds
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/linker_scripts/link.lds
rename to bsp/stm32/stm32l4r9-st-eval/board/linker_scripts/link.lds
diff --git a/bsp/stm32/stm32l4r9-eval/board/linker_scripts/link.sct b/bsp/stm32/stm32l4r9-st-eval/board/linker_scripts/link.sct
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/board/linker_scripts/link.sct
rename to bsp/stm32/stm32l4r9-st-eval/board/linker_scripts/link.sct
diff --git a/bsp/stm32/stm32l4r9-eval/figures/board.png b/bsp/stm32/stm32l4r9-st-eval/figures/board.png
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/figures/board.png
rename to bsp/stm32/stm32l4r9-st-eval/figures/board.png
diff --git a/bsp/stm32/stm32l4r9-eval/project.ewd b/bsp/stm32/stm32l4r9-st-eval/project.ewd
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/project.ewd
rename to bsp/stm32/stm32l4r9-st-eval/project.ewd
diff --git a/bsp/stm32/stm32l4r9-eval/project.ewp b/bsp/stm32/stm32l4r9-st-eval/project.ewp
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/project.ewp
rename to bsp/stm32/stm32l4r9-st-eval/project.ewp
diff --git a/bsp/stm32/stm32l4r9-eval/project.eww b/bsp/stm32/stm32l4r9-st-eval/project.eww
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/project.eww
rename to bsp/stm32/stm32l4r9-st-eval/project.eww
diff --git a/bsp/stm32/stm32l4r9-eval/project.uvoptx b/bsp/stm32/stm32l4r9-st-eval/project.uvoptx
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/project.uvoptx
rename to bsp/stm32/stm32l4r9-st-eval/project.uvoptx
diff --git a/bsp/stm32/stm32l4r9-eval/project.uvprojx b/bsp/stm32/stm32l4r9-st-eval/project.uvprojx
similarity index 95%
rename from bsp/stm32/stm32l4r9-eval/project.uvprojx
rename to bsp/stm32/stm32l4r9-st-eval/project.uvprojx
index 1e446afb250fe192e6cd47b1e23f3740ffc24190..89a0274484be3e601298e60f95d08397b373c2cd 100644
--- a/bsp/stm32/stm32l4r9-eval/project.uvprojx
+++ b/bsp/stm32/stm32l4r9-st-eval/project.uvprojx
@@ -335,7 +335,7 @@
               <MiscControls />
               <Define>USE_HAL_DRIVER, STM32L4R9xx</Define>
               <Undefine />
-              <IncludePath>.;..\..\..\include;applications;applications;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include</IncludePath>
+              <IncludePath>.;..\..\..\include;applications\E;applications\:;..\..\..\..;applications\r;applications\t;applications\-;applications\t;applications\h;applications\r;applications\e;applications\a;applications\d;..\..\..\..;applications\b;applications\s;applications\p;..\..\..\..;applications\s;applications\t;applications\m;applications\3;applications\2;..\..\..\..;applications\s;applications\t;applications\m;applications\3;applications\2;applications\l;applications\4;applications\r;applications\9;applications\-;applications\s;applications\t;applications\-;applications\e;applications\v;applications\a;applications\l;..\..\..\..;applications\a;applications\p;applications\p;applications\l;applications\i;applications\c;applications\a;applications\t;applications\i;applications\o;applications\n;applications\s;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
diff --git a/bsp/stm32/stm32l4r9-eval/rtconfig.h b/bsp/stm32/stm32l4r9-st-eval/rtconfig.h
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/rtconfig.h
rename to bsp/stm32/stm32l4r9-st-eval/rtconfig.h
diff --git a/bsp/stm32/stm32l4r9-eval/rtconfig.py b/bsp/stm32/stm32l4r9-st-eval/rtconfig.py
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/rtconfig.py
rename to bsp/stm32/stm32l4r9-st-eval/rtconfig.py
diff --git a/bsp/stm32/stm32l4r9-eval/template.ewd b/bsp/stm32/stm32l4r9-st-eval/template.ewd
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/template.ewd
rename to bsp/stm32/stm32l4r9-st-eval/template.ewd
diff --git a/bsp/stm32/stm32l4r9-eval/template.ewp b/bsp/stm32/stm32l4r9-st-eval/template.ewp
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/template.ewp
rename to bsp/stm32/stm32l4r9-st-eval/template.ewp
diff --git a/bsp/stm32/stm32l4r9-eval/template.eww b/bsp/stm32/stm32l4r9-st-eval/template.eww
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/template.eww
rename to bsp/stm32/stm32l4r9-st-eval/template.eww
diff --git a/bsp/stm32/stm32l4r9-eval/template.uvoptx b/bsp/stm32/stm32l4r9-st-eval/template.uvoptx
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/template.uvoptx
rename to bsp/stm32/stm32l4r9-st-eval/template.uvoptx
diff --git a/bsp/stm32/stm32l4r9-eval/template.uvprojx b/bsp/stm32/stm32l4r9-st-eval/template.uvprojx
similarity index 100%
rename from bsp/stm32/stm32l4r9-eval/template.uvprojx
rename to bsp/stm32/stm32l4r9-st-eval/template.uvprojx