Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r1190 -r1194
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 1190)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 1194)
@@ -128,13 +128,13 @@
                     input.AnalysisType = ConversionHelper.ConvertToInputAnalysisType(DamProjectCalculationSpecification.SelectedAnalysisType);
                 }
 
-                input.PipingModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismPiping) || (input.DamProjectType == InputDamProjectType.Assessment);
+                input.PipingModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismPiping) || (input.DamProjectType == InputDamProjectType.AssessmentRegional);
                 if (input.PipingModelTypeSpecified)
                 {
                     input.PipingModelType = ConversionHelper.ConvertToInputPipingModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType);
                 }
 
-                input.StabilityModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityInside) || (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityOutside) || (input.DamProjectType == InputDamProjectType.Assessment);
+                input.StabilityModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityInside) || (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityOutside) || (input.DamProjectType == InputDamProjectType.AssessmentRegional);
                 if (input.StabilityModelTypeSpecified)
                 {
                     input.StabilityModelType = ConversionHelper.ConvertToInputStabilityModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType);
Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r1190 -r1194
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1190)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1194)
@@ -44,8 +44,7 @@
         {
             var translationTable = new Dictionary<InputDamProjectType, DamProjectType>()
                                                {
-                                                   {InputDamProjectType.Assessment, DamProjectType.Assessment},
-                                                   {InputDamProjectType.AssessmentRegional, DamProjectType.Assessment}, // must be handled in additional code after conversion
+                                                   {InputDamProjectType.AssessmentRegional, DamProjectType.Assessment}, 
                                                    {InputDamProjectType.Design, DamProjectType.Design},
                                                    {InputDamProjectType.Operational, DamProjectType.Calamity}
                                                };
@@ -60,7 +59,7 @@
         {
             var translationTable = new Dictionary<DamProjectType, InputDamProjectType>()
                                                {
-                                                   {DamProjectType.Assessment, InputDamProjectType.Assessment},
+                                                   {DamProjectType.Assessment, InputDamProjectType.AssessmentRegional},
                                                    {DamProjectType.Design, InputDamProjectType.Design},
                                                    {DamProjectType.Calamity, InputDamProjectType.Operational},
                                                };
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r1190 -r1194
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 1190)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 1194)
@@ -36,7 +36,6 @@
     public class ConversionHelperTests
     {
         [Test]
-        [TestCase(InputDamProjectType.Assessment, DamProjectType.Assessment)]
         [TestCase(InputDamProjectType.AssessmentRegional, DamProjectType.Assessment)]
         [TestCase(InputDamProjectType.Design, DamProjectType.Design)]
         [TestCase(InputDamProjectType.Operational, DamProjectType.Calamity)]
@@ -46,7 +45,7 @@
         }
 
         [Test]
-        [TestCase(DamProjectType.Assessment, InputDamProjectType.Assessment)]
+        [TestCase(DamProjectType.Assessment, InputDamProjectType.AssessmentRegional)]
         [TestCase(DamProjectType.Design, InputDamProjectType.Design)]
         [TestCase(DamProjectType.Calamity, InputDamProjectType.Operational)]
         public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType)