diff --git a/Application/Shared/WiXAutomationInteface/IsWiXNamespaces.cs b/Application/Shared/WiXAutomationInteface/IsWiXNamespaces.cs
index 97037d5..feea3a1 100644
--- a/Application/Shared/WiXAutomationInteface/IsWiXNamespaces.cs
+++ b/Application/Shared/WiXAutomationInteface/IsWiXNamespaces.cs
@@ -69,7 +69,7 @@ public Dictionary<string, string> PossibleNamespaces
  
                     foreach (var file in new DirectoryInfo(schemasDir).GetFiles(patternMatch))
                     {
-                        string prefix = Path.GetFileNameWithoutExtension(file.Name).ToLower();
+                        string prefix = Path.GetFileNameWithoutExtension(file.Name).ToLower().Split('-').First();
                         if (!prefix.Equals("wix"))
                         {
                             XDocument doc = XDocument.Load(file.FullName);
diff --git a/Application/Shared/WiXAutomationInteface/IsWixUpgradeFixer.cs b/Application/Shared/WiXAutomationInteface/IsWixUpgradeFixer.cs
index a41c8de..46c7eb3 100644
--- a/Application/Shared/WiXAutomationInteface/IsWixUpgradeFixer.cs
+++ b/Application/Shared/WiXAutomationInteface/IsWixUpgradeFixer.cs
@@ -28,13 +28,17 @@ public static void Fix()
                     }
                     foreach (var element in module.Elements(ns + "StandardDirectory"))
                     {
-                        targetDir.Add(new XElement(ns + "Directory", new XAttribute("Id", element.Attribute("Id").Value)));
+                        XElement newDirectory = new XElement(ns + "Directory", new XAttribute("Id", element.Attribute("Id").Value));
+                        foreach (var subElement in element.Elements())
+                        {
+                            newDirectory.Add(subElement);
+                        }
+                        targetDir.Add(newDirectory);
                         element.Remove();
                     }
                     module.Add(targetDir);
                 }
             }
         }      
-
     }
 }
\ No newline at end of file