diff --git a/StructureHelperLogics/Models/Templates/CrossSections/RCs/RCSectionTemplate.cs b/StructureHelperLogics/Models/Templates/CrossSections/RCs/RCSectionTemplate.cs
index f04df8f..92b2070 100644
--- a/StructureHelperLogics/Models/Templates/CrossSections/RCs/RCSectionTemplate.cs
+++ b/StructureHelperLogics/Models/Templates/CrossSections/RCs/RCSectionTemplate.cs
@@ -27,7 +27,6 @@ namespace StructureHelperLogics.Models.Templates.CrossSections
             var repository = section.SectionRepository;
             var materials = materialLogic.GetHeadMaterials();
             primitives = geometryLogic.GetNdmPrimitives();
-#error
             repository.HeadMaterials.AddRange(materials);
             repository.Primitives.AddRange(primitives);
             combinations = forceLogic.GetCombinationList();
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
index cf4c733..7488383 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
@@ -26,7 +26,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         public List<LimitStates> LimitStatesList { get; }
         public List<CalcTerms> CalcTermsList { get; }
         public List<IForceCombinationList> ForceCombinationLists { get; }
-        public List<INdmPrimitive> NdmPrimitives { get; }
+        public List<INdmPrimitive> Primitives { get; }
         public INdmResult Result { get; private set; }
 
 
@@ -52,7 +52,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
                     var calcTerm = tuple.CalcTerm;
                     if (LimitStatesList.Contains(limitState) & CalcTermsList.Contains(calcTerm))
                     {
-                        var ndms = NdmPrimitivesService.GetNdms(NdmPrimitives, limitState, calcTerm);
+                        var ndms = NdmPrimitivesService.GetNdms(Primitives, limitState, calcTerm);
                         IPoint2D point2D;
                         if (combination.SetInGravityCenter == true)
                         {
@@ -75,7 +75,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         private string CheckInputData()
         {
             string result = "";
-            if (NdmPrimitives.Count == 0) { result += "Calculator does not contain any primitives \n"; }
+            if (Primitives.Count == 0) { result += "Calculator does not contain any primitives \n"; }
             if (ForceCombinationLists.Count == 0) { result += "Calculator does not contain any forces \n"; }
             if (LimitStatesList.Count == 0) { result += "Calculator does not contain any limit states \n"; }
             if (CalcTermsList.Count == 0) { result += "Calculator does not contain any duration \n"; }
@@ -85,7 +85,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         public ForceCalculator()
         {
             ForceCombinationLists = new List<IForceCombinationList>();
-            NdmPrimitives = new List<INdmPrimitive>();
+            Primitives = new List<INdmPrimitive>();
             IterationAccuracy = 0.001d;
             MaxIterationCount = 1000;
             LimitStatesList = new List<LimitStates>() { LimitStates.ULS, LimitStates.SLS };
diff --git a/Windows/ViewModels/Calculations/Calculators/ForceCalculatorViewModel.cs b/Windows/ViewModels/Calculations/Calculators/ForceCalculatorViewModel.cs
index ace2233..8f74036 100644
--- a/Windows/ViewModels/Calculations/Calculators/ForceCalculatorViewModel.cs
+++ b/Windows/ViewModels/Calculations/Calculators/ForceCalculatorViewModel.cs
@@ -57,7 +57,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         {
             get
             {
-                var sourceItems = forcesCalculator.NdmPrimitives;
+                var sourceItems = forcesCalculator.Primitives;
                 var rejectedItems = allowedPrimitives.Where(x => sourceItems.Contains(x));
                 var filteredItems = allowedPrimitives.Except(rejectedItems);
                 return ConvertNdmPrimitivesToPrimitiveBase(filteredItems);
@@ -67,7 +67,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         {
             get
             {
-                var sourceItems = forcesCalculator.NdmPrimitives;
+                var sourceItems = forcesCalculator.Primitives;
                 return ConvertNdmPrimitivesToPrimitiveBase(sourceItems);
             }
         }
@@ -94,8 +94,8 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         }
         private void AddAllPrimitives()
         {
-            forcesCalculator.NdmPrimitives.Clear();
-            forcesCalculator.NdmPrimitives.AddRange(allowedPrimitives);
+            forcesCalculator.Primitives.Clear();
+            forcesCalculator.Primitives.AddRange(allowedPrimitives);
         }
         public ICommand ClearAllPrimitivesCommand
         {
@@ -105,10 +105,10 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
                     (
                     clearAllPrimitivesCommand = new RelayCommand(o =>
                     {
-                        forcesCalculator.NdmPrimitives.Clear();
+                        forcesCalculator.Primitives.Clear();
                         OnPropertyChanged(nameof(AllowedPrimitives));
                         OnPropertyChanged(nameof(Primitives));
-                    }, o => forcesCalculator.NdmPrimitives.Count > 0 ));
+                    }, o => forcesCalculator.Primitives.Count > 0 ));
             }
         }
         public ICommand AddSelectedPrimitiveCommand
@@ -119,7 +119,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
                     (
                     addSelectedPrimitiveCommand = new RelayCommand(o =>
                     {
-                        forcesCalculator.NdmPrimitives.Add(SelectedAllowedPrimitive.GetNdmPrimitive());
+                        forcesCalculator.Primitives.Add(SelectedAllowedPrimitive.GetNdmPrimitive());
                         OnPropertyChanged(nameof(AllowedPrimitives));
                         OnPropertyChanged(nameof(Primitives));
                     }, o => SelectedAllowedPrimitive != null));
@@ -133,7 +133,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
                     (
                     removeSelectedPrimitive = new RelayCommand(o =>
                     {
-                        forcesCalculator.NdmPrimitives.Remove(SelectedPrimitive.GetNdmPrimitive());
+                        forcesCalculator.Primitives.Remove(SelectedPrimitive.GetNdmPrimitive());
                         OnPropertyChanged(nameof(AllowedPrimitives));
                         OnPropertyChanged(nameof(Primitives));
                     }, o => SelectedPrimitive != null));
diff --git a/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs b/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
index 79e13a8..6c62c1b 100644
--- a/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
+++ b/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
@@ -53,7 +53,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         {
             this.forceCalculator = forceCalculator;
             this.forcesResults = this.forceCalculator.Result as IForcesResults;
-            ndmPrimitives = this.forceCalculator.NdmPrimitives;
+            ndmPrimitives = this.forceCalculator.Primitives;
         }
 
         private void ShowIsoField()