diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/.cproject b/testhal/STM32/STM32F7xx/GPT-ADC/.cproject
index 395f9a761..5c784726a 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/.cproject
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/.cproject
@@ -37,7 +37,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="STM32F7xx-GPT-ADC-SPI-PWM-ICU.null.1703860681" name="STM32F7xx-GPT-ADC-SPI-PWM-ICU"/>
+		<project id="STM32F7xx-GPT-ADC.null.1703860681" name="STM32F7xx-GPT-ADC"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/.project b/testhal/STM32/STM32F7xx/GPT-ADC/.project
index af145f493..38d12820c 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/.project
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>STM32F7xx-GPT-ADC-SPI-PWM-ICU</name>
+	<name>STM32F7xx-GPT-ADC</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC-SPI-PWM-ICU (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC (OpenOCD, Flash and Run).launch
similarity index 96%
rename from testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC-SPI-PWM-ICU (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC (OpenOCD, Flash and Run).launch
index 65d3afbc4..554ab9d81 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC-SPI-PWM-ICU (OpenOCD, Flash and Run).launch	
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC (OpenOCD, Flash and Run).launch	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
-<stringAttribute key="bad_container_name" value="\STM32F7xx-GPT-ADC-SPI-PWM-ICU\debug"/>
+<stringAttribute key="bad_container_name" value="\STM32F7xx-GPT-ADC\debug"/>
 <intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="1"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="true"/>
@@ -37,11 +37,11 @@
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32F7xx-GPT-ADC-SPI-PWM-ICU"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32F7xx-GPT-ADC"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.114656749"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/STM32F7xx-GPT-ADC-SPI-PWM-ICU"/>
+<listEntry value="/STM32F7xx-GPT-ADC"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC-SPI-PWM-ICU (OpenOCD, Just Run).launch b/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC (OpenOCD, Just Run).launch
similarity index 96%
rename from testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC-SPI-PWM-ICU (OpenOCD, Just Run).launch
rename to testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC (OpenOCD, Just Run).launch
index 4a6e47225..b31dc9a53 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC-SPI-PWM-ICU (OpenOCD, Just Run).launch	
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/debug/STM32F7xx-GPT-ADC (OpenOCD, Just Run).launch	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
-<stringAttribute key="bad_container_name" value="\STM32F7xx-GPT-ADC-SPI-PWM-ICU\debug"/>
+<stringAttribute key="bad_container_name" value="\STM32F7xx-GPT-ADC\debug"/>
 <intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="1"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="true"/>
@@ -37,11 +37,11 @@
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList&gt;&#13;&#10;&lt;memoryBlockExpressionItem&gt;&#13;&#10;&lt;expression text=&quot;0x20010744&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionItem&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32F7xx-GPT-ADC-SPI-PWM-ICU"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32F7xx-GPT-ADC"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.114656749"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/STM32F7xx-GPT-ADC-SPI-PWM-ICU"/>
+<listEntry value="/STM32F7xx-GPT-ADC"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>