diff --git a/bsp/allwinner_tina/libcpu/SConscript b/bsp/allwinner_tina/libcpu/SConscript
index d41ab0ba74f9765dbc7a3db1747147019cb14c14..aa13c2b179b07a7650c863332d5349bd7b253dd5 100644
--- a/bsp/allwinner_tina/libcpu/SConscript
+++ b/bsp/allwinner_tina/libcpu/SConscript
@@ -8,6 +8,6 @@ CPPPATH = [cwd]
 if rtconfig.PLATFORM == 'gcc':
     src += Glob('*_gcc.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/amebaz/libraries/smartconfig/SConscript b/bsp/amebaz/libraries/smartconfig/SConscript
index 4ae07e381537b09911624041dfb39ef08246c5e9..31c98a046b52b40fe9ddb63226af8f366fdb5cd7 100644
--- a/bsp/amebaz/libraries/smartconfig/SConscript
+++ b/bsp/amebaz/libraries/smartconfig/SConscript
@@ -12,7 +12,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
 elif rtconfig.CROSS_TOOL == 'iar':
     libs += ['libsmartconfig_armcm4_iar']
 
-group = DefineGroup('smartconfig', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath)
+group = DefineGroup('Libraries', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath)
 
 Return('group')
 
diff --git a/bsp/apollo2/board/SConscript b/bsp/apollo2/board/SConscript
index 2f2dc9eb483727da58e1ed4bd4871b9cddac16eb..ce5e82d5ddef4975e9f5db806c42f7f12ee6e885 100644
--- a/bsp/apollo2/board/SConscript
+++ b/bsp/apollo2/board/SConscript
@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 #remove other no use files
 #SrcRemove(src, '*.c')
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
\ No newline at end of file
diff --git a/bsp/asm9260t/platform/SConscript b/bsp/asm9260t/platform/SConscript
index 5df4a5fc63598c7611f7f1ed61c0c0f8c790b627..e0706a5017926eed07ca61fe33a0e1ae318c43c3 100644
--- a/bsp/asm9260t/platform/SConscript
+++ b/bsp/asm9260t/platform/SConscript
@@ -8,5 +8,5 @@ CPPPATH = [cwd]
 # The set of source files associated with this SConscript file.
 src = Glob('*.c')
 
-group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/at32/Libraries/AT32_Std_Driver/SConscript b/bsp/at32/Libraries/AT32_Std_Driver/SConscript
index fd6b012d0a7d82ecc0c27c5bffb74bcf9df8327f..1b7c7c1369de031a32ab5c94525fb795f870e46d 100644
--- a/bsp/at32/Libraries/AT32_Std_Driver/SConscript
+++ b/bsp/at32/Libraries/AT32_Std_Driver/SConscript
@@ -41,6 +41,6 @@ path = [
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER']
 
-group = DefineGroup('AT32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/bsp/at91sam9260/platform/SConscript b/bsp/at91sam9260/platform/SConscript
index 1f5de6e77269a41bc6ff379fda6d89f839b19968..65b33d7eefd89090db4d32f880fddaf790c48ad4 100644
--- a/bsp/at91sam9260/platform/SConscript
+++ b/bsp/at91sam9260/platform/SConscript
@@ -21,6 +21,6 @@ if rtconfig.PLATFORM == 'cl':
 if rtconfig.PLATFORM == 'mingw':
 	src = Glob('*.c')
 
-group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/at91sam9g45/platform/SConscript b/bsp/at91sam9g45/platform/SConscript
index 1f5de6e77269a41bc6ff379fda6d89f839b19968..65b33d7eefd89090db4d32f880fddaf790c48ad4 100644
--- a/bsp/at91sam9g45/platform/SConscript
+++ b/bsp/at91sam9g45/platform/SConscript
@@ -21,6 +21,6 @@ if rtconfig.PLATFORM == 'cl':
 if rtconfig.PLATFORM == 'mingw':
 	src = Glob('*.c')
 
-group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript b/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript
index e7852f8abb10f17eecb15dda0dd542ac200b32d3..19d9931942394acebf5a5c4c5a206972c23e5380 100644
--- a/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript
+++ b/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript
@@ -25,6 +25,6 @@ CPPPATH = [
     cwd + '/DRIVERS/USART',
 ]
 
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/dm365/drivers/SConscript b/bsp/dm365/drivers/SConscript
index 287720aa96feb31464b2c5d0438eb1e6aebaf084..a36d186e944348bef1ac972e6a9e00d45f9a139b 100644
--- a/bsp/dm365/drivers/SConscript
+++ b/bsp/dm365/drivers/SConscript
@@ -26,6 +26,6 @@ if GetDepend('RT_USING_SPI_CONTROL'):
 if GetDepend('RT_USING_EMAC'):
 	src += ['davinci_emac.c']
 
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/fh8620/platform/common/SConscript b/bsp/fh8620/platform/common/SConscript
index 9679d6df56f5d8075139378f3d836c7466f95022..b5bcf86f6dafb463f6576950b0a692cd361a084b 100644
--- a/bsp/fh8620/platform/common/SConscript
+++ b/bsp/fh8620/platform/common/SConscript
@@ -3,6 +3,6 @@ from building import *
 cwd = GetCurrentDir()
 src = Glob('*.c')
 
-group = DefineGroup('Platform', src, depend = [''])
+group = DefineGroup('Drivers', src, depend = [''])
 
 Return('group')
diff --git a/bsp/fh8620/platform/fh8620/iot_cam/SConscript b/bsp/fh8620/platform/fh8620/iot_cam/SConscript
index 7f5236ef88a463f0b330d5090ada57fe38e9ac9e..527e7976e3a16cf1bd0ba369519defcd40b3a633 100644
--- a/bsp/fh8620/platform/fh8620/iot_cam/SConscript
+++ b/bsp/fh8620/platform/fh8620/iot_cam/SConscript
@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 path = [cwd, cwd + '/..']
 
-group = DefineGroup('Platform', src, depend = ['CONFIG_BOARD_IOTCAM', 'CONFIG_CHIP_FH8620'], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = ['CONFIG_BOARD_IOTCAM', 'CONFIG_CHIP_FH8620'], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/fh8620/platform/plat-v2/SConscript b/bsp/fh8620/platform/plat-v2/SConscript
index 40240950c0b6e637c32c2b3325ad43f1dcaea4dd..7fad1e2a7e07bed5cfb0bc4383a5b398361b837f 100644
--- a/bsp/fh8620/platform/plat-v2/SConscript
+++ b/bsp/fh8620/platform/plat-v2/SConscript
@@ -8,6 +8,6 @@ src = Glob('*.c')
 
 path = [cwd, cwd + '/..']
 
-group = DefineGroup('Platform', src, depend = ['CONFIG_PLAT_V2'], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = ['CONFIG_PLAT_V2'], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/frdm-k64f/board/SConscript b/bsp/frdm-k64f/board/SConscript
index d92267623c17ccd922258e7629d3f938ccbf732f..5db2d042e68ecfae5c604ad1acb05a7ea0c9d544 100644
--- a/bsp/frdm-k64f/board/SConscript
+++ b/bsp/frdm-k64f/board/SConscript
@@ -18,6 +18,6 @@ if GetDepend('RT_USING_LWIP'):
 
 CPPPATH = [cwd]
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/frdm-k64f/device/SConscript b/bsp/frdm-k64f/device/SConscript
index 9fa79aed4ab740ee864a61290dd80326e40c7a4e..d91ae0576fbbb73eae8349185ad2efa1cbba6667 100644
--- a/bsp/frdm-k64f/device/SConscript
+++ b/bsp/frdm-k64f/device/SConscript
@@ -21,7 +21,7 @@ elif rtconfig.CROSS_TOOL == 'keil':
 
 CPPDEFINES = ['CPU_MK64FN1M0VLL12']
 
-group = DefineGroup('Device', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
 #CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/bsp/gkipc/armv6/SConscript b/bsp/gkipc/armv6/SConscript
index d0a05be4036c52afb9bab1f07d4e00a986c0391b..04f6bb5a4f76e2d5b1cbb52f5080db2f5c9b82b0 100644
--- a/bsp/gkipc/armv6/SConscript
+++ b/bsp/gkipc/armv6/SConscript
@@ -5,6 +5,6 @@ src	= Glob('*.c')
 src += Glob('*.s')
 path = [cwd, cwd + '../../../include', cwd + '/../libraries/inc', cwd + '/../drivers']
 
-group = DefineGroup('armv6', src, depend = [''], CPPPATH = path)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/gkipc/libraries/drv/7102C/gd/SConscript b/bsp/gkipc/libraries/drv/7102C/gd/SConscript
index 70fd17741bc6b0fbd26a31adfe26034726ead0c7..35c70dc595006a896f6cab14cd830df15390f32a 100644
--- a/bsp/gkipc/libraries/drv/7102C/gd/SConscript
+++ b/bsp/gkipc/libraries/drv/7102C/gd/SConscript
@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:
diff --git a/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript b/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript
index e1f3a4ae0326931990f883e5044ca6326e2b812d..1b6bf54f09e8d84abc49de02c9dedb6e5c776e02 100644
--- a/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript
+++ b/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript
@@ -39,6 +39,6 @@ src	+= ['wdog/gd_wdog.c']
 
 path = [cwd, cwd + '/../inc']
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')
\ No newline at end of file
diff --git a/bsp/gkipc/libraries/drv/7102C/gh/SConscript b/bsp/gkipc/libraries/drv/7102C/gh/SConscript
index a765cdd5a15d8ef1d464c525d764d244915f9827..c8786e9e35b3e6cec9f4ed34dbdb63916b1e92ae 100644
--- a/bsp/gkipc/libraries/drv/7102C/gh/SConscript
+++ b/bsp/gkipc/libraries/drv/7102C/gh/SConscript
@@ -9,7 +9,7 @@ libinspath = libcwd + '/libraries/lib'
 
 CPPDEFINES = ['-DDEBUG']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:
diff --git a/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript b/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript
index 47f86eb9c678c4b179954e050c59d2efa9007c8f..d680a248961185efc768f6549266bb5eece4cddb 100644
--- a/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript
+++ b/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript
@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src	= Glob('*.c')
 path = [cwd + '/../inc']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/gkipc/libraries/drv/710X/gd/SConscript b/bsp/gkipc/libraries/drv/710X/gd/SConscript
index 70fd17741bc6b0fbd26a31adfe26034726ead0c7..35c70dc595006a896f6cab14cd830df15390f32a 100644
--- a/bsp/gkipc/libraries/drv/710X/gd/SConscript
+++ b/bsp/gkipc/libraries/drv/710X/gd/SConscript
@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:
diff --git a/bsp/gkipc/libraries/drv/710X/gd/src/SConscript b/bsp/gkipc/libraries/drv/710X/gd/src/SConscript
index 887201dc0414a3397076eecfe2f54f0ef3fbeabe..122ae1424533560ee12341cb2230443d0b206614 100644
--- a/bsp/gkipc/libraries/drv/710X/gd/src/SConscript
+++ b/bsp/gkipc/libraries/drv/710X/gd/src/SConscript
@@ -40,6 +40,6 @@ src	+= ['wdog/gd_wdog.c']
 
 path = [cwd, cwd + '/../inc', cwd + '/..']
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')
\ No newline at end of file
diff --git a/bsp/gkipc/libraries/drv/710X/gh/SConscript b/bsp/gkipc/libraries/drv/710X/gh/SConscript
index e05ccbc4d075991c3f43c0a077f9762b7f683a77..35c70dc595006a896f6cab14cd830df15390f32a 100644
--- a/bsp/gkipc/libraries/drv/710X/gh/SConscript
+++ b/bsp/gkipc/libraries/drv/710X/gh/SConscript
@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:
diff --git a/bsp/gkipc/libraries/drv/710X/gh/src/SConscript b/bsp/gkipc/libraries/drv/710X/gh/src/SConscript
index 745ab34c863545cfaa7b741a6ff5e148abc859e7..5b01077a5c74b1f33041bc00e1b16c4c972923a8 100644
--- a/bsp/gkipc/libraries/drv/710X/gh/src/SConscript
+++ b/bsp/gkipc/libraries/drv/710X/gh/src/SConscript
@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src	= Glob('*.c')
 path = [cwd + '/..', cwd + '/../inc', cwd + '/../../inc']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/gkipc/libraries/drv/710XS/gd/SConscript b/bsp/gkipc/libraries/drv/710XS/gd/SConscript
index 70fd17741bc6b0fbd26a31adfe26034726ead0c7..35c70dc595006a896f6cab14cd830df15390f32a 100644
--- a/bsp/gkipc/libraries/drv/710XS/gd/SConscript
+++ b/bsp/gkipc/libraries/drv/710XS/gd/SConscript
@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:
diff --git a/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript b/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript
index ac7155aa8659cdd5d766132e28f39b1839ec872d..2d377de09690feb5eeaa7213e6a236e88e601282 100644
--- a/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript
+++ b/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript
@@ -40,6 +40,6 @@ src	+= ['wdog/gd_wdog.c']
 
 path = [cwd, cwd + '/../inc', cwd + '/..']
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')
\ No newline at end of file
diff --git a/bsp/gkipc/libraries/drv/710XS/gh/SConscript b/bsp/gkipc/libraries/drv/710XS/gh/SConscript
index e05ccbc4d075991c3f43c0a077f9762b7f683a77..35c70dc595006a896f6cab14cd830df15390f32a 100644
--- a/bsp/gkipc/libraries/drv/710XS/gh/SConscript
+++ b/bsp/gkipc/libraries/drv/710XS/gh/SConscript
@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:
diff --git a/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript b/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript
index 745ab34c863545cfaa7b741a6ff5e148abc859e7..5b01077a5c74b1f33041bc00e1b16c4c972923a8 100644
--- a/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript
+++ b/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript
@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src	= Glob('*.c')
 path = [cwd + '/..', cwd + '/../inc', cwd + '/../../inc']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/gkipc/libraries/drv/gnu_c/SConscript b/bsp/gkipc/libraries/drv/gnu_c/SConscript
index 3f500d3d4ca4c24da006b7811e93859e67905987..28ed3cc02840ecc452b38770463debfbca96870a 100644
--- a/bsp/gkipc/libraries/drv/gnu_c/SConscript
+++ b/bsp/gkipc/libraries/drv/gnu_c/SConscript
@@ -8,6 +8,6 @@ path = [cwd]
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gnu_c', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 Return('group')
diff --git a/bsp/gkipc/platform/SConscript b/bsp/gkipc/platform/SConscript
index ff0e7d41695e0d1284174c69a85a496f55fb1893..2f71b73c2521fe69cc591de2a357df35c81acdf9 100644
--- a/bsp/gkipc/platform/SConscript
+++ b/bsp/gkipc/platform/SConscript
@@ -18,6 +18,6 @@ elif GetDepend('BOARD_GK7102S_HZD_JXH42'):
 elif GetDepend('BOARD_GK7102C_JH'):
     CPPDEFINES += ['-DGK7102C_JH']
           
-group = DefineGroup('platform', src, depend = [''], CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/bsp/imx6sx/cortex-a9/cpu/SConscript b/bsp/imx6sx/cortex-a9/cpu/SConscript
index 61057c04cc571a7a54781b4ed84f8906c74e2954..b45f95cc1a5084f4bcfd68bf0a7dd1b1960522e1 100644
--- a/bsp/imx6sx/cortex-a9/cpu/SConscript
+++ b/bsp/imx6sx/cortex-a9/cpu/SConscript
@@ -12,6 +12,6 @@ elif rtconfig.PLATFORM == 'gcc':
 elif rtconfig.PLATFORM == 'armcc':
         src += Glob('*_rvds.S')
 
-group = DefineGroup('AM335x', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/k210/driver/camera/SConscript b/bsp/k210/driver/camera/SConscript
index cc83372570ce780bd470e13e32f3e5866ae49127..1a80075428108c1957198c2a241e0ae199942581 100644
--- a/bsp/k210/driver/camera/SConscript
+++ b/bsp/k210/driver/camera/SConscript
@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('camera', src, depend = ['BSP_USING_CAMERA'], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = ['BSP_USING_CAMERA'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/nrf51822/Libraries/SConscript b/bsp/nrf51822/Libraries/SConscript
index 688d7e4ddcaa94e6db182d1a23165846a92bed47..1fd979844b8f43cec4054985ad23d863ba39d154 100644
--- a/bsp/nrf51822/Libraries/SConscript
+++ b/bsp/nrf51822/Libraries/SConscript
@@ -22,6 +22,6 @@ path = [cwd + '/CMSIS/Include',
         cwd + '/nrf51822/Include']
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER', 'NRF51']
-group = DefineGroup('Startup Code', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/bsp/nrf52832/board/Sconscript b/bsp/nrf52832/board/Sconscript
index aa1e87d860be5fa9ea9a9182fd169797b7380ae6..eb2a45b9ca0060d1263284d844a0167853a32439 100644
--- a/bsp/nrf52832/board/Sconscript
+++ b/bsp/nrf52832/board/Sconscript
@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 #remove other no use files
 #SrcRemove(src, '*.c')
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
\ No newline at end of file
diff --git a/bsp/nrf52832/startups/Sconscript b/bsp/nrf52832/startups/Sconscript
index 91c4983ebe1b2e30789fbff399f6563f57b15ac3..f28b14aae1a5b808ed11345d87a1083a09d4c146 100644
--- a/bsp/nrf52832/startups/Sconscript
+++ b/bsp/nrf52832/startups/Sconscript
@@ -11,6 +11,6 @@ CPPPATH = [cwd]
 #remove other no use files
 #SrcRemove(src, '*.c')
 
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
\ No newline at end of file
diff --git a/bsp/nuvoton/libraries/m480/Device/SConscript b/bsp/nuvoton/libraries/m480/Device/SConscript
index 26e69fb8240d75be153c78a2e42eeda586c147d2..f86894377b5c458eda532e666123a29bbd5b48df 100644
--- a/bsp/nuvoton/libraries/m480/Device/SConscript
+++ b/bsp/nuvoton/libraries/m480/Device/SConscript
@@ -20,6 +20,6 @@ elif rtconfig.CROSS_TOOL == 'iar':
 
 path = [cwd + '/Nuvoton/M480/Include',]
 
-group = DefineGroup('m480_device', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/bsp/nuvoton/libraries/m480/StdDriver/SConscript b/bsp/nuvoton/libraries/m480/StdDriver/SConscript
index 6a932cff584df59a56960b320c3c60eba34ba2dd..57025d2246c77cc7a21c9dba5b63bae9e1e3a0ef 100644
--- a/bsp/nuvoton/libraries/m480/StdDriver/SConscript
+++ b/bsp/nuvoton/libraries/m480/StdDriver/SConscript
@@ -20,9 +20,9 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'):
 		libs += ['libstddriver_iar']    
 
 if not libs:
-	group = DefineGroup('m480_stddriver', src, depend = [''], CPPPATH = cpppath)
+	group = DefineGroup('Libraries', src, depend = [''], CPPPATH = cpppath)
 else:
 	src = []
-	group = DefineGroup('m480_stddriver', src, depend = [''], CPPPATH = cpppath, LIBS = libs, LIBPATH = libpath)
+	group = DefineGroup('Libraries', src, depend = [''], CPPPATH = cpppath, LIBS = libs, LIBPATH = libpath)
 
 Return('group')
diff --git a/bsp/nuvoton/libraries/m480/rtt_port/SConscript b/bsp/nuvoton/libraries/m480/rtt_port/SConscript
index a155044a30487ee8290ca112b588dfec32f668ca..77bd29071444d4666f2f6ef0e9d2741182d800f4 100644
--- a/bsp/nuvoton/libraries/m480/rtt_port/SConscript
+++ b/bsp/nuvoton/libraries/m480/rtt_port/SConscript
@@ -30,6 +30,6 @@ elif GetDepend('BOARD_USING_HSOTG') and ( GetDepend('BSP_USING_USBD') or GetDepe
     print '[Hint] You already select BOARD_USING_HSOTG. Please de-select BSP_USING_USBD and BSP_USING_USBH options.'
     sys.exit(1)
 else:
-    group = DefineGroup('m480_rttport', src, depend = [''], CPPPATH = CPPPATH)
+    group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/nuvoton/numaker-iot-m487/board/SConscript b/bsp/nuvoton/numaker-iot-m487/board/SConscript
index 6ed8f178ba2e4339cc909ed0fc56c6efcc184180..1cea397523c88e44f2bb1fbb29b6a73e3b87fb42 100644
--- a/bsp/nuvoton/numaker-iot-m487/board/SConscript
+++ b/bsp/nuvoton/numaker-iot-m487/board/SConscript
@@ -15,6 +15,6 @@ NuPinConfig/nutool_pincfg.c
 src += Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd, cwd + '/NuClockConfig', cwd + '/NuPinConfig']
 
-group = DefineGroup('board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/nuvoton/numaker-pfm-m487/board/SConscript b/bsp/nuvoton/numaker-pfm-m487/board/SConscript
index 6ed8f178ba2e4339cc909ed0fc56c6efcc184180..1cea397523c88e44f2bb1fbb29b6a73e3b87fb42 100644
--- a/bsp/nuvoton/numaker-pfm-m487/board/SConscript
+++ b/bsp/nuvoton/numaker-pfm-m487/board/SConscript
@@ -15,6 +15,6 @@ NuPinConfig/nutool_pincfg.c
 src += Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd, cwd + '/NuClockConfig', cwd + '/NuPinConfig']
 
-group = DefineGroup('board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/qemu-vexpress-a9/drivers/audio/SConscript b/bsp/qemu-vexpress-a9/drivers/audio/SConscript
index 211863160892b57bbee329968649b5c0cc084ed0..9fc2acc60476d720783d723292fecb5c81502b5f 100644
--- a/bsp/qemu-vexpress-a9/drivers/audio/SConscript
+++ b/bsp/qemu-vexpress-a9/drivers/audio/SConscript
@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('drv_audio', src, depend = ['BSP_DRV_AUDIO'], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = ['BSP_DRV_AUDIO'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/qemu-vexpress-gemini/cpu/SConscript b/bsp/qemu-vexpress-gemini/cpu/SConscript
index 61057c04cc571a7a54781b4ed84f8906c74e2954..b45f95cc1a5084f4bcfd68bf0a7dd1b1960522e1 100644
--- a/bsp/qemu-vexpress-gemini/cpu/SConscript
+++ b/bsp/qemu-vexpress-gemini/cpu/SConscript
@@ -12,6 +12,6 @@ elif rtconfig.PLATFORM == 'gcc':
 elif rtconfig.PLATFORM == 'armcc':
         src += Glob('*_rvds.S')
 
-group = DefineGroup('AM335x', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/raspberry-pi/raspi2/cpu/SConscript b/bsp/raspberry-pi/raspi2/cpu/SConscript
index 2a8b3869a493bbc00381144eb284ff87e39cb844..fbfee70b018d752ca54c59ca1d3028cc781ee16f 100644
--- a/bsp/raspberry-pi/raspi2/cpu/SConscript
+++ b/bsp/raspberry-pi/raspi2/cpu/SConscript
@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/raspberry-pi/raspi3-32/cpu/SConscript b/bsp/raspberry-pi/raspi3-32/cpu/SConscript
index 2a8b3869a493bbc00381144eb284ff87e39cb844..fbfee70b018d752ca54c59ca1d3028cc781ee16f 100644
--- a/bsp/raspberry-pi/raspi3-32/cpu/SConscript
+++ b/bsp/raspberry-pi/raspi3-32/cpu/SConscript
@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/samd21/board/SConscript b/bsp/samd21/board/SConscript
index ea79ebb925b87a3de69903d7dfc85b97115a1be1..5001f5d8bbaf4919e490c5e47e473fe4251a8946 100644
--- a/bsp/samd21/board/SConscript
+++ b/bsp/samd21/board/SConscript
@@ -15,6 +15,6 @@ if rtconfig.DEVICE_SERIES == 'SAMD20':
 elif rtconfig.DEVICE_SERIES == 'SAMD21':
 	path += [cwd + '/../asflib_config', cwd + '/../asflib_config/clock_samd21_r21_da_ha1']
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')
diff --git a/components/dfs/SConscript b/components/dfs/SConscript
index edfd4e42b516c8adaec0853c9986731ffa92bc0f..3ccaeb10803b3e056a478644f6ea0d863b10d8aa 100644
--- a/components/dfs/SConscript
+++ b/components/dfs/SConscript
@@ -13,7 +13,7 @@ CPPPATH = [cwd + "/include"]
 if GetDepend('RT_USING_POSIX'):
     src += ['src/poll.c', 'src/select.c']
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH)
 
 if GetDepend('RT_USING_DFS'):
     # search in the file system implementation
diff --git a/components/dfs/filesystems/devfs/SConscript b/components/dfs/filesystems/devfs/SConscript
index a2c0d843f07b9cc4b8066948fcdc79b237473e69..898b04a2342e38fd36e4501a74647c665cf31fe4 100644
--- a/components/dfs/filesystems/devfs/SConscript
+++ b/components/dfs/filesystems/devfs/SConscript
@@ -6,6 +6,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/elmfat/SConscript b/components/dfs/filesystems/elmfat/SConscript
index 173c0a9d65fc4d3905ef1c8105eb9f1bea991d02..8b7ec02d431fc3c6957163ac36eb8afc728ada18 100644
--- a/components/dfs/filesystems/elmfat/SConscript
+++ b/components/dfs/filesystems/elmfat/SConscript
@@ -21,6 +21,6 @@ if GetDepend('RT_DFS_ELM_USE_LFN'):
         else:
             src += ['option/ccsbcs.c']
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/jffs2/SConscript b/components/dfs/filesystems/jffs2/SConscript
index 85d3a4d8d2806087789f882078284f073df2fdb4..47854393e3edc2c34385d2352fcdef7e6015d219 100644
--- a/components/dfs/filesystems/jffs2/SConscript
+++ b/components/dfs/filesystems/jffs2/SConscript
@@ -45,6 +45,6 @@ src/write.c
 
 CPPPATH = [cwd, cwd + '/include', cwd + '/src', cwd + '/cyg', cwd + '/kernel', cwd + '/cyg/compress']
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/nfs/SConscript b/components/dfs/filesystems/nfs/SConscript
index b340d36de2433e5c3e8caa8ab9b7e6ae9a51b478..f830dfc75494faeaccb0dfbcc167a8faf20a133b 100644
--- a/components/dfs/filesystems/nfs/SConscript
+++ b/components/dfs/filesystems/nfs/SConscript
@@ -8,6 +8,6 @@ CPPPATH = [cwd]
 
 SrcRemove(src, ['rpc/auth_none.c'])
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/ramfs/SConscript b/components/dfs/filesystems/ramfs/SConscript
index 12977adf53a864678444258c78049f51d6707f39..1304f5962921facda46783d980db3e1280fbda2d 100644
--- a/components/dfs/filesystems/ramfs/SConscript
+++ b/components/dfs/filesystems/ramfs/SConscript
@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/romfs/SConscript b/components/dfs/filesystems/romfs/SConscript
index d31941eb8afe7ac28e841248f68a96f76640d368..bfd633ce9123693a6cad199542b379433172fcf9 100644
--- a/components/dfs/filesystems/romfs/SConscript
+++ b/components/dfs/filesystems/romfs/SConscript
@@ -10,6 +10,6 @@ if GetDepend('DFS_ROMFS_ROOT'):
     # A new ROMFS root has been defined, we should remove the romfs.c
     SrcRemove(src, ['romfs.c'])
 
-group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/uffs/SConscript b/components/dfs/filesystems/uffs/SConscript
index 1ccd4a68698338de1686312f6ff5e571b8a141a7..53f7713fc2e4a4017be80d1ebfb2dd08654c2a12 100644
--- a/components/dfs/filesystems/uffs/SConscript
+++ b/components/dfs/filesystems/uffs/SConscript
@@ -33,6 +33,6 @@ src = src + uffs
  
 CPPPATH = [cwd, cwd + '/src/inc']
 
-group = DefineGroup('FileSystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH)
+group = DefineGroup('Filesystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/drivers/sensors/SConscript b/components/drivers/sensors/SConscript
index 51c4b50eef9cbd3de14d2304e22b5e0cde993f8d..b56ae5ce6e7f28f02902268cbe14423cfaca28e9 100644
--- a/components/drivers/sensors/SConscript
+++ b/components/drivers/sensors/SConscript
@@ -7,7 +7,7 @@ src = ['sensor.c']
 CPPPATH = [cwd, cwd + '/../include']
 
 if GetDepend('RT_USING_SENSOR_CMD'):
-    src += ['sensor_cmd.c'];
+    src += ['sensor_cmd.c']
 
 group = DefineGroup('Sensors', src, depend = ['RT_USING_SENSOR', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
 
diff --git a/components/drivers/touch/SConscript b/components/drivers/touch/SConscript
index f370b2aba6c38a449bdc337778dee752baf3556d..6c2a126c9c808219bd059e6796373fe5b31febbe 100644
--- a/components/drivers/touch/SConscript
+++ b/components/drivers/touch/SConscript
@@ -6,6 +6,6 @@ cwd = GetCurrentDir()
 src = ['touch.c']
 CPPPATH = [cwd, cwd + '/../include']
 
-group = DefineGroup('Touch', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
+group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/finsh/SConscript b/components/finsh/SConscript
index 706165a47eec9a5cc055f53e893d1ed344ec87d2..be04c566164570dceefd5bccc2754ce0e26ea7dc 100644
--- a/components/finsh/SConscript
+++ b/components/finsh/SConscript
@@ -34,6 +34,6 @@ if not GetDepend('FINSH_USING_MSH_ONLY'):
 
 CPPPATH = [cwd]
 
-group = DefineGroup('FinSH', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
+group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/libc/aio/SConscript b/components/libc/aio/SConscript
index 175767100a403dea7868683259be9b2bb41fc6b3..f10462e9c438c0f30226e8fd5af58beca50cae69 100644
--- a/components/libc/aio/SConscript
+++ b/components/libc/aio/SConscript
@@ -6,6 +6,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('aio', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
+group = DefineGroup('libc', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript
index 5f8f65a5634a2b532c358c7c49240f7e4722c3c7..52f7a6d93a9275dfd79ab3d13fabc130d3f4fddd 100644
--- a/components/libc/compilers/armlibc/SConscript
+++ b/components/libc/compilers/armlibc/SConscript
@@ -15,7 +15,7 @@ if GetDepend('RT_USING_MODULE') == False:
     SrcRemove(src, ['libc_syms.c'])
 
 if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang':
-    group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC'], 
+    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript
index f661a1ee0d025f25ab781d7c8e0188d760892bac..2407301405ed4e719c1e87665d60877473405bcd 100644
--- a/components/libc/compilers/common/SConscript
+++ b/components/libc/compilers/common/SConscript
@@ -17,6 +17,6 @@ if GetDepend('RT_USING_POSIX') == False:
         SrcRemove(src, ['unistd.c'])
 
 if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')):
-	group = DefineGroup('LIBC', src, depend = [''], CPPPATH = CPPPATH)
+	group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript
index 456b7624961ca6e64321ff77d3312d000d93e099..75a5812fab929806197f53455f353abd97723ff9 100644
--- a/components/libc/compilers/dlib/SConscript
+++ b/components/libc/compilers/dlib/SConscript
@@ -20,7 +20,7 @@ if rtconfig.PLATFORM == 'iar':
         if LooseVersion(IARVersion()) < LooseVersion("8.20.1"):
             CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT']
 
-    group = DefineGroup('dlib', src, depend = ['RT_USING_LIBC'], 
+    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/components/libc/compilers/minilibc/SConscript b/components/libc/compilers/minilibc/SConscript
index cdaf9ec32b52febaf944d56ea4eaa32b4b69806f..dec657028fe2b9795579d72a8c491fcb5d1520d4 100644
--- a/components/libc/compilers/minilibc/SConscript
+++ b/components/libc/compilers/minilibc/SConscript
@@ -9,7 +9,7 @@ CPPPATH = [cwd]
 CPPDEFINES = ['RT_USING_MINILIBC']
 
 if rtconfig.PLATFORM == 'gcc' and rtconfig.ARCH != 'sim' and not GetDepend('RT_USING_LIBC') and GetDepend('RT_USING_MINILIBC'):
-    group = DefineGroup('LIBC', src, depend = [''],
+    group = DefineGroup('libc', src, depend = [''],
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript
index 11de59bec42f39d22e4b200366e6b167663561cc..d0868bbdea50bd01ab9a7e15ce310ce1bb9c8c3b 100644
--- a/components/libc/compilers/newlib/SConscript
+++ b/components/libc/compilers/newlib/SConscript
@@ -15,7 +15,7 @@ CPPDEFINES = ['RT_USING_NEWLIB']
 LIBS = ['c', 'm']
 
 if rtconfig.PLATFORM == 'gcc':
-    group = DefineGroup('NewLIB', src, depend = ['RT_USING_LIBC'], 
+    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
 
 Return('group')
diff --git a/components/libc/getline/SConscript b/components/libc/getline/SConscript
index 6c9a2a164c24ae93e6ea3481720647f6454fa8ee..fa4c8618c181e3b64c15c989c88259b45d0c4cf2 100644
--- a/components/libc/getline/SConscript
+++ b/components/libc/getline/SConscript
@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBC', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_LIBC', 'RT_USING_POSIX','RT_USING_POSIX_GETLINE'], 
     CPPPATH = CPPPATH)
 
diff --git a/components/libc/libdl/SConscript b/components/libc/libdl/SConscript
index 28265521f6cc28587f8e35fb560cfa931f4611e6..93636e4b7ae6b29abbfde0c61ca3a9b2a02804e1 100644
--- a/components/libc/libdl/SConscript
+++ b/components/libc/libdl/SConscript
@@ -7,7 +7,7 @@ group   = []
 CPPPATH = [cwd]
 
 if rtconfig.PLATFORM == 'gcc':
-    group = DefineGroup('LIBC', src, 
+    group = DefineGroup('libc', src, 
         depend = ['RT_USING_MODULE'], 
         CPPPATH = CPPPATH)
 
diff --git a/components/libc/mmap/SConscript b/components/libc/mmap/SConscript
index 53036ad4363a6374fa217c7bff70bd2bdb4f7413..1a36a15710d552ac4052f72041279399c62ce609 100644
--- a/components/libc/mmap/SConscript
+++ b/components/libc/mmap/SConscript
@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBC', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_DFS', 'RT_USING_POSIX_MMAP'],
     CPPPATH = CPPPATH)
 
diff --git a/components/libc/pthreads/SConscript b/components/libc/pthreads/SConscript
index dff99aa01d8b2ee11c2f41319b321a76f29985e1..767b406d4c7b1fa361525e99842cf8cd60c7cb07 100644
--- a/components/libc/pthreads/SConscript
+++ b/components/libc/pthreads/SConscript
@@ -16,7 +16,7 @@ try:
 except :
     pass
 
-group = DefineGroup('Pthreads', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')
diff --git a/components/libc/signal/SConscript b/components/libc/signal/SConscript
index f32a1221ea886fc7035e7ccf0dacb0c4d2d1f915..f07ff58f6e5f737f2e00541ff5ec0df20ea3ebc1 100644
--- a/components/libc/signal/SConscript
+++ b/components/libc/signal/SConscript
@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBC', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_SIGNALS', 'RT_USING_PTHREADS', 'RT_USING_LIBC'], 
     CPPPATH = CPPPATH)
 
diff --git a/components/libc/termios/SConscript b/components/libc/termios/SConscript
index 4bd0a42eb833abaf5c86be6641bf9223d87372d0..381eb5ad8bba4e86e55f5800e6ed258dadaf9348 100644
--- a/components/libc/termios/SConscript
+++ b/components/libc/termios/SConscript
@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBC', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_POSIX_TERMIOS'], 
     CPPPATH = CPPPATH)
 
diff --git a/components/libc/time/SConscript b/components/libc/time/SConscript
index 67d1824b9f788947657dfb8b2b2682fce7002111..f7e6f7e8e98dfcd5fb5d97ec822ff027f4136318 100644
--- a/components/libc/time/SConscript
+++ b/components/libc/time/SConscript
@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('Pthreads', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/net/lwip-1.4.1/SConscript b/components/net/lwip-1.4.1/SConscript
index 8e3a4cb9d4c28268758b89e1ecc648d39bb67b38..848e2d8255a8249919796c88ad75cb255412af22 100644
--- a/components/net/lwip-1.4.1/SConscript
+++ b/components/net/lwip-1.4.1/SConscript
@@ -82,6 +82,6 @@ if GetDepend(['RT_LWIP_PPP']):
 if GetDepend(['RT_LWIP_USING_PING']):
     src += Glob('src/apps/ping/ping.c')
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP141'], CPPPATH = path)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP141'], CPPPATH = path)
 
 Return('group')
diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript
index 910ce6353977a25380bdb63a3f7f9c1ecf1e5ba3..df04b42324ab8519c5bd645c37078937d04e7203 100644
--- a/components/net/lwip-2.0.2/SConscript
+++ b/components/net/lwip-2.0.2/SConscript
@@ -84,6 +84,6 @@ if GetDepend(['RT_USING_LWIP_IPV6']):
 if GetDepend(['RT_LWIP_USING_PING']):
     src += Glob('src/apps/ping/ping.c')
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path)
 
 Return('group')
diff --git a/components/net/lwip-2.1.2/SConscript b/components/net/lwip-2.1.2/SConscript
index 20afc3753472d2fe67d393d597142d25eb8460db..04f59167d55fae2829d34d2e739e8d10523da120 100644
--- a/components/net/lwip-2.1.2/SConscript
+++ b/components/net/lwip-2.1.2/SConscript
@@ -260,6 +260,6 @@ if GetDepend(['RT_USING_LWIP_IPV6']):
 if GetDepend(['RT_LWIP_USING_PING']):
     src += lwipping_SRCS
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP212'], CPPPATH = path)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP212'], CPPPATH = path)
 
 Return('group')
diff --git a/components/net/lwip_dhcpd/SConscript b/components/net/lwip_dhcpd/SConscript
index d4ef6da41ce6466efd8784df9c295e38702302c8..16c673036a92954e131e317f9a3b121dd647723e 100644
--- a/components/net/lwip_dhcpd/SConscript
+++ b/components/net/lwip_dhcpd/SConscript
@@ -9,6 +9,6 @@ else:
 
 CPPPATH = [cwd]
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_DHCPD'], CPPPATH = CPPPATH)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_DHCPD'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/net/lwip_nat/SConscript b/components/net/lwip_nat/SConscript
index ce684f677a67ff1803d7f0016074d8e6520775f5..d8b95b1ce34b9f876b5dceb3e7edf7cab4957b74 100644
--- a/components/net/lwip_nat/SConscript
+++ b/components/net/lwip_nat/SConscript
@@ -5,6 +5,6 @@ src = Glob('*.c')
 
 CPPPATH = [cwd]
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_NAT'], CPPPATH = CPPPATH)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_NAT'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/net/netdev/SConscript b/components/net/netdev/SConscript
index 0db486b2dea929e8017331bed4c534d05a69d2fa..ec1d2b29057938a630e4b0b1d734b919d0cea24e 100644
--- a/components/net/netdev/SConscript
+++ b/components/net/netdev/SConscript
@@ -8,6 +8,6 @@ src = Glob('src/*.c')
 
 CPPPATH = [cwd + '/include']
 
-group = DefineGroup('NetDev', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH)
+group = DefineGroup('SAL', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/utilities/utest/SConscript b/components/utilities/utest/SConscript
index ea7efcfbc9a0a2bf6a6e00f4ae8d85e42198b6e9..5d408ccbd099a214df34928f367e697494e76051 100644
--- a/components/utilities/utest/SConscript
+++ b/components/utilities/utest/SConscript
@@ -3,6 +3,6 @@ from building import *
 cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]
-group   = DefineGroup('Utest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH)
+group   = DefineGroup('UTest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/examples/libc/SConscript b/examples/libc/SConscript
index 547dd215b1191f449c7b94d0a554aae2d1b40801..01a74356e7cc8ee16f942da827462c8ce448a1fe 100644
--- a/examples/libc/SConscript
+++ b/examples/libc/SConscript
@@ -1,6 +1,6 @@
 from building import *
 
 src   = Glob('*.c')
-group = DefineGroup('LIBCTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS'])
+group = DefineGroup('UTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS'])
 
 Return('group')
diff --git a/libcpu/aarch64/common/SConscript b/libcpu/aarch64/common/SConscript
index 59378636fa37a2f307e5839a0d58c1dfdd203213..c51148525beceb973f3e25301c9242ba541819c0 100644
--- a/libcpu/aarch64/common/SConscript
+++ b/libcpu/aarch64/common/SConscript
@@ -8,7 +8,7 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 # build for sub-directory
 list = os.listdir(cwd)
diff --git a/libcpu/aarch64/cortex-a53/SConscript b/libcpu/aarch64/cortex-a53/SConscript
index 5f509fbf5bf76e377b0cf2d30ce9f1f713202aaf..0b74223c6f5acb92505da0501f90fac3921cef2d 100644
--- a/libcpu/aarch64/cortex-a53/SConscript
+++ b/libcpu/aarch64/cortex-a53/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/aarch64/cortex-a72/SConscript b/libcpu/aarch64/cortex-a72/SConscript
index 5f509fbf5bf76e377b0cf2d30ce9f1f713202aaf..0b74223c6f5acb92505da0501f90fac3921cef2d 100644
--- a/libcpu/aarch64/cortex-a72/SConscript
+++ b/libcpu/aarch64/cortex-a72/SConscript
@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arc/common/SConscript b/libcpu/arc/common/SConscript
index 19604861f28b9abf705855c518ff98aee2df1ba9..80c21d87eb93d9ec568d1c55a7c1540bb2f032a1 100644
--- a/libcpu/arc/common/SConscript
+++ b/libcpu/arc/common/SConscript
@@ -5,6 +5,6 @@ src     = Glob('*.c')
 CPPPATH = [cwd]
 
 
-group = DefineGroup('LIBARCH', src, depend = [], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arc/em/SConscript b/libcpu/arc/em/SConscript
index 215749bea4ee0abc7f823375d23cf8ef8823cf80..a52aa9b1e4f854c253081891a3b5b0cf9d05f629 100644
--- a/libcpu/arc/em/SConscript
+++ b/libcpu/arc/em/SConscript
@@ -10,6 +10,6 @@ CPPPATH = [cwd]
 
 src += Glob('*.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/AT91SAM7S/SConscript b/libcpu/arm/AT91SAM7S/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/AT91SAM7S/SConscript
+++ b/libcpu/arm/AT91SAM7S/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/AT91SAM7X/SConscript b/libcpu/arm/AT91SAM7X/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/AT91SAM7X/SConscript
+++ b/libcpu/arm/AT91SAM7X/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/am335x/SConscript b/libcpu/arm/am335x/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/am335x/SConscript
+++ b/libcpu/arm/am335x/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/arm926/SConscript b/libcpu/arm/arm926/SConscript
index 9bd0ddaf0a059bf37f8cafdccb13c14627f5d186..2275af97d9157c6c3acdd02d8865f3e165300819 100644
--- a/libcpu/arm/arm926/SConscript
+++ b/libcpu/arm/arm926/SConscript
@@ -20,6 +20,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/arm/armv6/SConscript b/libcpu/arm/armv6/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/armv6/SConscript
+++ b/libcpu/arm/armv6/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/common/SConscript b/libcpu/arm/common/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/common/SConscript
+++ b/libcpu/arm/common/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-a/SConscript b/libcpu/arm/cortex-a/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-a/SConscript
+++ b/libcpu/arm/cortex-a/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-m0/SConscript b/libcpu/arm/cortex-m0/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-m0/SConscript
+++ b/libcpu/arm/cortex-m0/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-m23/SConscript
+++ b/libcpu/arm/cortex-m23/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-m3/SConscript b/libcpu/arm/cortex-m3/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-m3/SConscript
+++ b/libcpu/arm/cortex-m3/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-m33/SConscript b/libcpu/arm/cortex-m33/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-m33/SConscript
+++ b/libcpu/arm/cortex-m33/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-m4/SConscript b/libcpu/arm/cortex-m4/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-m4/SConscript
+++ b/libcpu/arm/cortex-m4/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-m7/SConscript b/libcpu/arm/cortex-m7/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-m7/SConscript
+++ b/libcpu/arm/cortex-m7/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/cortex-r4/SConscript b/libcpu/arm/cortex-r4/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/cortex-r4/SConscript
+++ b/libcpu/arm/cortex-r4/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/dm36x/SConscript b/libcpu/arm/dm36x/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/dm36x/SConscript
+++ b/libcpu/arm/dm36x/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/lpc214x/SConscript b/libcpu/arm/lpc214x/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/lpc214x/SConscript
+++ b/libcpu/arm/lpc214x/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/lpc24xx/SConscript b/libcpu/arm/lpc24xx/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/lpc24xx/SConscript
+++ b/libcpu/arm/lpc24xx/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/realview-a8-vmm/SConscript b/libcpu/arm/realview-a8-vmm/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/realview-a8-vmm/SConscript
+++ b/libcpu/arm/realview-a8-vmm/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/s3c24x0/SConscript b/libcpu/arm/s3c24x0/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/s3c24x0/SConscript
+++ b/libcpu/arm/s3c24x0/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/s3c44b0/SConscript b/libcpu/arm/s3c44b0/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/s3c44b0/SConscript
+++ b/libcpu/arm/s3c44b0/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/sep4020/SConscript b/libcpu/arm/sep4020/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/sep4020/SConscript
+++ b/libcpu/arm/sep4020/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/arm/zynq7000/SConscript b/libcpu/arm/zynq7000/SConscript
index 990f753abd3103c18684e1185361b1f70fe19f4a..28af7ba6514ce7362f87b75733b7f1b63e6b6b84 100644
--- a/libcpu/arm/zynq7000/SConscript
+++ b/libcpu/arm/zynq7000/SConscript
@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/avr32/uc3/SConscript b/libcpu/avr32/uc3/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/avr32/uc3/SConscript
+++ b/libcpu/avr32/uc3/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/blackfin/bf53x/SConscript b/libcpu/blackfin/bf53x/SConscript
index 5908a241424cb66d944430bbcbdd3b48310467d3..85882caf6f21db367aa59e8b80eeb6776976891e 100644
--- a/libcpu/blackfin/bf53x/SConscript
+++ b/libcpu/blackfin/bf53x/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_vdsp.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/c-sky/ck802/SConscript b/libcpu/c-sky/ck802/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/c-sky/ck802/SConscript
+++ b/libcpu/c-sky/ck802/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/c-sky/common/SConscript b/libcpu/c-sky/common/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/c-sky/common/SConscript
+++ b/libcpu/c-sky/common/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/ia32/SConscript b/libcpu/ia32/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/ia32/SConscript
+++ b/libcpu/ia32/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/m16c/m16c62p/SConscript b/libcpu/m16c/m16c62p/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/m16c/m16c62p/SConscript
+++ b/libcpu/m16c/m16c62p/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/mips/common/SConscript b/libcpu/mips/common/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/mips/common/SConscript
+++ b/libcpu/mips/common/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/mips/gs232/SConscript b/libcpu/mips/gs232/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/mips/gs232/SConscript
+++ b/libcpu/mips/gs232/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/mips/gs264/SConscript b/libcpu/mips/gs264/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/mips/gs264/SConscript
+++ b/libcpu/mips/gs264/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/mips/pic32/SConscript b/libcpu/mips/pic32/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/mips/pic32/SConscript
+++ b/libcpu/mips/pic32/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/nios/nios_ii/SConscript b/libcpu/nios/nios_ii/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/nios/nios_ii/SConscript
+++ b/libcpu/nios/nios_ii/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/ppc/common/SConscript b/libcpu/ppc/common/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/ppc/common/SConscript
+++ b/libcpu/ppc/common/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/ppc/ppc405/SConscript b/libcpu/ppc/ppc405/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/ppc/ppc405/SConscript
+++ b/libcpu/ppc/ppc405/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/bumblebee/SConscript b/libcpu/risc-v/bumblebee/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/risc-v/bumblebee/SConscript
+++ b/libcpu/risc-v/bumblebee/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/common/SConscript b/libcpu/risc-v/common/SConscript
index 08a1215daf53f10ee9885ee89f5086345b956446..92133bfb4756798f0507e520e43d53d55f7b076d 100644
--- a/libcpu/risc-v/common/SConscript
+++ b/libcpu/risc-v/common/SConscript
@@ -7,6 +7,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/e310/SConscript b/libcpu/risc-v/e310/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/risc-v/e310/SConscript
+++ b/libcpu/risc-v/e310/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/k210/SConscript b/libcpu/risc-v/k210/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/risc-v/k210/SConscript
+++ b/libcpu/risc-v/k210/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/nuclei/SConscript b/libcpu/risc-v/nuclei/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/risc-v/nuclei/SConscript
+++ b/libcpu/risc-v/nuclei/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/rv32m1/SConscript b/libcpu/risc-v/rv32m1/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/risc-v/rv32m1/SConscript
+++ b/libcpu/risc-v/rv32m1/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/risc-v/t-head/e906/SConscript b/libcpu/risc-v/t-head/e906/SConscript
index 08a1215daf53f10ee9885ee89f5086345b956446..92133bfb4756798f0507e520e43d53d55f7b076d 100644
--- a/libcpu/risc-v/t-head/e906/SConscript
+++ b/libcpu/risc-v/t-head/e906/SConscript
@@ -7,6 +7,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/rx/SConscript b/libcpu/rx/SConscript
index 57ad8ba9650487128b333ca573e3a9747cb71f8a..b7cb2f445a4f58b91cd65e05f4de6e9350bbd177 100644
--- a/libcpu/rx/SConscript
+++ b/libcpu/rx/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_iar.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/sim/posix/SConscript b/libcpu/sim/posix/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/sim/posix/SConscript
+++ b/libcpu/sim/posix/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/sim/win32/SConscript b/libcpu/sim/win32/SConscript
index 4488a0dbb51962ce2a272688e40b13e75071295f..530b5d1d78db9266057776955adc1de94917a0e0 100644
--- a/libcpu/sim/win32/SConscript
+++ b/libcpu/sim/win32/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/sparc-v8/bm3803/SConscript b/libcpu/sparc-v8/bm3803/SConscript
index 62648f9eeb8a44a504f2e4e2ad93ed803bf3eb87..03ce583dc10827cb08041a1889fe40ff27f288db 100644
--- a/libcpu/sparc-v8/bm3803/SConscript
+++ b/libcpu/sparc-v8/bm3803/SConscript
@@ -12,6 +12,6 @@ if rtconfig.PLATFORM == 'gcc':
     src += Glob('*_init.S')
     src += Glob('*_gcc.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/sparc-v8/common/SConscript b/libcpu/sparc-v8/common/SConscript
index 62648f9eeb8a44a504f2e4e2ad93ed803bf3eb87..03ce583dc10827cb08041a1889fe40ff27f288db 100644
--- a/libcpu/sparc-v8/common/SConscript
+++ b/libcpu/sparc-v8/common/SConscript
@@ -12,6 +12,6 @@ if rtconfig.PLATFORM == 'gcc':
     src += Glob('*_init.S')
     src += Glob('*_gcc.S')
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/ti-dsp/c28x/SConscript b/libcpu/ti-dsp/c28x/SConscript
index 2265bf3beeb01bb2f85a9549faef95664c1d5888..760a715267526a30fb06fce34359ca25694146bc 100644
--- a/libcpu/ti-dsp/c28x/SConscript
+++ b/libcpu/ti-dsp/c28x/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*.s')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/unicore32/sep6200/SConscript b/libcpu/unicore32/sep6200/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/unicore32/sep6200/SConscript
+++ b/libcpu/unicore32/sep6200/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/v850/70f34/SConscript b/libcpu/v850/70f34/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/v850/70f34/SConscript
+++ b/libcpu/v850/70f34/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')
diff --git a/libcpu/xilinx/microblaze/SConscript b/libcpu/xilinx/microblaze/SConscript
index da76d51366fab4ac25c1bcf739bacf0f3796d11f..20f325b692aedf3f74fbe124c90cc241cd460c32 100644
--- a/libcpu/xilinx/microblaze/SConscript
+++ b/libcpu/xilinx/microblaze/SConscript
@@ -9,6 +9,6 @@ src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 ASFLAGS = ''
 
-group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')