Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj
===================================================================
diff -u -r73 -r77
--- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 73)
+++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 77)
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Deltares.DSoilModel.Application</RootNamespace>
-    <AssemblyName>D-Soil Model</AssemblyName>
+    <AssemblyName>DSoilModel</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
Index: src/Deltares.DSoilModel.Setup/Product.wxs
===================================================================
diff -u -r74 -r77
--- src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 74)
+++ src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 77)
@@ -4,7 +4,7 @@
   <?include Variables.wxi ?>
 
   <?define ReleaseVersion="16.1.0" ?> <!-- Update this to the correct version -->
-  <?define ProductName="D-Soil Model" ?>  
+  <?define ProductName="DSoilModel" ?>  
 
   <?ifdef env.BUILD_NUMBER ?>
     <?define FullProductVersion="$(var.ReleaseVersion).$(env.BUILD_NUMBER)" ?>
Index: src/Deltares.DSoilModel.Setup/BinFolder.wxs
===================================================================
diff -u -r73 -r77
--- src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 73)
+++ src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 77)
@@ -2,187 +2,187 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{9E05FAF4-9409-41E3-9983-96F0AEF06AE8}">
+            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{FEC8764C-43F7-448B-9A6E-A75C84894C65}">
                 <File Id="fil4F2F84FF87942002C8948E87F05D7778" KeyPath="yes" Source="$(var.BinFolder)\borlndmm.dll" />
             </Component>
-            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{8C02017F-5929-49D8-8CF0-F6D07959CF12}">
+            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{29D9CACD-1264-4BC8-A24E-068D3DA0EE61}">
                 <File Id="filF6F8D425085FF74F926B9D6CC8C495EA" KeyPath="yes" Source="$(var.BinFolder)\BruTile.Desktop.dll" />
             </Component>
-            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{A39CD08A-1C23-48FD-BDEE-CD1AB8D0D92A}">
+            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{FB544CE1-DA57-46A0-949D-BE2480B793AC}">
                 <File Id="filA1A79E623D117F91354458DC3D241736" KeyPath="yes" Source="$(var.BinFolder)\BruTile.dll" />
             </Component>
-            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{DBABD7C9-2CAB-497B-8414-BA0FC74CC458}">
+            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{907603B4-51F9-4D5F-85DE-BA75346FAB85}">
                 <File Id="fil91D9F542E01E16BA0EF901B13142A8E1" KeyPath="yes" Source="$(var.BinFolder)\D-SoilModel.ico" />
             </Component>
-            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{80195556-D30C-478D-86CD-D281B649AB54}">
+            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{6465AB6E-38F0-4930-8CCB-ABA943571BF6}">
                 <File Id="fil10BD73AB0BB296E6DFEAA7D72CC26003" KeyPath="yes" Source="$(var.BinFolder)\Deltares.AssessmentMechanism.dll" />
             </Component>
-            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{51E27A04-D574-4D45-A897-610F36E8B9A5}">
+            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{A17C5A6A-EC0B-4F9C-A953-4C7F45E4D04A}">
                 <File Id="fil1992AA5619D465310A20205E7D1B118B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DeltaModel.dll" />
             </Component>
-            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{F4873A92-3F15-4416-85C8-7602B4B94E76}">
+            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{3487368F-D73D-44D5-BC8D-9809389907BA}">
                 <File Id="fil830BBEF28A818FF7484F117C8F4D9FD9" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Data.dll" />
             </Component>
-            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{95CDE837-3878-4BAC-B555-CD0FCFF51BCA}">
+            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{8C25CFF4-35B0-462B-BC3F-BA2A9CB8BB29}">
                 <File Id="fil5F82F57C4DC68136D0AA96686BDC9EA1" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Forms.dll" />
             </Component>
-            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{5DE5CF66-9C03-44DD-ADA8-F6E781BAD27B}">
+            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{DAEF760C-D3ED-40AD-9260-AADC6F4547BA}">
                 <File Id="filF58BF540C920CCF88B65E501DCFB6B4C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geographic.dll" />
             </Component>
-            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{BDEF0137-945B-47E5-B61B-C7926856BE77}">
+            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{A341B43D-394A-4C98-AF8B-DF021E52310D}">
                 <File Id="filA7DD37798AA8266B91004255DD8B8A5B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.dll" />
             </Component>
-            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{6C33FB6B-B22E-491B-A5D3-D9A88DD5C999}">
+            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{3C13C989-2908-4AF1-ACAA-C1757FE127E9}">
                 <File Id="filA863E0BA8ED734C9127D6BCD52E05F67" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.dll" />
             </Component>
-            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{1BCBF245-AD5C-4A2D-BE23-8288C066E1EA}">
+            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{5E5C8AB4-7D69-4FD7-AF32-6F3E31DEC0D3}">
                 <File Id="filD9CE646D943931633DFA5796BDB4CAA6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.dll" />
             </Component>
-            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{D91E8D40-E45F-40E6-87AD-7B9A87F90DBA}">
+            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{65BEDEE0-A70D-48A4-BD14-0D9CA0EFBC3F}">
                 <File Id="fil752D455EF949ECF337DDA3E26765A9B0" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.dll" />
             </Component>
-            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{C9DEDA89-E624-4DDB-A5F3-F59142DFAEC1}">
+            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{51D875AA-83AB-420E-97C4-46DD1D255F98}">
                 <File Id="fil73E1BEB42310ADB6CE87A583123DECD5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.IO.dll" />
             </Component>
-            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{BF708CA7-C5DB-455D-B2EE-84D8FDDE0581}">
+            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{3F2B3AF0-D55B-461F-B80E-AAF31ECAC7D2}">
                 <File Id="filD609F583F9120C092011AFCFCCC2CA2A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.WaternetCreator.dll" />
             </Component>
-            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{68E99D6D-F481-4D5F-9E12-6FDA54184724}">
+            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{34071869-1E74-4DCC-9553-3064BE2DA610}">
                 <File Id="fil2465D685D3FEC60224C7831BBFA4FB94" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.dll" />
             </Component>
-            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{0B039076-253D-4D0C-B165-7633A259C072}">
+            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{59B1FEB2-79ED-41C9-AE83-DEDFDDE6BF0A}">
                 <File Id="fil9A91397F5BD956AB1251C9635BA53B48" KeyPath="yes" Source="$(var.BinFolder)\Deltares.MStab.IO.Classic.dll" />
             </Component>
-            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{9724825E-803D-4505-846F-D9D7C9E24136}">
+            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{7E1C0559-DEC1-42C9-BF42-EBAD06B0526B}">
                 <File Id="filE5592BB6738BBDCE69B114AF5CF76D87" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.dll" />
             </Component>
-            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{004EF944-2F76-4E13-8906-4CACEA12EC03}">
+            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{66E33717-6A04-4F08-9E85-09C8539B8E5B}">
                 <File Id="fil526AA9AE0BE0AC023B0F474FB7A7829F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Soilbase.dll" />
             </Component>
-            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{E36475F3-8C9D-46F9-94BE-A0211A1EA45D}">
+            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{263F93F0-B28B-4F32-BEFA-298DC8F249D4}">
                 <File Id="fil8D6B9C2156EADA1AAD9A42D76A95873D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.dll" />
             </Component>
-            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{9053FC16-F4EB-4AAF-AC89-CE3CE0906734}">
+            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{22D29856-6586-4EB5-9084-9A9B4E77BB4B}">
                 <File Id="filACB76FF5040E1CE5916354F73FFD79FD" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.dll" />
             </Component>
-            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{3FB6D9F7-4711-4854-BBC9-3BB6D31CBE0F}">
+            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{B02710F7-685A-4F43-9B23-471FF5FA2E26}">
                 <File Id="filA03E1477F2EC4D82F67AF45FE6F36FCB" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.dll" />
             </Component>
-            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{DEAD8AB5-E552-4093-9E9C-6F33DD6BC0AE}">
+            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{2477E11B-BACD-4257-B314-A2ACAF6D2AC1}">
                 <File Id="filBCFD0AFC655FAF059DAB71A78DD340FA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.dll" />
             </Component>
-            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{501AF1E3-2905-46A5-8AB0-1832FE93A282}">
+            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{54B26CEA-61C8-43F2-BFE9-1F55A718D076}">
                 <File Id="fil90A24F951D0CA4F0849D4F1132902AF2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.dll" />
             </Component>
-            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{CE8C1145-744E-46FE-A99C-54C152A18221}">
+            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{A081F10D-8CAE-4BD7-9E99-50CF22BA25B0}">
                 <File Id="fil6E31E187D604DCC574208AC9949F8D98" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.dll" />
             </Component>
-            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{C16D509B-5E03-45B8-9260-A4CE80B82984}">
+            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{01297FEA-B8B7-42C3-BF36-DC19FC049871}">
                 <File Id="filABE4682BE5464D6FBA20B56403F5A5DB" KeyPath="yes" Source="$(var.BinFolder)\DGSGEF.dll" />
             </Component>
-            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{B47C7517-D9CA-4C0A-9D10-5F08F74C2ACC}">
+            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{6E4C1076-A045-4249-AF19-C32A01B477FA}">
                 <File Id="filBEA5E161DDC438A31EA77F1BF1916C48" KeyPath="yes" Source="$(var.BinFolder)\DGSMStabSerializer.dll" />
             </Component>
-            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{4D0CE907-3D33-461B-9BC5-0550C02014AB}">
+            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{C435418F-71D4-40D6-B396-77E4EDDD7FC2}">
                 <File Id="fil9520B1B9A5AFC3FDB971A10F03EC8CB8" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll" />
             </Component>
-            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{7F29EFF8-C5A3-4BEE-81A3-0FFBE1DCB00D}">
+            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{0B3DE48D-4B11-4C01-9A19-FFCF2F3D1324}">
                 <File Id="filD0C467F1DF28BF727E39F7C10430F474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll" />
             </Component>
-            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{64DB12D3-64DC-4FCC-AE9D-0801F4B3480C}">
+            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{B5C1C675-ED83-4331-9EDA-7795C3F54098}">
                 <File Id="fil2F9A79508558F53BD2343DC5C118A4EB" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.dll" />
             </Component>
-            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{CAF14B18-8BFA-4BF7-951D-3AE3CA532B46}">
+            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{F96790DE-19AA-4152-8A2E-26549AB6DBB0}">
                 <File Id="filC95772BD906C6022EF697886806A5DCD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Rasters.GdalExtension.dll" />
             </Component>
-            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{FE609E47-4C95-439A-8D2E-F2B0DF04DA98}">
+            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{92607073-E102-4C2F-A8C3-E5BE3F4E4D2D}">
                 <File Id="filC72E3D7BC7E19BAF1B3D8B6EAD78881A" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.dll" />
             </Component>
-            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{652E425E-7CA3-440B-A443-84FD6E4CB15B}">
+            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{8D9C0897-D9BD-4ADE-AC00-2103C60365BC}">
                 <File Id="filB3E0D08FBE5254C0F088A8C621CCD4E5" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.dll" />
             </Component>
-            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{0B11646E-5FFC-4069-857C-3E743BC8C6A2}">
+            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{3BE8C963-A79F-48FB-BC5A-C7A567BC2F46}">
                 <File Id="filDB65EB11731F9F6C9F2577DA7EB72B02" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.dll" />
             </Component>
-            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{DB62A45B-C87C-4FB3-BA4B-99CFAA68333D}">
+            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{E102EC92-39E4-4AE3-8C49-AD822E4EDFAD}">
                 <File Id="fil4F36B405D36414D50469C1B930CD5F41" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Plugins.BruTileLayer.dll" />
             </Component>
-            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{E7C61E00-021A-41B9-BFA4-C1A8625C2318}">
+            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{72FA8931-07B0-409A-BCE2-1A811E24B996}">
                 <File Id="fil633A635CD1999CA278E4CAF66737F1BE" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.dll" />
             </Component>
-            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{9A5D3597-630B-40F5-A3E8-80EC7790C2C5}">
+            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{814AF544-D8E6-4952-A42E-43500E83F1CB}">
                 <File Id="fil77520A9338FE58511FFA1BE8685DF474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.dll" />
             </Component>
-            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{50791C14-B7D1-4C22-B98F-A7F77BF82C63}">
+            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{E765BB04-1B2F-43AC-8BE2-4F5E14F1F682}">
                 <File Id="fil05F11F140B2B59A85D38669DA41E8816" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll" />
             </Component>
-            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{30A73D87-F29A-46BB-9731-1616156D626D}">
+            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{8A968006-B1F5-4B72-830B-F5B2C170405D}">
                 <File Id="fil3271680B2C8E226D1D2CDD194F77FFA1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.dll" />
             </Component>
-            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{EEEC2431-9F51-4E59-94CE-00D6282206F7}">
+            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{6FB7EE4D-1467-4D07-B70F-6FEBF6745747}">
                 <File Id="fil82F207E2AC29239FD761F230254FCFB1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.dll" />
             </Component>
-            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{4F4D00BE-5189-4FB4-A941-D7DF7D8EAB9C}">
+            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{9BED4D6C-3656-44A2-A774-73FDCDDC9BF1}">
                 <File Id="filEA078EED09626E9475CF9C0FE6B9581D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.dll" />
             </Component>
-            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{5AAE4ADA-C4F5-4C40-9E07-312D867BB6EE}">
-                <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\D-Soil Model.exe" />
+            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{ECFF4F26-05B7-4F82-BE8B-A896108BB3B1}">
+                <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe" />
             </Component>
-            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{C37915B7-0A12-4DB4-942A-1ACFC84F9F44}">
-                <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\D-Soil Model.exe.config" />
+            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{82E9E7B3-ECF8-45C5-BD50-65A3876EEA22}">
+                <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe.config" />
             </Component>
-            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{13E88958-CF15-4E64-84E0-288D7B9C973F}">
+            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{16515760-28AE-4D5D-A39B-7F7C7BD2850D}">
                 <File Id="filA80D8C7C88FEA11402E41B4F0A597F13" KeyPath="yes" Source="$(var.BinFolder)\fbembed.dll" />
             </Component>
-            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{E959C9E3-CD46-42EE-9D1A-90A8A24A1D84}">
+            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{5FEBDE43-FB56-4125-A1E9-D64ACCD9CADF}">
                 <File Id="fil5AD82B318E8DD2E38581B3708F19B820" KeyPath="yes" Source="$(var.BinFolder)\firebird.msg" />
             </Component>
-            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{99669404-F722-4EEB-AFA7-5C77DC66F9AE}">
+            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{8F0BC9D3-7554-4E36-AE41-724D4D8C87FF}">
                 <File Id="fil234C916FCD1D852EC8438002B8BAEDEA" KeyPath="yes" Source="$(var.BinFolder)\FirebirdSql.Data.FirebirdClient.dll" />
             </Component>
-            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{8ACAD21D-9F2C-46DE-8ED8-2EA8316B37DF}">
+            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{37C9E85A-F2F8-40ED-AFD1-0683B27CBFBF}">
                 <File Id="filDD73F351863FEF37BD9EA1EDA68D49A6" KeyPath="yes" Source="$(var.BinFolder)\gdal_csharp.dll" />
             </Component>
-            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{A70E0A7E-D9C5-4FA1-879E-17FECD7A1AEC}">
+            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{8A2C2B7C-3A87-442F-ABF9-501C05FA7892}">
                 <File Id="filCA1B93B1E04F9E859706929F4AB3CFAE" KeyPath="yes" Source="$(var.BinFolder)\Gef2.dll" />
             </Component>
-            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{847D2D7D-32C8-4675-A21B-89B1C1B3211E}">
+            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{8CCE11A9-534F-4101-A402-5602060D92F7}">
                 <File Id="fil55A495EE2A8C0D1AC7E4625A9332454F" KeyPath="yes" Source="$(var.BinFolder)\ib_util.dll" />
             </Component>
-            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{EBCD116E-6BEE-45CF-ADCA-302536845B7C}">
+            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{4313614E-17AA-4178-8A25-64F06E4F97D6}">
                 <File Id="fil8500BA131F16F61959822A95B67A257C" KeyPath="yes" Source="$(var.BinFolder)\icudt30.dll" />
             </Component>
-            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{519AE81E-A38B-4FE4-A457-50BF6A34A026}">
+            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{3D308343-789D-4D79-87EE-AD3A244D5FBA}">
                 <File Id="fil19B3813E023D34D2E651155522C0E83A" KeyPath="yes" Source="$(var.BinFolder)\icuin30.dll" />
             </Component>
-            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{E6401976-A18D-458A-84E2-8965B44D2458}">
+            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{0A9B7C1C-B73F-4F41-AED9-2100F1B330ED}">
                 <File Id="filEB52BFF83606A0185E8CC52B28A4FC43" KeyPath="yes" Source="$(var.BinFolder)\icuuc30.dll" />
             </Component>
-            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{DDB23335-B254-462C-A834-4128ED8D0579}">
+            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{46EF1362-1987-4F2B-9E20-2FF3A9724334}">
                 <File Id="fil14B37B6F117880072CC8B3DD806A47D6" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.dll" />
             </Component>
-            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{A9FFC627-8A99-4922-A6B4-5B77FA66DACA}">
+            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{68170237-AEF5-472A-8117-84984219B2FD}">
                 <File Id="fil7074B34CCDD7ABC6B6FDB40762FB4CF9" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.dll" />
             </Component>
-            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{5EFA67A2-F037-49C4-AAF0-E071BF1E254F}">
+            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{85BFE422-E1C8-436F-93D9-8A702D50D2D4}">
                 <File Id="fil58FA97A82C74E7C028484557C2E9031F" KeyPath="yes" Source="$(var.BinFolder)\ogr_csharp.dll" />
             </Component>
-            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{F331881A-3A6C-42EF-8CD4-382A2A07924E}">
+            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{14DD252F-65C2-46DE-85EA-F28A4F3AF707}">
                 <File Id="fil85F845F2C104287D16405A9C5D4DD89C" KeyPath="yes" Source="$(var.BinFolder)\osr_csharp.dll" />
             </Component>
-            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{1DEE679D-F283-4A16-A3C3-6D7CED34836C}">
+            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{CA71BA40-CB7D-4ABF-89C5-AAF5DB55DCFC}">
                 <File Id="fil5A492671E7E6729B61DA592709A368FE" KeyPath="yes" Source="$(var.BinFolder)\SmartThreadPool.dll" />
             </Component>
-            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{31CC36EA-F7A3-4C36-897C-927A436AC1E6}">
+            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{03EA651D-E139-46FA-BFBB-42BDF89E006D}">
                 <File Id="fil86030949C08D40073D1F77D572C14B0D" KeyPath="yes" Source="$(var.BinFolder)\System.Data.SQLite.dll" />
             </Component>
             <Directory Id="dir2F3D431E0ED26930C4D37E679C7700A1" Name="nl">
-                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{125CD007-2CBA-4159-9877-FFCBC1A0D541}">
+                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{6F6C60D8-39C2-4A11-A434-A1FB584FD8FB}">
                     <File Id="filF7D36D11E7B251700E8C6B6DB2B21155" KeyPath="yes" Source="$(var.BinFolder)\nl\DotSpatial.Projections.Forms.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir97F42FF68945B97AAE670945C4FDAE93" Name="x86">
-                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{F9D1ACA2-E3BC-4A8D-86A2-847BCCB223CA}">
+                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{0C08FC12-F6D6-4C16-B5AD-AFA72FA6AE30}">
                     <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source="$(var.BinFolder)\x86\SQLite.Interop.dll" />
                 </Component>
             </Directory>