diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Ada.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Ada.uexml
index 4c1ccc5b..0c0680db 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Ada.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Ada.uexml
@@ -13,7 +13,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.AdaCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.AdaCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Boo.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Boo.uexml
index ddf491f6..f854f17b 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Boo.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Boo.uexml
@@ -13,7 +13,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.BooCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.BooCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/COBOL.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/COBOL.uexml
index 114a6b9e..84608406 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/COBOL.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/COBOL.uexml
@@ -15,7 +15,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.COBOLCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.COBOLCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/CSharp.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/CSharp.uexml
index c1563e08..72301b1f 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/CSharp.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/CSharp.uexml
@@ -13,7 +13,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.CSharpCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.CSharpCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FORTRAN.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FORTRAN.uexml
index db66c047..8df9dd4e 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FORTRAN.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FORTRAN.uexml
@@ -14,7 +14,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.FORTRANCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.FORTRANCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FSharp.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FSharp.uexml
index 4228ecde..1ed31a3d 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FSharp.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/FSharp.uexml
@@ -13,7 +13,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.FSharpCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.FSharpCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Go.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Go.uexml
index a7284440..eb59baa1 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Go.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Go.uexml
@@ -13,7 +13,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.GoCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.GoCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Java.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Java.uexml
index 3affe59b..06253e78 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Java.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/Java.uexml
@@ -18,7 +18,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.Java.JavaClassDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.Java.JavaClassDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/VisualBasicNET.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/VisualBasicNET.uexml
index 43940aa2..10669cde 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/VisualBasicNET.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/CodeObjectModel/VisualBasicNET.uexml
@@ -13,7 +13,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.SourceCode.CodeObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Programming.VisualBasicNETCodeDataFormat" />
+				<DataFormat TypeName="UniversalEditor.DataFormats.SourceCode.VisualBasicNETCodeDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>