Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs
===================================================================
diff -u -r1119 -r1120
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 1119)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 1120)
@@ -34,8 +34,8 @@
     public interface ILocationJob
     {
         Location Location { get; }
-        IEnumerable<RegionalScenarioResult> RWScenarioResults { get; }
-        bool HasRWScenarioResults { get; }
+        IEnumerable<RegionalScenarioResult> RegionalScenarioResults { get; }
+        bool HasRegionalScenarioResults { get; }
     }
 
     public class LocationJob : DamJob, ILocationJob
@@ -82,36 +82,22 @@
             }
         }
 
-        public virtual IEnumerable<RegionalScenarioResult> RWScenarioResults
+        public virtual IEnumerable<RegionalScenarioResult> RegionalScenarioResults
         {
             get
             {
-                return !this.HasRWScenarioResults ?
+                return !this.HasRegionalScenarioResults ?
                     new List<RegionalScenarioResult>() : this.locationResult.RegionalScenariosResult.RegionalScenarioResults;
             }
         }
 
-        public virtual IEnumerable<RWSchematizationFactorResult> SchematizationFactorResults
+        public bool HasRegionalScenarioResults
         {
-            get
-            {
-                return !this.HasSchematizationFactorResults ?
-                    new List<RWSchematizationFactorResult>() : this.locationResult.SchematizationFactorsResult.SchematizationFactorResults;
-            }
-        }
-
-        public bool HasRWScenarioResults
-        {
             get { return this.locationResult != null && this.locationResult.RegionalScenariosResult != null &&
                 this.locationResult.RegionalScenariosResult.RegionalScenarioResults.Any();
             }
         }
 
-        public bool HasSchematizationFactorResults
-        {
-            get { return this.locationResult != null && this.locationResult.SchematizationFactorsResult != null; }
-        }
-
         public virtual LocationResult LocationResult
         {
             get { return locationResult; }
@@ -146,20 +132,20 @@
                         locationResult.StabilityTimeSerie.Entries.Count > 0 && HasUsableStabilityTimeSerieEntries()));
             }
         }
-     
+
         /// <summary>
         /// Return the result of the profile with highest probability of occurrence
         /// </summary>
-        /// <param name="scenarioType"></param>
         /// <returns></returns>
         /// <summary>
         /// Return result with the lowest safetyfactor
         /// </summary>
-        /// <param name="scenarioType"></param>
+        /// <param name="scenarioType">
+        /// </param>
         /// <returns></returns>
         public RegionalScenarioProfileResult GetRWScenarioResultWithLowestSafetyFactor(ScenarioType scenarioType)
         {
-            if (this.HasRWScenarioResults)
+            if (this.HasRegionalScenarioResults)
             {
                 var scenarioResult = this.LocationResult.RegionalScenariosResult.GetScenarioResult(scenarioType);
                 if (scenarioResult != null && scenarioResult.RegionalScenarioProfileResults.Count > 0)
@@ -248,7 +234,7 @@
                 }
                 else if (DamProjectType == DamProjectType.Assessment)
                 {
-                    if (this.HasRWScenarioResults && GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType) != null)
+                    if (this.HasRegionalScenarioResults && GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType) != null)
                     {
                         return GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType).SafetyFactor;
                     }
@@ -300,7 +286,7 @@
 
         public bool AreRWScenarioResultsMixed(ScenarioType scenarioType)
         {
-            if (this.HasRWScenarioResults)
+            if (this.HasRegionalScenarioResults)
             {
                 var scenarioResult = this.LocationResult.RegionalScenariosResult.GetScenarioResult(scenarioType);
                 if (scenarioResult != null && scenarioResult.RegionalScenarioProfileResults.Count > 0)