diff --git a/testhal/STM32/STM32F0xx/onewire/.project b/testhal/STM32/STM32F0xx/onewire/.project
index 33bcb826..856b65d8 100644
--- a/testhal/STM32/STM32F0xx/onewire/.project
+++ b/testhal/STM32/STM32F0xx/onewire/.project
@@ -77,14 +77,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
-		</link>
-		<link>
-			<name>os_community</name>
+			<name>os-community</name>
 			<type>2</type>
 			<locationURI>PARENT-4-PROJECT_LOC/os</locationURI>
 		</link>
+		<link>
+			<name>os-git</name>
+			<type>2</type>
+			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/testhal/STM32/STM32F1xx/onewire/.project b/testhal/STM32/STM32F1xx/onewire/.project
index 3eb5f6bf..8f7973b9 100644
--- a/testhal/STM32/STM32F1xx/onewire/.project
+++ b/testhal/STM32/STM32F1xx/onewire/.project
@@ -77,14 +77,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
-		</link>
-		<link>
-			<name>os_community</name>
+			<name>os-community</name>
 			<type>2</type>
 			<locationURI>PARENT-4-PROJECT_LOC/os</locationURI>
 		</link>
+		<link>
+			<name>os-git</name>
+			<type>2</type>
+			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject b/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject
index 5915dc03..9dcfe772 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject
@@ -21,15 +21,15 @@
 							<builder id="org.eclipse.cdt.build.core.settings.default.builder.681215945" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1913618182" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1359024970" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.648690541" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.648690541" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.865562104" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.321395526" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.76286563" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.76286563" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1168908150" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1390938668" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.684710851" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.684710851" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.645908401" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 						</toolChain>
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/.project b/testhal/STM32/STM32F4xx/FSMC_NAND/.project
index 1f4f15ba..c1410777 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/.project
@@ -25,14 +25,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
-		</link>
-		<link>
-			<name>os_community</name>
+			<name>os-community</name>
 			<type>2</type>
 			<locationURI>PARENT-4-PROJECT_LOC/os</locationURI>
 		</link>
+		<link>
+			<name>os-git</name>
+			<type>2</type>
+			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject
index 527852ae..f9f2751e 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject
@@ -21,15 +21,15 @@
 							<builder id="org.eclipse.cdt.build.core.settings.default.builder.681215945" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1913618182" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1359024970" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.648690541" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.648690541" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.865562104" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.321395526" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.76286563" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.76286563" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1168908150" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1390938668" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.684710851" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.684710851" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.645908401" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 						</toolChain>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project
index c8f9f208..e0391df6 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project
@@ -25,14 +25,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
-		</link>
-		<link>
-			<name>os_community</name>
+			<name>os-community</name>
 			<type>2</type>
 			<locationURI>PARENT-4-PROJECT_LOC/os</locationURI>
 		</link>
+		<link>
+			<name>os-git</name>
+			<type>2</type>
+			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject b/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject
index e658cfae..9ba3e1ae 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject
@@ -21,15 +21,15 @@
 							<builder id="org.eclipse.cdt.build.core.settings.default.builder.681215945" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1913618182" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1359024970" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.648690541" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.648690541" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.865562104" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.321395526" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.76286563" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.76286563" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1168908150" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1390938668" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.684710851" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.684710851" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.645908401" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 						</toolChain>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/.project b/testhal/STM32/STM32F4xx/FSMC_SRAM/.project
index 2ae708bd..b25c0984 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/.project
@@ -25,14 +25,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
-		</link>
-		<link>
-			<name>os_community</name>
+			<name>os-community</name>
 			<type>2</type>
 			<locationURI>PARENT-4-PROJECT_LOC/os</locationURI>
 		</link>
+		<link>
+			<name>os-git</name>
+			<type>2</type>
+			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/onewire/.project b/testhal/STM32/STM32F4xx/onewire/.project
index cf8a2773..cb64a534 100644
--- a/testhal/STM32/STM32F4xx/onewire/.project
+++ b/testhal/STM32/STM32F4xx/onewire/.project
@@ -77,14 +77,14 @@
 	</natures>
 	<linkedResources>
 		<link>
-			<name>os</name>
-			<type>2</type>
-			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
-		</link>
-		<link>
-			<name>os_community</name>
+			<name>os-community</name>
 			<type>2</type>
 			<locationURI>PARENT-4-PROJECT_LOC/os</locationURI>
 		</link>
+		<link>
+			<name>os-git</name>
+			<type>2</type>
+			<locationURI>PARENT-5-PROJECT_LOC/os</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>