Refactored test to procedures.

author: Roy Ben Shabat <Roy.mail.net@gmail.com> 2020-05-27 13:06:05 +0300
committer: Roy Ben Shabat <Roy.mail.net@gmail.com> 2020-05-27 13:06:05 +0300
commit: 860b9995abbf63b1085e9b6069e6b53e83d33aaf (patch)
tree: 2a75000d380a7f5659bf205354de20338ee032f2 /Software
parent: 93cb59d7df48aa2aa89683ed93909c6495b353df (diff)
download: Tango-860b9995abbf63b1085e9b6069e6b53e83d33aaf.tar.gz
Tango-860b9995abbf63b1085e9b6069e6b53e83d33aaf.zip
83 files changed, 652 insertions, 654 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index d3395e617..ab91c9e0a 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 07e8d6d38..26d4ee8b5 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml
index cf67bdbba..685f94a44 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Tango.FSE.Stubs.App"
+<Application x:Class="Tango.FSE.Procedures.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ArrayParsingStyle.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ArrayParsingStyle.cs
index 1380f6564..c829a5b21 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ArrayParsingStyle.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ArrayParsingStyle.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public enum ArrayParsingStyle
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/ITestDesignerView.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/IProcedureDesignerView.cs
index f6566765e..eaa8562f8 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/ITestDesignerView.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Contracts/IProcedureDesignerView.cs
@@ -5,9 +5,9 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.FSE.Common;
 
-namespace Tango.FSE.Stubs.Contracts
+namespace Tango.FSE.Procedures.Contracts
 {
-    public interface ITestDesignerView : IFSEView
+    public interface IProcedureDesignerView : IFSEView
     {
         void FormatCode();
         void HighlightCode(int position, int length, int line);
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateGroup.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateGroup.cs
index de8de7107..b28134cd9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateGroup.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateGroup.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public class CreateGroup : ExtendedObject
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateItem.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateItem.cs
index be1d00df4..580895c57 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateItem.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/CreateItem.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public class CreateItem : ExtendedObject
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs
index b5208c008..d44564946 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core;
 
-namespace Tango.FSE.Stubs.Designer
+namespace Tango.FSE.Procedures.Designer
 {
     public class ProjectModel : ExtendedObject
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs
index 4fba3213d..fb36108df 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Tango.Core;
 using Tango.Scripting.Basic;
 
-namespace Tango.FSE.Stubs.Designer
+namespace Tango.FSE.Procedures.Designer
 {
     public class ScriptTabModel : ExtendedObject
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml
index 7ae84ff9e..09f34621e 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Tango.FSE.Stubs.Dialogs.AddReferenceAssemblyView"
+<UserControl x:Class="Tango.FSE.Procedures.Dialogs.AddReferenceAssemblyView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Dialogs"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Dialogs"
              mc:Ignorable="d" 
              Width="1000" Height="600" d:DataContext="{d:DesignInstance Type=local:AddReferenceAssemblyViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
     <Grid Margin="10">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml.cs
index 5bfd20b5f..ef3aeea92 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     /// <summary>
     /// Interaction logic for AddReferenceAssemblyView.xaml
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyViewVM.cs
index cee06ed91..b6f2543d9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/AddReferenceAssemblyViewVM.cs
@@ -13,7 +13,7 @@ using Tango.FSE.Common.FSEApplication;
 using Tango.Scripting.Basic;
 using Tango.SharedUI.Components;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     public class AddReferenceAssemblyViewVM : FSEDialogViewVM
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml
index 7bb2af7a7..134498652 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Tango.FSE.Stubs.Dialogs.LoadPublishedProjectView"
+<UserControl x:Class="Tango.FSE.Procedures.Dialogs.LoadPublishedProjectView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Dialogs"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Dialogs"
              mc:Ignorable="d" 
              Width="1000" Height="600" d:DataContext="{d:DesignInstance Type=local:LoadPublishedProjectViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
     <Grid Margin="10">
@@ -15,7 +15,7 @@
             </StackPanel>
 
             <Border Margin="0 20 0 0" BorderThickness="1" BorderBrush="{StaticResource FSE_BorderBrush}" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}" CornerRadius="5">
-                <ListBox FontSize="{StaticResource FSE_SmallFontSize}" Margin="2" Background="Transparent" HorizontalContentAlignment="Stretch" ItemsSource="{Binding PublishedTestProjects}" SelectedItem="{Binding SelectedProject}">
+                <ListBox FontSize="{StaticResource FSE_SmallFontSize}" Margin="2" Background="Transparent" HorizontalContentAlignment="Stretch" ItemsSource="{Binding PublishedProcedureProjects}" SelectedItem="{Binding SelectedProject}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <DockPanel>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml.cs
index 9ea4798d5..38bed8576 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     /// <summary>
     /// Interaction logic for LoadPublishedProjectView.xaml
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectViewVM.cs
index c430c3f90..34a4f6e52 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/LoadPublishedProjectViewVM.cs
@@ -8,16 +8,16 @@ using System.Windows.Data;
 using Tango.BL.Entities;
 using Tango.FSE.Common;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     public class LoadPublishedProjectViewVM : FSEDialogViewVM
     {
         private ICollectionView _projectsView;
 
-        public List<PublishedTestProject> PublishedTestProjects { get; set; }
+        public List<PublishedProcedureProject> PublishedProcedureProjects { get; set; }
 
-        private PublishedTestProject _selectedProject;
-        public PublishedTestProject SelectedProject
+        private PublishedProcedureProject _selectedProject;
+        public PublishedProcedureProject SelectedProject
         {
             get { return _selectedProject; }
             set { _selectedProject = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
@@ -30,14 +30,14 @@ namespace Tango.FSE.Stubs.Dialogs
             set { _showSuppressedProjects = value; RaisePropertyChangedAuto(); _projectsView?.Refresh(); }
         }
 
-        public LoadPublishedProjectViewVM(List<PublishedTestProject> projects)
+        public LoadPublishedProjectViewVM(List<PublishedProcedureProject> projects)
         {
             OKText = "LOAD PROJECT";
-            PublishedTestProjects = projects;
-            _projectsView = CollectionViewSource.GetDefaultView(PublishedTestProjects);
+            PublishedProcedureProjects = projects;
+            _projectsView = CollectionViewSource.GetDefaultView(PublishedProcedureProjects);
             _projectsView.Filter = (obj) =>
             {
-                PublishedTestProject p = obj as PublishedTestProject;
+                PublishedProcedureProject p = obj as PublishedProcedureProject;
 
                 if (p != null)
                 {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml
index 0e7a1185b..fa0a7b857 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Tango.FSE.Stubs.Dialogs.ResultGridView"
+<UserControl x:Class="Tango.FSE.Procedures.Dialogs.ResultGridView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Dialogs"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Dialogs"
              mc:Ignorable="d" 
              Width="1000" Height="600" d:DataContext="{d:DesignInstance Type=local:ResultGridViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
     <Grid Margin="10">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs
index ab908f94f..5dc17ed66 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridView.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     /// <summary>
     /// Interaction logic for ResultGridView.xaml
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridViewVM.cs
index b6e45c208..54c606962 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/ResultGridViewVM.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.FSE.Common;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     public class ResultGridViewVM : FSEDialogViewVM
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml
index 755fa0b65..b3b20e56b 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Tango.FSE.Stubs.Dialogs.UserInputDialogView"
+<UserControl x:Class="Tango.FSE.Procedures.Dialogs.UserInputDialogView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Dialogs"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Dialogs"
              mc:Ignorable="d" 
              Width="500" Height="Auto" MaxHeight="500" d:DataContext="{d:DesignInstance Type=local:UserInputDialogViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
     <Grid Margin="10">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml.cs
index d25c86ccd..e26cee5aa 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     /// <summary>
     /// Interaction logic for UserInputDialogView.xaml
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs
index 2160aa417..899ac77d7 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Dialogs/UserInputDialogViewVM.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Tango.Core;
 using Tango.FSE.Common;
 
-namespace Tango.FSE.Stubs.Dialogs
+namespace Tango.FSE.Procedures.Dialogs
 {
     public class UserInputDialogViewVM : FSEDialogViewVM
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
index 93ea56d5d..4039a34b9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureContext.cs
@@ -11,9 +11,9 @@ using Tango.FSE.Common.Diagnostics;
 using Tango.Integration.Operation;
 using Tango.Scripting.Basic;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
-    public interface ITestContext : IContext
+    public interface IProcedureContext : IContext
     {
         /// <summary>
         /// Gets the list of current results.
@@ -21,7 +21,7 @@ namespace Tango.FSE.Stubs
         ReadOnlyCollection<Result> Results { get; }
 
         /// <summary>
-        /// Adds a new test result.
+        /// Adds a new procedure result.
         /// </summary>
         /// <param name="type">The result type.</param>
         /// <param name="name">The result name.</param>
@@ -30,7 +30,7 @@ namespace Tango.FSE.Stubs
         Result AddResult(ResultType type, String name, object value);
 
         /// <summary>
-        /// Adds the test graph result.
+        /// Adds the procedure graph result.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <param name="name">The name.</param>
@@ -39,20 +39,20 @@ namespace Tango.FSE.Stubs
         Result AddGraphResult(ResultType type, String name, IEnumerable<double> values);
 
         /// <summary>
-        /// Adds a new test result.
+        /// Adds a new procedure result.
         /// </summary>
         /// <param name="result">The result.</param>
         /// <returns></returns>
         Result AddResult(Result result);
 
         /// <summary>
-        /// Removes the specified test result.
+        /// Removes the specified procedure result.
         /// </summary>
         /// <param name="result">The result.</param>
         void RemoveResult(Result result);
 
         /// <summary>
-        /// Clears all current test results.
+        /// Clears all current procedure results.
         /// </summary>
         void ClearResults();
 
@@ -189,7 +189,7 @@ namespace Tango.FSE.Stubs
         Object GetInput(String key);
 
         /// <summary>
-        /// Fails the current test with the specified error message.
+        /// Fails the current procedure with the specified error message.
         /// </summary>
         /// <param name="message">The error message.</param>
         void Fail(String message);
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureLogger.cs
index 286bc07ea..e04660839 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestLogger.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/IProcedureLogger.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
-    public interface ITestLogger
+    public interface IProcedureLogger
     {
         void WriteLine(String text);
         void Write(String text);
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Messages/TestProjectPublished.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Messages/ProcedureProjectPublishedOrSuppressed.cs
index 5895531af..65a74c5f3 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Messages/TestProjectPublished.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Messages/ProcedureProjectPublishedOrSuppressed.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs.Messages
+namespace Tango.FSE.Procedures.Messages
 {
-    public class TestProjectPublishedOrSuppressed
+    public class ProcedureProjectPublishedOrSuppressed
     {
         
     }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
index 6e2751e55..4a5e6cbfa 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureContext.cs
@@ -18,18 +18,18 @@ using Tango.FSE.Common.Connection;
 using Tango.FSE.Common.Diagnostics;
 using Tango.FSE.Common.Notifications;
 using Tango.FSE.Common.Threading;
-using Tango.FSE.Stubs.Dialogs;
+using Tango.FSE.Procedures.Dialogs;
 using Tango.Integration.Operation;
 using Tango.PMR;
 using Tango.Scripting.Basic;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
-    public class TestContext : ITestContext
+    public class ProcedureContext : IProcedureContext
     {
-        private ITestLogger _logger;
-        private TestProject _project;
-        private Dictionary<String, TestInput> _inputs;
+        private IProcedureLogger _logger;
+        private ProcedureProject _project;
+        private Dictionary<String, ProcedureInput> _inputs;
 
         [TangoInject]
         private IMachineProvider MachineProvider { get; set; }
@@ -45,10 +45,10 @@ namespace Tango.FSE.Stubs
 
         public ReadOnlyCollection<Result> Results { get; private set; }
 
-        public TestContext(TestProject project, ITestLogger logger)
+        public ProcedureContext(ProcedureProject project, IProcedureLogger logger)
         {
             _project = project;
-            _inputs = new Dictionary<string, TestInput>();
+            _inputs = new Dictionary<string, ProcedureInput>();
 
             foreach (var input in _project.Inputs)
             {
@@ -332,7 +332,7 @@ namespace Tango.FSE.Stubs
 
         public object GetInput(string key)
         {
-            TestInput input = null;
+            ProcedureInput input = null;
 
             if (_inputs.TryGetValue(key, out input))
             {
@@ -346,7 +346,7 @@ namespace Tango.FSE.Stubs
 
         public void Fail(string message)
         {
-            throw new TestFailedException(message);
+            throw new ProcedureFailedException(message);
         }
 
         public void ShowInfo(string message)
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestFailedException.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureFailedException.cs
index 0e6e26dd4..f80da424b 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestFailedException.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureFailedException.cs
@@ -4,11 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
-    public class TestFailedException : Exception
+    public class ProcedureFailedException : Exception
     {
-        public TestFailedException(String message) : base(message)
+        public ProcedureFailedException(String message) : base(message)
         {
 
         }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestInput.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureInput.cs
index 71015e4e2..6136731be 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestInput.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureInput.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
-    public class TestInput
+    public class ProcedureInput
     {
         public String DisplayName { get; set; }
         public String Description { get; set; }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestProject.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureProject.cs
index 9cdf70e8a..218c4336a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestProject.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProcedureProject.cs
@@ -13,15 +13,15 @@ using Tango.Integration.Operation;
 using Tango.Scripting.Basic;
 using Tango.Transport;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
-    public class TestProject : Project<TestContext>
+    public class ProcedureProject : Project<ProcedureContext>
     {
         private static JsonSerializerSettings _jsonSettings;
 
-        public ObservableCollection<TestInput> Inputs { get; set; }
+        public ObservableCollection<ProcedureInput> Inputs { get; set; }
 
-        static TestProject()
+        static ProcedureProject()
         {
             _jsonSettings = new JsonSerializerSettings()
             {
@@ -30,14 +30,14 @@ namespace Tango.FSE.Stubs
             };
         }
 
-        public TestProject() : base()
+        public ProcedureProject() : base()
         {
-            Inputs = new ObservableCollection<TestInput>();
+            Inputs = new ObservableCollection<ProcedureInput>();
         }
 
-        public static TestProject New(String name)
+        public static ProcedureProject New(String name)
         {
-            TestProject project = new TestProject();
+            ProcedureProject project = new ProcedureProject();
             project.Name = name;
 
             project.Scripts.Add(Script.New("Program.csx", Encoding.UTF8.GetString(Properties.Resources.main_template), true));
@@ -46,7 +46,7 @@ namespace Tango.FSE.Stubs
             project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(String)));
             project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Enumerable)));
             project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Form)));
-            project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(TestProject)));
+            project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(ProcedureProject)));
             project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(IDiagnosticsProvider)));
             project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(TechMonitors)));
             project.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(PMR.Common.MessageType)));
@@ -63,9 +63,9 @@ namespace Tango.FSE.Stubs
             return JsonConvert.SerializeObject(this, _jsonSettings);
         }
 
-        public static TestProject FromJson(String json)
+        public static ProcedureProject FromJson(String json)
         {
-            return JsonConvert.DeserializeObject<TestProject>(json, _jsonSettings);
+            return JsonConvert.DeserializeObject<ProcedureProject>(json, _jsonSettings);
         }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/StubsModule.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProceduresModule.cs
index 1a88ce040..76ee5ece0 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/StubsModule.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProceduresModule.cs
@@ -6,15 +6,15 @@ using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using Tango.BL.Enumerations;
 using Tango.FSE.Common;
-using Tango.FSE.Stubs.Views;
+using Tango.FSE.Procedures.Views;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     [FSEModule(index: 6)]
-    public class StubsModule : FSEModuleBase
+    public class ProceduresModule : FSEModuleBase
     {
-        public override string Name { get; } = "Stubs";
-        public override string Description { get; } = "Stubs module";
+        public override string Name { get; } = "Procedures";
+        public override string Description { get; } = "Procedures module";
         public override Type MainViewType { get; } = typeof(MainView);
         public override Permissions Permission { get; } = Permissions.FSE_RunFSE;
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
index 8e683b0f7..518630792 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
@@ -6,11 +6,11 @@ using System.Threading.Tasks;
 using Tango.Core;
 using Tango.Scripting.Basic;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public class ProjectRunner : ExtendedObject
     {
-        private ProjectSession<TestContext> _currentSession;
+        private ProjectSession<ProcedureContext> _currentSession;
 
         public event EventHandler<ProjectRunnerState> StateChanged;
 
@@ -51,9 +51,9 @@ namespace Tango.FSE.Stubs
             get { return State != ProjectRunnerState.Running && State != ProjectRunnerState.Compiling; }
         }
 
-        public TestProject Project { get; private set; }
+        public ProcedureProject Project { get; private set; }
 
-        public ProjectRunner(TestProject project)
+        public ProjectRunner(ProcedureProject project)
         {
             Project = project;
         }
@@ -83,7 +83,7 @@ namespace Tango.FSE.Stubs
             }
         }
 
-        public async Task Run(TestContext context)
+        public async Task Run(ProcedureContext context)
         {
             if (!CanRun)
             {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs
index 034426742..733fdc010 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public enum ProjectRunnerState
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/AssemblyInfo.cs
index 5e7fd5347..522af36d2 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@ using System.Windows;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Tango.FSE.Stubs")]
+[assembly: AssemblyTitle("Tango.FSE.Procedures")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.FSE.Stubs")]
+[assembly: AssemblyProduct("Tango.FSE.Procedures")]
 [assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs
index 30aff0d9b..98d6091ba 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.FSE.Stubs.Properties {
+namespace Tango.FSE.Procedures.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace Tango.FSE.Stubs.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.FSE.Stubs.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.FSE.Procedures.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Settings.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Settings.Designer.cs
index 3a2685568..ead237f84 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Settings.Designer.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.FSE.Stubs.Properties
-{
-
-
+namespace Tango.FSE.Procedures.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
index 62024e123..3b317dbad 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
@@ -1,14 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Google.Protobuf;
 using Tango.BL.Enumerations;
 using Tango.PMR.Stubs;
 using Tango.PMR.Diagnostics;
 using Tango.FSE.Common.Diagnostics;
-using Tango.FSE.Stubs;
+using Tango.FSE.Procedures;
 
 public class @LibraryName
 {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
index 307a48076..8c17cf72f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
@@ -10,11 +10,11 @@ using Tango.BL.Enumerations;
 using Tango.PMR.Stubs;
 using Tango.PMR.Diagnostics;
 using Tango.FSE.Common.Diagnostics;
-using Tango.FSE.Stubs;
+using Tango.FSE.Procedures;
 
 public class Program
 {
-    public void OnExecute(ITestContext context)
+    public void OnExecute(IProcedureContext context)
     {
 
         context.AddResult(ResultType.Passed, "My Value Name", "Test for this value has passed.");
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
index 7e2e5aa02..3cd093f7f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Result.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.ExtensionMethods;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public class Result
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs
index e19f58b4f..2eea5ec7f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ResultType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public enum ResultType
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
index a5ca7078a..755b8cff0 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Procedures.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{1754F846-4763-4000-807F-C7BFAA145DB2}</ProjectGuid>
     <OutputType>library</OutputType>
-    <RootNamespace>Tango.FSE.Stubs</RootNamespace>
-    <AssemblyName>Tango.FSE.Stubs</AssemblyName>
+    <RootNamespace>Tango.FSE.Procedures</RootNamespace>
+    <AssemblyName>Tango.FSE.Procedures</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -24,7 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\Build\FSE\Debug\Tango.FSE.Stubs.xml</DocumentationFile>
+    <DocumentationFile>..\..\..\Build\FSE\Debug\Tango.FSE.Procedures.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,7 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\Build\FSE\Release\Tango.FSE.Stubs.xml</DocumentationFile>
+    <DocumentationFile>..\..\..\Build\FSE\Release\Tango.FSE.Procedures.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
@@ -100,7 +100,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ArrayParsingStyle.cs" />
-    <Compile Include="Contracts\ITestDesignerView.cs" />
+    <Compile Include="Contracts\IProcedureDesignerView.cs" />
     <Compile Include="CreateGroup.cs" />
     <Compile Include="CreateItem.cs" />
     <Compile Include="Designer\ProjectModel.cs" />
@@ -121,37 +121,37 @@
       <DependentUpon>UserInputDialogView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Dialogs\UserInputDialogViewVM.cs" />
-    <Compile Include="ITestContext.cs" />
-    <Compile Include="ITestLogger.cs" />
-    <Compile Include="Messages\TestProjectPublished.cs" />
+    <Compile Include="IProcedureContext.cs" />
+    <Compile Include="IProcedureLogger.cs" />
+    <Compile Include="Messages\ProcedureProjectPublishedOrSuppressed.cs" />
     <Compile Include="ProjectRunner.cs" />
     <Compile Include="ProjectRunnerState.cs" />
     <Compile Include="Result.cs" />
     <Compile Include="ResultType.cs" />
-    <Compile Include="TestContext.cs" />
-    <Compile Include="TestFailedException.cs" />
-    <Compile Include="TestInput.cs" />
-    <Compile Include="TestProject.cs" />
+    <Compile Include="ProcedureContext.cs" />
+    <Compile Include="ProcedureFailedException.cs" />
+    <Compile Include="ProcedureInput.cs" />
+    <Compile Include="ProcedureProject.cs" />
     <Compile Include="UserInput.cs" />
     <Compile Include="ViewModelLocator.cs" />
-    <Compile Include="StubsModule.cs" />
+    <Compile Include="ProceduresModule.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
-    <Compile Include="ViewModels\TestDesignerViewVM.cs" />
-    <Compile Include="ViewModels\TestRunnerViewVM.cs" />
+    <Compile Include="ViewModels\ProcedureDesignerViewVM.cs" />
+    <Compile Include="ViewModels\ProcedureRunnerViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\TestDesignerView.xaml.cs">
-      <DependentUpon>TestDesignerView.xaml</DependentUpon>
+    <Compile Include="Views\ProcedureDesignerView.xaml.cs">
+      <DependentUpon>ProcedureDesignerView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\TestRunnerCatalogView.xaml.cs">
-      <DependentUpon>TestRunnerCatalogView.xaml</DependentUpon>
+    <Compile Include="Views\ProcedureRunnerCatalogView.xaml.cs">
+      <DependentUpon>ProcedureRunnerCatalogView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\TestRunnerExecutionView.xaml.cs">
-      <DependentUpon>TestRunnerExecutionView.xaml</DependentUpon>
+    <Compile Include="Views\ProcedureRunnerExecutionView.xaml.cs">
+      <DependentUpon>ProcedureRunnerExecutionView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\TestRunnerView.xaml.cs">
-      <DependentUpon>TestRunnerView.xaml</DependentUpon>
+    <Compile Include="Views\ProcedureRunnerView.xaml.cs">
+      <DependentUpon>ProcedureRunnerView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -278,19 +278,19 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\TestDesignerView.xaml">
+    <Page Include="Views\ProcedureDesignerView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\TestRunnerCatalogView.xaml">
+    <Page Include="Views\ProcedureRunnerCatalogView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\TestRunnerExecutionView.xaml">
+    <Page Include="Views\ProcedureRunnerExecutionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\TestRunnerView.xaml">
+    <Page Include="Views\ProcedureRunnerView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml
index 8d9cb6514..0aa4727c5 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:realTimeGraphX="clr-namespace:RealTimeGraphX.WPF;assembly=RealTimeGraphX.WPF"
                     xmlns:commonGraph="clr-namespace:Tango.FSE.Common.Graphs;assembly=Tango.FSE.Common"
-                    xmlns:local="clr-namespace:Tango.FSE.Stubs.Themes">
+                    xmlns:local="clr-namespace:Tango.FSE.Procedures.Themes">
 
     <Style x:Key="FocusVisual">
         <Setter Property="Control.Template">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/UserInput.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/UserInput.cs
index 85282e781..f5d3472d8 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/UserInput.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/UserInput.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public class UserInput : Attribute
     {
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs
index 6d151e5b8..09578a9d9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs
@@ -4,17 +4,17 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.DI;
-using Tango.FSE.Stubs.ViewModels;
+using Tango.FSE.Procedures.ViewModels;
 
-namespace Tango.FSE.Stubs
+namespace Tango.FSE.Procedures
 {
     public static class ViewModelLocator
     {
         static ViewModelLocator()
         {
             TangoIOC.Default.Register<MainViewVM>();
-            TangoIOC.Default.Register<TestRunnerViewVM>();
-            TangoIOC.Default.Register<TestDesignerViewVM>();
+            TangoIOC.Default.Register<ProcedureRunnerViewVM>();
+            TangoIOC.Default.Register<ProcedureDesignerViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -25,19 +25,19 @@ namespace Tango.FSE.Stubs
             }
         }
 
-        public static TestRunnerViewVM TestRunnerViewVM
+        public static ProcedureRunnerViewVM ProcedureRunnerViewVM
         {
             get
             {
-                return TangoIOC.Default.GetInstance<TestRunnerViewVM>();
+                return TangoIOC.Default.GetInstance<ProcedureRunnerViewVM>();
             }
         }
 
-        public static TestDesignerViewVM TestDesignerViewVM
+        public static ProcedureDesignerViewVM ProcedureDesignerViewVM
         {
             get
             {
-                return TangoIOC.Default.GetInstance<TestDesignerViewVM>();
+                return TangoIOC.Default.GetInstance<ProcedureDesignerViewVM>();
             }
         }
     }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs
index 49345e413..2e38bcb3f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs
@@ -7,10 +7,10 @@ using System.Threading.Tasks;
 using Tango.BL.Enumerations;
 using Tango.FSE.Common;
 using Tango.FSE.Common.Navigation;
-using Tango.FSE.Stubs.Views;
+using Tango.FSE.Procedures.Views;
 using Tango.SharedUI.Helpers;
 
-namespace Tango.FSE.Stubs.ViewModels
+namespace Tango.FSE.Procedures.ViewModels
 {
     [NavigationContainer]
     public class MainViewVM : FSEViewModel
@@ -21,25 +21,25 @@ namespace Tango.FSE.Stubs.ViewModels
             {
                 NavigationManager.MenuItems.Add(new NavigationMenuItem(() =>
                 {
-                    NavigationManager.NavigateTo<StubsModule>(nameof(TestRunnerView));
+                    NavigationManager.NavigateTo<ProceduresModule>(nameof(ProcedureRunnerView));
                 })
                 {
-                    Name = "Test Runner",
+                    Name = "Procedures",
                     Index = 6,
-                    Description = "Perform a machine health check using a collection of predefined test actions.",
+                    Description = "Execute procedures against the currently connected machine.",
                     Image = ResourceHelper.GetImageFromResources("Images/test_runner.png"),
                 });
 
-                if (AuthenticationProvider.CurrentUser.HasPermission(Permissions.FSE_RunTestDesigner))
+                if (AuthenticationProvider.CurrentUser.HasPermission(Permissions.FSE_RunProcedureDesigner))
                 {
                     NavigationManager.MenuItems.Add(new NavigationMenuItem(() =>
                     {
-                        NavigationManager.NavigateTo<StubsModule>(nameof(TestDesignerView));
+                        NavigationManager.NavigateTo<ProceduresModule>(nameof(ProcedureDesignerView));
                     })
                     {
-                        Name = "Test Designer",
+                        Name = "Procedure Designer",
                         Index = 7,
-                        Description = "Create and test new test runner projects.",
+                        Description = "Create, edit, test and publish new procedures.",
                         Image = ResourceHelper.GetImageFromResources("Images/test_designer.png"),
                     });
                 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
index 15a61920a..e6f1d6539 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureDesignerViewVM.cs
@@ -19,24 +19,24 @@ using Tango.Core.Commands;
 using Tango.Core.ExtensionMethods;
 using Tango.FSE.Common;
 using Tango.FSE.Common.Navigation;
-using Tango.FSE.Stubs.Contracts;
-using Tango.FSE.Stubs.Dialogs;
-using Tango.FSE.Stubs.Messages;
+using Tango.FSE.Procedures.Contracts;
+using Tango.FSE.Procedures.Dialogs;
+using Tango.FSE.Procedures.Messages;
 using Tango.Integration.Operation;
 using Tango.Scripting.Basic;
 using Tango.Scripting.Editors;
 using Tango.SharedUI.Components;
 using Tango.SharedUI.Helpers;
 using Tango.Transport;
-using static Tango.FSE.Stubs.ViewModels.TestDesignerViewVM;
+using static Tango.FSE.Procedures.ViewModels.ProcedureDesignerViewVM;
 
-namespace Tango.FSE.Stubs.ViewModels
+namespace Tango.FSE.Procedures.ViewModels
 {
-    public class TestDesignerViewVM : FSEViewModel<ITestDesignerView>, ITestLogger, INavigationObjectReceiver<NavigationObject>
+    public class ProcedureDesignerViewVM : FSEViewModel<IProcedureDesignerView>, IProcedureLogger, INavigationObjectReceiver<NavigationObject>
     {
         public class NavigationObject
         {
-            public PublishedTestProject Project { get; set; }
+            public PublishedProcedureProject Project { get; set; }
         }
 
         public enum ToolWindows
@@ -50,17 +50,17 @@ namespace Tango.FSE.Stubs.ViewModels
 
         private System.Timers.Timer _compileTimer;
         private String _projectFile;
-        private String PROJECT_FILE_EXTENSION = ".tproj";
-        private String PROJECT_DIALOG_FILTER = $"Test Project Files|*.tproj";
+        private String PROJECT_FILE_EXTENSION = ".pproj";
+        private String PROJECT_DIALOG_FILTER = $"Procedure Project Files|*.pproj";
         private bool _isProjectChanged;
 
         #region Properties
 
-        private PublishedTestProject _publishedTestProject;
-        public PublishedTestProject PublishedTestProject
+        private PublishedProcedureProject _publishedProcedureProject;
+        public PublishedProcedureProject PublishedProcedureProject
         {
-            get { return _publishedTestProject; }
-            set { _publishedTestProject = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+            get { return _publishedProcedureProject; }
+            set { _publishedProcedureProject = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
         private ToolWindows _selectedToolWindow;
@@ -70,8 +70,8 @@ namespace Tango.FSE.Stubs.ViewModels
             set { _selectedToolWindow = value; RaisePropertyChangedAuto(); }
         }
 
-        private TestProject _project;
-        public TestProject Project
+        private ProcedureProject _project;
+        public ProcedureProject Project
         {
             get { return _project; }
             set { _project = value; RaisePropertyChangedAuto(); OnProjectChanged(); }
@@ -164,7 +164,7 @@ namespace Tango.FSE.Stubs.ViewModels
         public RelayCommand AddReferenceAssemblyCommand { get; set; }
         public RelayCommand<ReferenceAssembly> RemoveReferenceAssemblyCommand { get; set; }
         public RelayCommand AddProjectInputCommand { get; set; }
-        public RelayCommand<TestInput> RemoveProjectInputCommand { get; set; }
+        public RelayCommand<ProcedureInput> RemoveProjectInputCommand { get; set; }
         public RelayCommand FormatCodeCommand { get; set; }
         public RelayCommand<CompilationError> HighlightErrorCommand { get; set; }
         public RelayCommand NewProjectCommand { get; set; }
@@ -186,7 +186,7 @@ namespace Tango.FSE.Stubs.ViewModels
 
         #region Constructors
 
-        public TestDesignerViewVM()
+        public ProcedureDesignerViewVM()
         {
             Status = "Ready";
 
@@ -212,7 +212,7 @@ namespace Tango.FSE.Stubs.ViewModels
             AddReferenceAssemblyCommand = new RelayCommand(AddReferenceAssembly);
             RemoveReferenceAssemblyCommand = new RelayCommand<ReferenceAssembly>(RemoveReferenceAssembly);
             AddProjectInputCommand = new RelayCommand(AddProjectInput);
-            RemoveProjectInputCommand = new RelayCommand<TestInput>(RemoveProjectInput);
+            RemoveProjectInputCommand = new RelayCommand<ProcedureInput>(RemoveProjectInput);
             FormatCodeCommand = new RelayCommand(FormatCode);
             HighlightErrorCommand = new RelayCommand<CompilationError>(HighlightError);
             NewProjectCommand = new RelayCommand(CreateNewProject, () => ProjectRunner == null || !ProjectRunner.IsRunning);
@@ -222,10 +222,10 @@ namespace Tango.FSE.Stubs.ViewModels
             AddLibraryCommand = new RelayCommand(AddNewLibrary);
             ClearOutputCommand = new RelayCommand(Clear);
             DeleteLibraryCommand = new RelayCommand<Script>(DeleteLibrary);
-            PublishProjectCommand = new RelayCommand(PublishProject,() => CurrentUser.HasPermission(Permissions.FSE_PublishTestProjects));
+            PublishProjectCommand = new RelayCommand(PublishProject,() => CurrentUser.HasPermission(Permissions.FSE_PublishProcedureProjects));
             LoadPublishedProjectCommand = new RelayCommand(LoadPublishedProject);
             UnPublishProjectCommand = new RelayCommand(UnPublishProject);
-            TogglePublishPanelCommand = new RelayCommand(() => IsPublishPanelOpened = !IsPublishPanelOpened, () => CurrentUser.HasPermission(Permissions.FSE_PublishTestProjects));
+            TogglePublishPanelCommand = new RelayCommand(() => IsPublishPanelOpened = !IsPublishPanelOpened, () => CurrentUser.HasPermission(Permissions.FSE_PublishProcedureProjects));
             RenameLibraryCommand = new RelayCommand<Script>(RenameLibrary);
             CreateItemCommand = new RelayCommand<CreateItem>(AutoCreateItem);
             DisplayResultGridCommand = new RelayCommand<Result>(DisplayResultGrid);
@@ -327,7 +327,7 @@ namespace Tango.FSE.Stubs.ViewModels
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, "Error generating test designer auto creation groups.");
+                    LogManager.Log(ex, "Error generating procedure designer auto creation groups.");
                 }
             });
         }
@@ -424,14 +424,14 @@ namespace Tango.FSE.Stubs.ViewModels
                     Results = new List<Result>();
                     Logger.Clear();
                     Logger.WriteLine("Running project...");
-                    var context = new TestContext(Project, this);
+                    var context = new ProcedureContext(Project, this);
                     await ProjectRunner.Run(context);
 
                     Results = context.Results.ToList();
 
                     if (Results.Count > 0)
                     {
-                        Logger.WriteLine("Project ran to completion with test result:");
+                        Logger.WriteLine("Project ran to completion with procedure results:");
                         Logger.WriteLine(Results.ToJsonString());
                         SelectedToolWindow = ToolWindows.Results;
                     }
@@ -549,16 +549,16 @@ namespace Tango.FSE.Stubs.ViewModels
                 var result = await NotificationProvider.ShowInputBox("New Project", "Please specify the project name", PackIconKind.TestTube, "untitled", "Project Name", 100, "CREATE");
                 if (result.Confirmed)
                 {
-                    Project = TestProject.New(result.Input);
+                    Project = ProcedureProject.New(result.Input);
                     _projectFile = null;
-                    PublishedTestProject = null;
+                    PublishedProcedureProject = null;
                 }
             }
         }
 
         private void CreateStartupProject()
         {
-            Project = TestProject.New("untitled");
+            Project = ProcedureProject.New("untitled");
             _projectFile = null;
         }
 
@@ -651,7 +651,7 @@ namespace Tango.FSE.Stubs.ViewModels
         {
             if (await CheckDiscardProjectChanges())
             {
-                var result = await StorageProvider.OpenFile("Open Test Project", PROJECT_DIALOG_FILTER);
+                var result = await StorageProvider.OpenFile("Open Procedure Project", PROJECT_DIALOG_FILTER);
 
                 if (result)
                 {
@@ -664,14 +664,14 @@ namespace Tango.FSE.Stubs.ViewModels
         {
             try
             {
-                Project = TestProject.FromJson(File.ReadAllText(file));
+                Project = ProcedureProject.FromJson(File.ReadAllText(file));
                 _projectFile = file;
-                PublishedTestProject = null;
+                PublishedProcedureProject = null;
                 Status = "Project loaded.";
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, "Error opening test project.");
+                LogManager.Log(ex, "Error opening procedure project.");
                 NotificationProvider.ShowError($"Error occurred while trying to open the project.\n{ex.FlattenMessage()}");
             }
         }
@@ -713,7 +713,7 @@ namespace Tango.FSE.Stubs.ViewModels
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, "Error adding new library to test project.");
+                    LogManager.Log(ex, "Error adding new library to procedure project.");
                     await NotificationProvider.ShowError($"Could not add a new script to the project.\n{ex.FlattenMessage()}");
                 }
             }
@@ -748,7 +748,7 @@ namespace Tango.FSE.Stubs.ViewModels
 
         #endregion
 
-        #region ITestLogger
+        #region IProcedureLogger
 
         public void WriteLine(string text)
         {
@@ -771,7 +771,7 @@ namespace Tango.FSE.Stubs.ViewModels
 
         private void AddProjectInput()
         {
-            Project.Inputs.Add(new TestInput()
+            Project.Inputs.Add(new ProcedureInput()
             {
                 Key = "param" + (Project.Inputs.Count + 1),
                 Value = "0",
@@ -780,7 +780,7 @@ namespace Tango.FSE.Stubs.ViewModels
             });
         }
 
-        private void RemoveProjectInput(TestInput input)
+        private void RemoveProjectInput(ProcedureInput input)
         {
             Project.Inputs.Remove(input);
         }
@@ -795,16 +795,16 @@ namespace Tango.FSE.Stubs.ViewModels
             {
                 IsFree = false;
 
-                List<PublishedTestProject> projects = new List<PublishedTestProject>();
+                List<PublishedProcedureProject> projects = new List<PublishedProcedureProject>();
 
                 using (NotificationProvider.PushTaskItem("Retrieving published projects..."))
                 {
-                    projects = await Services.PublishedTestProjectsService.GetPublishedTestProjects(false);
+                    projects = await Services.PublishedProcedureProjectsService.GetPublishedProcedureProjects(false);
                 }
 
                 if (projects.Count == 0)
                 {
-                    await NotificationProvider.ShowInfo("No published test projects found. Please publish a test project before trying to load one.");
+                    await NotificationProvider.ShowInfo("No published procedure projects found. Please publish a procedure project before trying to load one.");
                     return;
                 }
 
@@ -822,8 +822,8 @@ namespace Tango.FSE.Stubs.ViewModels
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, "Error retrieving published test projects.");
-                await NotificationProvider.ShowError($"Error occurred while trying to fetch published test projects.\n{ex.FlattenMessage()}");
+                LogManager.Log(ex, "Error retrieving published procedure projects.");
+                await NotificationProvider.ShowError($"Error occurred while trying to fetch published procedure projects.\n{ex.FlattenMessage()}");
             }
             finally
             {
@@ -831,7 +831,7 @@ namespace Tango.FSE.Stubs.ViewModels
             }
         }
 
-        private async Task LoadPublishedProject(PublishedTestProject project)
+        private async Task LoadPublishedProject(PublishedProcedureProject project)
         {
             try
             {
@@ -845,16 +845,16 @@ namespace Tango.FSE.Stubs.ViewModels
                 using (NotificationProvider.PushTaskItem("Loading published project..."))
                 {
                     await Task.Delay(1000);
-                    Project = TestProject.FromJson(project.CurrentVersion.ProjectJsonString);
-                    PublishedTestProject = project;
+                    Project = ProcedureProject.FromJson(project.CurrentVersion.ProjectJsonString);
+                    PublishedProcedureProject = project;
                     _projectFile = null;
                     await Task.Delay(1000);
                 }
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, "Error loading published test project.");
-                await NotificationProvider.ShowError($"Error loading published test project.\n{ex.FlattenMessage()}");
+                LogManager.Log(ex, "Error loading published procedure project.");
+                await NotificationProvider.ShowError($"Error loading published procedure project.\n{ex.FlattenMessage()}");
             }
         }
 
@@ -868,9 +868,9 @@ namespace Tango.FSE.Stubs.ViewModels
                     return;
                 }
 
-                if (PublishedTestProject == null || !PublishedTestProject.IsVisible)
+                if (PublishedProcedureProject == null || !PublishedProcedureProject.IsVisible)
                 {
-                    if (!await NotificationProvider.ShowWarningQuestion("Publishing this project will make it available for all users via the Test Runner module.", "PUBLISH"))
+                    if (!await NotificationProvider.ShowWarningQuestion("Publishing this project will make it available for all users via the Procedures module.", "PUBLISH"))
                     {
                         return;
                     }
@@ -885,23 +885,23 @@ namespace Tango.FSE.Stubs.ViewModels
 
                 IsFree = false;
 
-                using (NotificationProvider.PushTaskItem("Publishing test project..."))
+                using (NotificationProvider.PushTaskItem("Publishing procedure project..."))
                 {
-                    PublishedTestProject = await Services.PublishedTestProjectsService.PublishTestProject(
-                        PublishedTestProject?.Guid,
+                    PublishedProcedureProject = await Services.PublishedProcedureProjectsService.PublishProcedureProject(
+                        PublishedProcedureProject?.Guid,
                         Project.Name,
                         Project.Description,
                         Project.ToJson());
 
-                    RaiseMessage<TestProjectPublishedOrSuppressed>();
+                    RaiseMessage<ProcedureProjectPublishedOrSuppressed>();
                 }
 
-                await NotificationProvider.ShowSuccess("Your test project is now published!\nNow you can execute this project from the Test Runner module.");
+                await NotificationProvider.ShowSuccess("Your procedure project is now published!\nNow you can execute this project from the Procedures module.");
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, "Error publishing test project.");
-                await NotificationProvider.ShowError($"Error publishing test project.\n{ex.FlattenMessage()}");
+                LogManager.Log(ex, "Error publishing procedure project.");
+                await NotificationProvider.ShowError($"Error publishing procedure project.\n{ex.FlattenMessage()}");
             }
             finally
             {
@@ -911,25 +911,25 @@ namespace Tango.FSE.Stubs.ViewModels
 
         private async void UnPublishProject()
         {
-            if (!await NotificationProvider.ShowWarningQuestion("Suppressing this project will make it unavailable on the Test Runner module.\nAre you sure?", "SUPPRESS"))
+            if (!await NotificationProvider.ShowWarningQuestion("Suppressing this project will make it unavailable on the Procedures module.\nAre you sure?", "SUPPRESS"))
             {
                 return;
             }
 
             try
             {
-                using (NotificationProvider.PushTaskItem("Suppressing test project..."))
+                using (NotificationProvider.PushTaskItem("Suppressing procedure project..."))
                 {
-                    PublishedTestProject = await Services.PublishedTestProjectsService.UnPublishTestProject(PublishedTestProject);
-                    RaiseMessage<TestProjectPublishedOrSuppressed>();
+                    PublishedProcedureProject = await Services.PublishedProcedureProjectsService.UnPublishProcedureProject(PublishedProcedureProject);
+                    RaiseMessage<ProcedureProjectPublishedOrSuppressed>();
                 }
 
-                await NotificationProvider.ShowInfo("This test project will no longer be available on the Test Runner module.");
+                await NotificationProvider.ShowInfo("This procedure project will no longer be available on the Procedures module.");
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, "Error suppressing test project.");
-                await NotificationProvider.ShowError($"Error occurred while trying to suppress this test project.\n{ex.FlattenMessage()}");
+                LogManager.Log(ex, "Error suppressing procedure project.");
+                await NotificationProvider.ShowError($"Error occurred while trying to suppress this procedure project.\n{ex.FlattenMessage()}");
             }
         }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
index 54e3d0f6d..612f03dd9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/ProcedureRunnerViewVM.cs
@@ -6,18 +6,18 @@ using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.FSE.Common;
-using Tango.FSE.Stubs.Dialogs;
-using Tango.FSE.Stubs.Messages;
-using Tango.FSE.Stubs.Views;
+using Tango.FSE.Procedures.Dialogs;
+using Tango.FSE.Procedures.Messages;
+using Tango.FSE.Procedures.Views;
 
-namespace Tango.FSE.Stubs.ViewModels
+namespace Tango.FSE.Procedures.ViewModels
 {
-    public class TestRunnerViewVM : FSEViewModel, ITestLogger
+    public class ProcedureRunnerViewVM : FSEViewModel, IProcedureLogger
     {
         public enum RunnerView
         {
-            TestRunnerCatalogView,
-            TestRunnerExecutionView
+            ProcedureRunnerCatalogView,
+            ProcedureRunnerExecutionView
         }
 
         private bool _requiresReloadingOfProjects;
@@ -29,18 +29,18 @@ namespace Tango.FSE.Stubs.ViewModels
             set { _selectedView = value; RaisePropertyChangedAuto(); }
         }
 
-        private List<PublishedTestProject> _publishedTestProjects;
-        public List<PublishedTestProject> PublishedTestProjects
+        private List<PublishedProcedureProject> _publishedProcedureProjects;
+        public List<PublishedProcedureProject> PublishedProcedureProjects
         {
-            get { return _publishedTestProjects; }
-            set { _publishedTestProjects = value; RaisePropertyChangedAuto(); }
+            get { return _publishedProcedureProjects; }
+            set { _publishedProcedureProjects = value; RaisePropertyChangedAuto(); }
         }
 
-        private TestProject _runningTestProject;
-        public TestProject RunningTestProject
+        private ProcedureProject _runningProcedureProject;
+        public ProcedureProject RunningProcedureProject
         {
-            get { return _runningTestProject; }
-            set { _runningTestProject = value; RaisePropertyChangedAuto(); }
+            get { return _runningProcedureProject; }
+            set { _runningProcedureProject = value; RaisePropertyChangedAuto(); }
         }
 
         private ProjectRunner _projectRunner;
@@ -57,9 +57,9 @@ namespace Tango.FSE.Stubs.ViewModels
             set { _isLoadingProjects = value; RaisePropertyChangedAuto(); }
         }
 
-        public bool HasTestInputs
+        public bool HasProcedureInputs
         {
-            get { return RunningTestProject != null && RunningTestProject.Inputs.Count > 0; }
+            get { return RunningProcedureProject != null && RunningProcedureProject.Inputs.Count > 0; }
         }
 
         private List<Result> _results;
@@ -90,22 +90,22 @@ namespace Tango.FSE.Stubs.ViewModels
             set { _isRunning = value; RaisePropertyChangedAuto(); }
         }
 
-        public RelayCommand<PublishedTestProject> EditProjectCommand { get; set; }
-        public RelayCommand<PublishedTestProject> RunProjectCommand { get; set; }
+        public RelayCommand<PublishedProcedureProject> EditProjectCommand { get; set; }
+        public RelayCommand<PublishedProcedureProject> RunProjectCommand { get; set; }
         public RelayCommand StartProjectCommand { get; set; }
         public RelayCommand StopProjectCommand { get; set; }
         public RelayCommand<Result> DisplayResultGridCommand { get; set; }
 
-        public TestRunnerViewVM()
+        public ProcedureRunnerViewVM()
         {
-            EditProjectCommand = new RelayCommand<PublishedTestProject>(EditProject);
-            RunProjectCommand = new RelayCommand<PublishedTestProject>(RunProject);
+            EditProjectCommand = new RelayCommand<PublishedProcedureProject>(EditProject);
+            RunProjectCommand = new RelayCommand<PublishedProcedureProject>(RunProject);
             StartProjectCommand = new RelayCommand(StartProject, () => ProjectRunner != null && ProjectRunner.CanRun);
             StopProjectCommand = new RelayCommand(StopProject, () => ProjectRunner != null && ProjectRunner.IsRunning);
             DisplayResultGridCommand = new RelayCommand<Result>(DisplayResultGrid);
 
             _requiresReloadingOfProjects = true;
-            RegisterForMessage<TestProjectPublishedOrSuppressed>((x) => _requiresReloadingOfProjects = true);
+            RegisterForMessage<ProcedureProjectPublishedOrSuppressed>((x) => _requiresReloadingOfProjects = true);
         }
 
         private async void StartProject()
@@ -116,7 +116,7 @@ namespace Tango.FSE.Stubs.ViewModels
                 FailedError = null;
                 Results = new List<Result>();
                 Status = "Running...";
-                var context = new TestContext(RunningTestProject, this);
+                var context = new ProcedureContext(RunningProcedureProject, this);
                 await ProjectRunner.Run(context);
                 Status = "Completed";
                 Results = context.Results.ToList();
@@ -141,15 +141,15 @@ namespace Tango.FSE.Stubs.ViewModels
             ProjectRunner.Stop();
         }
 
-        private void EditProject(PublishedTestProject project)
+        private void EditProject(PublishedProcedureProject project)
         {
             if (project != null)
             {
                 NavigationManager.NavigateWithObject<
-                    StubsModule,
-                    TestDesignerView,
-                    TestDesignerViewVM.NavigationObject>(
-                    new TestDesignerViewVM.NavigationObject()
+                    ProceduresModule,
+                    ProcedureDesignerView,
+                    ProcedureDesignerViewVM.NavigationObject>(
+                    new ProcedureDesignerViewVM.NavigationObject()
                     {
                         Project = project
                     });
@@ -162,26 +162,26 @@ namespace Tango.FSE.Stubs.ViewModels
 
             if (_requiresReloadingOfProjects)
             {
-                LoadPublishedTestProjects();
+                LoadPublishedProcedureProjects();
             }
         }
 
-        private async void LoadPublishedTestProjects()
+        private async void LoadPublishedProcedureProjects()
         {
             try
             {
                 IsFree = false;
                 IsLoadingProjects = true;
-                PublishedTestProjects = new List<PublishedTestProject>();
-                PublishedTestProjects = await Services.PublishedTestProjectsService.GetPublishedTestProjects();
+                PublishedProcedureProjects = new List<PublishedProcedureProject>();
+                PublishedProcedureProjects = await Services.PublishedProcedureProjectsService.GetPublishedProcedureProjects();
                 _requiresReloadingOfProjects = false;
                 IsFree = true;
             }
             catch (Exception ex)
             {
                 IsFree = false;
-                LogManager.Log(ex, "Error retrieving published test projects.");
-                await NotificationProvider.ShowError($"Error occurred while trying to retrieve the tests collection.\n{ex.FlattenMessage()}");
+                LogManager.Log(ex, "Error retrieving published procedure projects.");
+                await NotificationProvider.ShowError($"Error occurred while trying to retrieve the procedures collection.\n{ex.FlattenMessage()}");
             }
             finally
             {
@@ -189,22 +189,22 @@ namespace Tango.FSE.Stubs.ViewModels
             }
         }
 
-        private void RunProject(PublishedTestProject project)
+        private void RunProject(PublishedProcedureProject project)
         {
-            RunningTestProject = TestProject.FromJson(project.CurrentVersion.ProjectJsonString);
-            RaisePropertyChanged(nameof(HasTestInputs));
-            ProjectRunner = new ProjectRunner(RunningTestProject);
+            RunningProcedureProject = ProcedureProject.FromJson(project.CurrentVersion.ProjectJsonString);
+            RaisePropertyChanged(nameof(HasProcedureInputs));
+            ProjectRunner = new ProjectRunner(RunningProcedureProject);
             ProjectRunner.StateChanged += (x, e) => InvalidateRelayCommands();
             Status = "Ready";
             InvalidateRelayCommands();
-            SelectedView = RunnerView.TestRunnerExecutionView;
+            SelectedView = RunnerView.ProcedureRunnerExecutionView;
         }
 
         public override Task<bool> OnNavigateBackRequest()
         {
-            if (SelectedView == RunnerView.TestRunnerExecutionView && !IsRunning)
+            if (SelectedView == RunnerView.ProcedureRunnerExecutionView && !IsRunning)
             {
-                SelectedView = RunnerView.TestRunnerCatalogView;
+                SelectedView = RunnerView.ProcedureRunnerCatalogView;
                 return Task.FromResult(false);
             }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml
index 41ac9b64e..381a1a80b 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml
@@ -1,18 +1,18 @@
-<UserControl x:Class="Tango.FSE.Stubs.Views.MainView"
+<UserControl x:Class="Tango.FSE.Procedures.Views.MainView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:global="clr-namespace:Tango.FSE.Stubs"
-             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:global="clr-namespace:Tango.FSE.Procedures"
+             xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Views"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid>
         <controls:NavigationControl TransitionAlwaysFades="True">
-            <local:TestRunnerView/>
-            <local:TestDesignerView/>
+            <local:ProcedureRunnerView/>
+            <local:ProcedureDesignerView/>
         </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml.cs
index be388d7a4..08fbb1f2a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Views
+namespace Tango.FSE.Procedures.Views
 {
     /// <summary>
     /// Interaction logic for MainView.xaml
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
index bcac1bbaa..b76b3af5d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml
@@ -1,19 +1,19 @@
-<UserControl x:Class="Tango.FSE.Stubs.Views.TestDesignerView"
+<UserControl x:Class="Tango.FSE.Procedures.Views.ProcedureDesignerView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:global="clr-namespace:Tango.FSE.Stubs"
+             xmlns:global="clr-namespace:Tango.FSE.Procedures"
              xmlns:helpers="clr-namespace:Tango.SharedUI.Helpers;assembly=Tango.SharedUI"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:components="clr-namespace:Tango.SharedUI.Components;assembly=Tango.SharedUI"
-             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:editors="clr-namespace:Tango.Scripting.Editors;assembly=Tango.Scripting.Editors"
              xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:TestDesignerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.TestDesignerViewVM}" Background="{StaticResource FSE_PrimaryBackgroundBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:ProcedureDesignerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.ProcedureDesignerViewVM}" Background="{StaticResource FSE_PrimaryBackgroundBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
 
     <UserControl.Resources>
         <components:BindingProxy x:Key="proxy" Data="{Binding}" />
@@ -240,22 +240,22 @@
                                             <DockPanel Margin="0 20 0 0">
                                                 <material:PackIcon Kind="InfoOutline" />
                                                 <TextBlock Foreground="{StaticResource FSE_GrayBrush}" TextWrapping="Wrap" LineHeight="18" Margin="10 0 10 0" FontSize="{StaticResource FSE_SmallFontSize}">
-                                                                <Run>• Publishing a test project makes it available as a unit test via the 'Test Runner' module.</Run>
+                                                                <Run>• Publishing a procedure project makes it available as a procedure unit via the 'Procedures' module.</Run>
                                                                 <LineBreak/>
                                                                 <Run>• The system automatically keeps the history of published projects so they can be reverted to previous versions.</Run>
                                                                 <LineBreak/>
-                                                                <Run>• Any published project can be "suppressed" which will make it invisible to Test Runner users.</Run>
+                                                                <Run>• Any published project can be "suppressed" which will make it invisible to standard users.</Run>
                                                                 <LineBreak/>
                                                                 <Run>• Suppressed projects can be edited and republished again.</Run>
                                                 </TextBlock>
                                             </DockPanel>
 
-                                            <controls:TextIconButton Margin="10 0 0 0" ToolTip="Make this unavailable on Test Runner" Icon="DeleteCircle" HorizontalAlignment="Left" Width="Auto" BorderBrush="Transparent" Foreground="{StaticResource FSE_RedBrush}" Background="Transparent" Command="{Binding UnPublishProjectCommand}">
+                                            <controls:TextIconButton Margin="10 0 0 0" ToolTip="Make this unavailable on Procedures module" Icon="DeleteCircle" HorizontalAlignment="Left" Width="Auto" BorderBrush="Transparent" Foreground="{StaticResource FSE_RedBrush}" Background="Transparent" Command="{Binding UnPublishProjectCommand}">
                                                 <Button.Style>
                                                     <Style TargetType="controls:TextIconButton" BasedOn="{StaticResource {x:Type controls:TextIconButton}}">
                                                         <Setter Property="Visibility" Value="Hidden"></Setter>
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding PublishedTestProject.IsVisible}" Value="True">
+                                                            <DataTrigger Binding="{Binding PublishedProcedureProject.IsVisible}" Value="True">
                                                                 <Setter Property="Visibility" Value="Visible"></Setter>
                                                             </DataTrigger>
                                                         </Style.Triggers>
@@ -592,7 +592,7 @@
                                                                 <TextBlock Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityInverseConverter}}" Text="{Binding Value}"></TextBlock>
                                                                 <StackPanel Orientation="Horizontal" Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                                     <TextBlock Foreground="{StaticResource FSE_GrayBrush}">
-                                                                    <Run>This test result contains</Run>
+                                                                    <Run>This procedure result contains</Run>
                                                                     <Run Text="{Binding Value.Count,Mode=OneWay}"></Run>
                                                                     <Run Text="Values."></Run>
                                                                     </TextBlock>
@@ -623,13 +623,13 @@
                                     <StackPanel>
                                         <DockPanel>
                                             <Image Source="../Images/project_small.png" Width="20" RenderOptions.BitmapScalingMode="Fant" />
-                                            <material:PackIcon DockPanel.Dock="Right" Kind="Eye" VerticalAlignment="Center" Visibility="{Binding PublishedTestProject,Converter={StaticResource IsNullToVisibilityConverter}}">
+                                            <material:PackIcon DockPanel.Dock="Right" Kind="Eye" VerticalAlignment="Center" Visibility="{Binding PublishedProcedureProject,Converter={StaticResource IsNullToVisibilityConverter}}">
                                                 <material:PackIcon.Style>
                                                     <Style TargetType="material:PackIcon">
                                                         <Setter Property="Foreground" Value="{StaticResource FSE_GrayBrush}"></Setter>
                                                         <Setter Property="ToolTip" Value="Suppressed"></Setter>
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding PublishedTestProject.IsVisible}" Value="True">
+                                                            <DataTrigger Binding="{Binding PublishedProcedureProject.IsVisible}" Value="True">
                                                                 <Setter Property="Foreground" Value="{StaticResource FSE_GreenBrush}"></Setter>
                                                                 <Setter Property="ToolTip" Value="Published"></Setter>
                                                             </DataTrigger>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml.cs
index e310afc89..a8c37cc10 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureDesignerView.xaml.cs
@@ -12,25 +12,25 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Tango.FSE.Stubs.Contracts;
-using Tango.FSE.Stubs.ViewModels;
+using Tango.FSE.Procedures.Contracts;
+using Tango.FSE.Procedures.ViewModels;
 using Tango.Scripting.Basic;
 using Tango.Scripting.Editors;
 
-namespace Tango.FSE.Stubs.Views
+namespace Tango.FSE.Procedures.Views
 {
     /// <summary>
-    /// Interaction logic for TestDesignerView.xaml
+    /// Interaction logic for ProcedureDesignerView.xaml
     /// </summary>
-    public partial class TestDesignerView : UserControl, ITestDesignerView
+    public partial class ProcedureDesignerView : UserControl, IProcedureDesignerView
     {
-        private TestDesignerViewVM _vm;
+        private ProcedureDesignerViewVM _vm;
 
-        public TestDesignerView()
+        public ProcedureDesignerView()
         {
             InitializeComponent();
-            this.Register<ITestDesignerView>();
-            Loaded += (_, __) => _vm = DataContext as TestDesignerViewVM;
+            this.Register<IProcedureDesignerView>();
+            Loaded += (_, __) => _vm = DataContext as ProcedureDesignerViewVM;
         }
 
         private void OnScriptItemDoubleClick(object sender, MouseButtonEventArgs e)
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerCatalogView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerCatalogView.xaml
index f2671a169..03b80bf78 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerCatalogView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerCatalogView.xaml
@@ -1,37 +1,37 @@
-<UserControl x:Class="Tango.FSE.Stubs.Views.TestRunnerCatalogView"
+<UserControl x:Class="Tango.FSE.Procedures.Views.ProcedureRunnerCatalogView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
-             xmlns:global="clr-namespace:Tango.FSE.Stubs"
-             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:global="clr-namespace:Tango.FSE.Procedures"
+             xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Views"
              xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:TestRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.TestRunnerViewVM}" d:DesignStyle="{StaticResource FSE_User_Control_Designer}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:ProcedureRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.ProcedureRunnerViewVM}" d:DesignStyle="{StaticResource FSE_User_Control_Designer}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
     <Grid Margin="10">
         <DockPanel>
             <Grid Margin="20 20 0 0" Height="200" VerticalAlignment="Top" DockPanel.Dock="Top">
                 <DockPanel>
                     <Image Margin="0 10 0 0" Source="../Images/test_runner.png" Stretch="None" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="Fant" />
                     <StackPanel Margin="20 0 0 0">
-                        <TextBlock FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}">Test Runner</TextBlock>
+                        <TextBlock FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}">Procedures</TextBlock>
                         <TextBlock Margin="0 5 0 0" Foreground="{StaticResource FSE_GrayBrush}" LineHeight="18">
-                            <Run>Welcome to the test runner.</Run>
+                            <Run>Welcome to the procedure runner.</Run>
                             <LineBreak/>
-                            <Run>Below is a collection of machine tests that can be executed independently.</Run>
+                            <Run>Below is a collection of machine procedures that can be executed independently.</Run>
                             <LineBreak/>
-                            <Run>Each test can yield one or more test results, and may require you to provide some input before execution.</Run>
+                            <Run>Each procedure can yield one or more procedure results, and may require you to provide some input before execution.</Run>
                             <LineBreak/>
-                            <Run>Pressing the 'run' button on the desired test will navigate you to the test execution screen.</Run>
+                            <Run>Pressing the 'run' button on the desired procedure will navigate you to the procedure execution screen.</Run>
                         </TextBlock>
                     </StackPanel>
                 </DockPanel>
             </Grid>
             <Grid Margin="0 20 0 0">
-                <ListBox Style="{StaticResource FSE_BlankListBox}" ItemsSource="{Binding PublishedTestProjects}">
+                <ListBox Style="{StaticResource FSE_BlankListBox}" ItemsSource="{Binding PublishedProcedureProjects}">
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
                             <WrapPanel Orientation="Horizontal" IsItemsHost="True" />
@@ -85,7 +85,7 @@
                                             </DockPanel>
                                         </DockPanel>
 
-                                        <controls:IconButton HorizontalAlignment="Right" VerticalAlignment="Top" Cursor="Hand" Width="30" Height="30" Icon="Cogs" ToolTip="Edit this project in Test Designer" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.EditProjectCommand}" CommandParameter="{Binding}" />
+                                        <controls:IconButton HorizontalAlignment="Right" VerticalAlignment="Top" Cursor="Hand" Width="30" Height="30" Icon="Cogs" ToolTip="Edit this project in Procedure Designer" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.EditProjectCommand}" CommandParameter="{Binding}" />
                                     </Grid>
                                 </Border>
                             </Border>
@@ -96,7 +96,7 @@
                 <Grid Background="Transparent" Visibility="{Binding IsLoadingProjects,Converter={StaticResource BooleanToVisibilityConverter}}">
                     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                         <ProgressBar HorizontalAlignment="Center" IsIndeterminate="{Binding IsLoadingProjects}" Style="{StaticResource FSE_CircularProgressBar}" Width="150" Height="150" />
-                        <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0">Loading tests collection...</TextBlock>
+                        <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0">Loading procedures collection...</TextBlock>
                     </StackPanel>
                 </Grid>
             </Grid>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerCatalogView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerCatalogView.xaml.cs
index ddc08aaed..cfc136b3e 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerCatalogView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerCatalogView.xaml.cs
@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Views
+namespace Tango.FSE.Procedures.Views
 {
     /// <summary>
-    /// Interaction logic for TestRunnerCatalogView.xaml
+    /// Interaction logic for ProcedureRunnerCatalogView.xaml
     /// </summary>
-    public partial class TestRunnerCatalogView : UserControl
+    public partial class ProcedureRunnerCatalogView : UserControl
     {
-        public TestRunnerCatalogView()
+        public ProcedureRunnerCatalogView()
         {
             InitializeComponent();
         }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerExecutionView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
index bb12d7c02..db15582bb 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerExecutionView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml
@@ -1,16 +1,16 @@
-<UserControl x:Class="Tango.FSE.Stubs.Views.TestRunnerExecutionView"
+<UserControl x:Class="Tango.FSE.Procedures.Views.ProcedureRunnerExecutionView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:global="clr-namespace:Tango.FSE.Stubs"
-             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:global="clr-namespace:Tango.FSE.Procedures"
+             xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common"
              xmlns:graphs="clr-namespace:Tango.FSE.Common.Graphs;assembly=Tango.FSE.Common"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" d:DesignStyle="{StaticResource FSE_User_Control_Designer}" d:DataContext="{d:DesignInstance Type=vm:TestRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.TestRunnerViewVM}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+             d:DesignHeight="720" d:DesignWidth="1280" d:DesignStyle="{StaticResource FSE_User_Control_Designer}" d:DataContext="{d:DesignInstance Type=vm:ProcedureRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.ProcedureRunnerViewVM}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
 
     <Grid>
         <Ellipse Fill="{StaticResource FSE_PrimaryBackgroundDarkBrush}" Opacity="0.7" Width="2050" Margin="-1500 -500 0 -500" />
@@ -23,8 +23,8 @@
                             <material:PackIcon Margin="0 0 -15 15" Kind="Play" Foreground="{StaticResource FSE_GreenBrush}" Width="48" Height="48" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
                         </Grid>
                         <StackPanel Margin="20 0 0 0">
-                            <TextBlock FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Text="{Binding RunningTestProject.Name}"></TextBlock>
-                            <TextBlock Margin="0 5 0 0" Foreground="{StaticResource FSE_GrayBrush}" LineHeight="18" Text="{Binding RunningTestProject.Description}"></TextBlock>
+                            <TextBlock FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" Text="{Binding RunningProcedureProject.Name}"></TextBlock>
+                            <TextBlock Margin="0 5 0 0" Foreground="{StaticResource FSE_GrayBrush}" LineHeight="18" Text="{Binding RunningProcedureProject.Description}"></TextBlock>
                         </StackPanel>
                     </DockPanel>
                 </Grid>
@@ -32,12 +32,12 @@
                     <ScrollViewer HorizontalScrollBarVisibility="Disabled">
                         <StackPanel>
                             <StackPanel>
-                                <StackPanel IsEnabled="{Binding ProjectRunner.CanRun}" Margin="0 40 0 0" Visibility="{Binding HasTestInputs,Converter={StaticResource BooleanToVisibilityConverter},FallbackValue='Visible',TargetNullValue='Visible'}">
+                                <StackPanel IsEnabled="{Binding ProjectRunner.CanRun}" Margin="0 40 0 0" Visibility="{Binding HasProcedureInputs,Converter={StaticResource BooleanToVisibilityConverter},FallbackValue='Visible',TargetNullValue='Visible'}">
                                     <TextBlock FontSize="{StaticResource FSE_LargeFontSize}" FontWeight="SemiBold" Foreground="{StaticResource FSE_PrimaryAccentBrush}">Inputs</TextBlock>
                                     <!--<Rectangle Margin="0 2 0 0" Stroke="{StaticResource FSE_BorderBrush}" StrokeDashArray="5" />-->
                                     <TextBlock Margin="0 5 0 0" Foreground="{StaticResource FSE_GrayBrush}" Text="Please provide the necessary inputs or leave as defaults."></TextBlock>
 
-                                    <ItemsControl Margin="0 10 0 0" ItemsSource="{Binding RunningTestProject.Inputs}">
+                                    <ItemsControl Margin="0 10 0 0" ItemsSource="{Binding RunningProcedureProject.Inputs}">
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate>
                                                 <DockPanel Margin="0 10 20 10">
@@ -80,8 +80,8 @@
                                 </StackPanel>
                             </StackPanel>
                             <StackPanel Margin="0 100 0 0" HorizontalAlignment="Left" Visibility="{Binding ProjectRunner.State,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter='Failed'}">
-                                <TextBlock FontSize="{StaticResource FSE_LargeFontSize}" FontWeight="SemiBold" Foreground="{StaticResource FSE_RedBrush}">Test Failed</TextBlock>
-                                <TextBlock Margin="0 20 0 0">The test has failed to complete with the following error:</TextBlock>
+                                <TextBlock FontSize="{StaticResource FSE_LargeFontSize}" FontWeight="SemiBold" Foreground="{StaticResource FSE_RedBrush}">Procedure Failed</TextBlock>
+                                <TextBlock Margin="0 20 0 0">The procedure has failed to complete with the following error:</TextBlock>
                                 <TextBlock Text="{Binding FailedError}" Margin="0 5 0 0" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}" TextWrapping="Wrap"></TextBlock>
                             </StackPanel>
                             <StackPanel>
@@ -143,7 +143,7 @@
                                                             <StackPanel Visibility="{Binding IsValueArray,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}">
-                                                                    <Run>This test result contains</Run>
+                                                                    <Run>This procedure result contains</Run>
                                                                     <Run Text="{Binding Value.Count,Mode=OneWay}"></Run>
                                                                     <Run Text="Values."></Run>
                                                                     </TextBlock>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerExecutionView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml.cs
index 3f2d1da25..6b72fbcd5 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerExecutionView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerExecutionView.xaml.cs
@@ -16,14 +16,14 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Tango.FSE.Common.Graphs;
 
-namespace Tango.FSE.Stubs.Views
+namespace Tango.FSE.Procedures.Views
 {
     /// <summary>
-    /// Interaction logic for TestRunnerExecutionView.xaml
+    /// Interaction logic for ProcedureRunnerExecutionView.xaml
     /// </summary>
-    public partial class TestRunnerExecutionView : UserControl
+    public partial class ProcedureRunnerExecutionView : UserControl
     {
-        public TestRunnerExecutionView()
+        public ProcedureRunnerExecutionView()
         {
             InitializeComponent();
         }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerView.xaml
index 704ab229a..38bfc3519 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerView.xaml
@@ -1,21 +1,21 @@
-<UserControl x:Class="Tango.FSE.Stubs.Views.TestRunnerView"
+<UserControl x:Class="Tango.FSE.Procedures.Views.ProcedureRunnerView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
-             xmlns:global="clr-namespace:Tango.FSE.Stubs"
-             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:global="clr-namespace:Tango.FSE.Procedures"
+             xmlns:vm="clr-namespace:Tango.FSE.Procedures.ViewModels"
              xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             xmlns:local="clr-namespace:Tango.FSE.Procedures.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:TestRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.TestRunnerViewVM}" Background="{StaticResource FSE_PrimaryBackgroundBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:ProcedureRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.ProcedureRunnerViewVM}" Background="{StaticResource FSE_PrimaryBackgroundBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
 
     <Grid>
         <Image Source="../Images/test_tools.png" Stretch="None" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity="0.05" />
         <controls:NavigationControl TransitionType="Slide" TransitionDuration="00:00:0.2" SelectedObject="{Binding SelectedView}">
-            <local:TestRunnerCatalogView/>
-            <local:TestRunnerExecutionView/>
+            <local:ProcedureRunnerCatalogView/>
+            <local:ProcedureRunnerExecutionView/>
         </controls:NavigationControl>
     </Grid>
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerView.xaml.cs
index f37986847..94a5a3379 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/ProcedureRunnerView.xaml.cs
@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.FSE.Stubs.Views
+namespace Tango.FSE.Procedures.Views
 {
     /// <summary>
-    /// Interaction logic for TestRunnerView.xaml
+    /// Interaction logic for ProcedureRunnerView.xaml
     /// </summary>
-    public partial class TestRunnerView : UserControl
+    public partial class ProcedureRunnerView : UserControl
     {
-        public TestRunnerView()
+        public ProcedureRunnerView()
         {
             InitializeComponent();
         }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs
index e7fd962ec..0b1e0032f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs
@@ -189,8 +189,8 @@ namespace Tango.FSE.UsersAndRoles.ViewModels
             {
                 collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineTechnician), Roles.FSETechnician, Roles.FSEAdvancedTechnician));
                 collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineAdministrator), Roles.FSETechnician, Roles.FSEAdministrator));
-                collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineTestDesigner), Roles.FSETechnician));
-                collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineTestPublisher), Roles.FSETechnician, Roles.FSETwineTestDesigner));
+                collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineProcedureDesigner), Roles.FSETechnician));
+                collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineProcedurePublisher), Roles.FSETechnician, Roles.FSETwineProcedureDesigner));
                 collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineDeveloper), Roles.FSETechnician) { IsVisible = CurrentUser.HasRole(Roles.FSETwineDeveloper) });
             }
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedProcedureProject.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedProcedureProject.cs
new file mode 100644
index 000000000..34d691e2c
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedProcedureProject.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.ActionLogs;
+using Tango.BL.DTO;
+
+namespace Tango.FSE.BL.CacheEntities
+{
+    public class CachedPublishedProcedureProject : PublishedProcedureProjectDTO
+    {
+        [ActionLogIgnore]
+        public List<PublishedProcedureProjectsVersionDTO> PublishedProcedureProjectsVersions { get; set; }
+
+        public CachedPublishedProcedureProject()
+        {
+            PublishedProcedureProjectsVersions = new List<PublishedProcedureProjectsVersionDTO>();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedTestProject.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedTestProject.cs
deleted file mode 100644
index 622df70c7..000000000
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/CacheEntities/CachedPublishedTestProject.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.ActionLogs;
-using Tango.BL.DTO;
-
-namespace Tango.FSE.BL.CacheEntities
-{
-    public class CachedPublishedTestProject : PublishedTestProjectDTO
-    {
-        [ActionLogIgnore]
-        public List<PublishedTestProjectsVersionDTO> PublishedTestProjectsVersions { get; set; }
-
-        public CachedPublishedTestProject()
-        {
-            PublishedTestProjectsVersions = new List<PublishedTestProjectsVersionDTO>();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs
index eaa29bfdb..e5487bc1e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServicesContainer.cs
@@ -48,9 +48,9 @@ namespace Tango.FSE.BL
         public TechComponentsService TechComponentsService { get; set; }
 
         /// <summary>
-        /// Gets or sets the published test projects service.
+        /// Gets or sets the published procedure projects service.
         /// </summary>
-        public PublishedTestProjectsService PublishedTestProjectsService { get; set; }
+        public PublishedProcedureProjectsService PublishedProcedureProjectsService { get; set; }
 
         /// <summary>
         /// Gets or sets the machine events service.
@@ -75,7 +75,7 @@ namespace Tango.FSE.BL
             BugReportingService = new BugReportingService();
             TangoVersionsService = new TangoVersionsService();
             TechComponentsService = new TechComponentsService();
-            PublishedTestProjectsService = new PublishedTestProjectsService();
+            PublishedProcedureProjectsService = new PublishedProcedureProjectsService();
             MachineEventsService = new MachineEventsService();
             OrganizationsService = new OrganizationsService();
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedTestProjectsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedProcedureProjectsService.cs
index d95899e23..074483dec 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedTestProjectsService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/PublishedProcedureProjectsService.cs
@@ -12,20 +12,20 @@ using Z.EntityFramework.Plus;
 
 namespace Tango.FSE.BL.Services
 {
-    public class PublishedTestProjectsService : FSEServiceBase
+    public class PublishedProcedureProjectsService : FSEServiceBase
     {
-        private const string PUBLISHED_TEST_PROJECTS_COLLECTION = "PublishedTestProjects";
+        private const string PUBLISHED_Procedure_PROJECTS_COLLECTION = "PublishedProcedureProjects";
 
-        private MemoryCacheDictionary<String, CachedPublishedTestProject> _projectsCache;
+        private MemoryCacheDictionary<String, CachedPublishedProcedureProject> _projectsCache;
 
-        public PublishedTestProjectsService()
+        public PublishedProcedureProjectsService()
         {
-            _projectsCache = MemoryCache.GetOrCreateCache<String, CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+            _projectsCache = MemoryCache.GetOrCreateCache<String, CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
         }
 
-        public Task<List<PublishedTestProject>> GetPublishedTestProjects(bool visibleOnly = true)
+        public Task<List<PublishedProcedureProject>> GetPublishedProcedureProjects(bool visibleOnly = true)
         {
-            return DataResolver<List<PublishedTestProject>>.Builder.New()
+            return DataResolver<List<PublishedProcedureProject>>.Builder.New()
                 .ConfigureCascade(DataResolverNode.InMemoryCache, DataResolverNode.Online, DataResolverNode.DiskCache)
                 .InMemoryCache((context) =>
                 {
@@ -33,7 +33,7 @@ namespace Tango.FSE.BL.Services
 
                     if (projects.Count == 0)
                     {
-                        throw new IndexOutOfRangeException("The memory cache did not contain any test projects.");
+                        throw new IndexOutOfRangeException("The memory cache did not contain any procedure projects.");
                     }
 
                     return projects.OrderByDescending(x => x.PublishDate).ToList();
@@ -42,20 +42,20 @@ namespace Tango.FSE.BL.Services
                 {
                     using (ObservablesContext db = ObservablesContext.CreateDefault())
                     {
-                        var select = db.PublishedTestProjects
+                        var select = db.PublishedProcedureProjects
                         .Where(x => x.IsVisible || !visibleOnly)
-                        .Include(x => x.PublishedTestProjectsVersions)
+                        .Include(x => x.PublishedProcedureProjectsVersions)
                         .Select(x => new
                         {
                             Project = x,
-                            LatestVersion = x.PublishedTestProjectsVersions.OrderByDescending(v => v.Version).FirstOrDefault()
+                            LatestVersion = x.PublishedProcedureProjectsVersions.OrderByDescending(v => v.Version).FirstOrDefault()
                         }).ToList();
 
-                        List<PublishedTestProject> projects = new List<PublishedTestProject>();
+                        List<PublishedProcedureProject> projects = new List<PublishedProcedureProject>();
 
                         foreach (var p in select)
                         {
-                            PublishedTestProject project = p.Project;
+                            PublishedProcedureProject project = p.Project;
                             projects.Add(project);
                         }
 
@@ -63,11 +63,11 @@ namespace Tango.FSE.BL.Services
                         {
                             try
                             {
-                                var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                                var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
 
                                 foreach (var project in projects)
                                 {
-                                    var cachedProject = CachedPublishedTestProject.FromObservable<CachedPublishedTestProject>(project);
+                                    var cachedProject = CachedPublishedProcedureProject.FromObservable<CachedPublishedProcedureProject>(project);
                                     _projectsCache.Put(cachedProject.Guid, cachedProject);
 
                                     collection.Upsert(cachedProject);
@@ -75,7 +75,7 @@ namespace Tango.FSE.BL.Services
                             }
                             catch (Exception ex)
                             {
-                                LogManager.Log(ex, "Error caching published test projects.");
+                                LogManager.Log(ex, "Error caching published procedure projects.");
                             }
                         }
 
@@ -86,7 +86,7 @@ namespace Tango.FSE.BL.Services
                 {
                     using (var cache = DiskCache.CreateContext())
                     {
-                        var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                        var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
 
                         var cachedProjects = collection
                         .Find(x => x.IsVisible || !visibleOnly)
@@ -103,11 +103,11 @@ namespace Tango.FSE.BL.Services
                 .BuildExecuteAsync();
         }
 
-        public Task<PublishedTestProject> PublishTestProject(String projectGuid, String name, String description, String projectJson)
+        public Task<PublishedProcedureProject> PublishProcedureProject(String projectGuid, String name, String description, String projectJson)
         {
-            return Task.Factory.StartNew<PublishedTestProject>(() =>
+            return Task.Factory.StartNew<PublishedProcedureProject>(() =>
             {
-                if (!CurrentUser.HasPermission(Permissions.FSE_PublishTestProjects))
+                if (!CurrentUser.HasPermission(Permissions.FSE_PublishProcedureProjects))
                 {
                     throw new AuthorizationException();
                 }
@@ -122,7 +122,7 @@ namespace Tango.FSE.BL.Services
                     throw new ArgumentException("Cannot publish a project with an empty name.");
                 }
 
-                PublishedTestProject project = null;
+                PublishedProcedureProject project = null;
 
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
@@ -130,14 +130,14 @@ namespace Tango.FSE.BL.Services
 
                     if (projectGuid == null)
                     {
-                        project = new PublishedTestProject();
-                        db.PublishedTestProjects.Add(project);
+                        project = new PublishedProcedureProject();
+                        db.PublishedProcedureProjects.Add(project);
                     }
                     else
                     {
-                        project = db.PublishedTestProjects.SingleOrDefault(x => x.Guid == projectGuid);
+                        project = db.PublishedProcedureProjects.SingleOrDefault(x => x.Guid == projectGuid);
 
-                        int? lastVersion = db.PublishedTestProjectsVersions.Where(x => x.PublishedTestProjectGuid == project.Guid).Select(x => x.Version).OrderByDescending(x => x).FirstOrDefault();
+                        int? lastVersion = db.PublishedProcedureProjectsVersions.Where(x => x.PublishedProcedureProjectGuid == project.Guid).Select(x => x.Version).OrderByDescending(x => x).FirstOrDefault();
 
                         if (lastVersion != null)
                         {
@@ -150,31 +150,31 @@ namespace Tango.FSE.BL.Services
                     project.PublishDate = DateTime.UtcNow;
                     project.IsVisible = true;
 
-                    PublishedTestProjectsVersion projectVersion = new PublishedTestProjectsVersion();
+                    PublishedProcedureProjectsVersion projectVersion = new PublishedProcedureProjectsVersion();
                     projectVersion.Author = CurrentUser.Contact.FullName;
                     projectVersion.Version = version;
                     projectVersion.ProjectJsonString = projectJson;
-                    projectVersion.PublishedTestProject = project;
-                    projectVersion.PublishedTestProjectGuid = project.Guid;
+                    projectVersion.PublishedProcedureProject = project;
+                    projectVersion.PublishedProcedureProjectGuid = project.Guid;
 
-                    project.PublishedTestProjectsVersions.Add(projectVersion);
+                    project.PublishedProcedureProjectsVersions.Add(projectVersion);
 
                     db.SaveChanges();
 
-                    var versionsCount = db.PublishedTestProjectsVersions.Where(x => x.PublishedTestProjectGuid == project.Guid).Count();
+                    var versionsCount = db.PublishedProcedureProjectsVersions.Where(x => x.PublishedProcedureProjectGuid == project.Guid).Count();
 
                     if (versionsCount > 10)
                     {
-                        var firstVersion = db.PublishedTestProjectsVersions.Where(x => x.PublishedTestProjectGuid == project.Guid).OrderBy(x => x.Version).First();
-                        db.PublishedTestProjectsVersions.Remove(firstVersion);
+                        var firstVersion = db.PublishedProcedureProjectsVersions.Where(x => x.PublishedProcedureProjectGuid == project.Guid).OrderBy(x => x.Version).First();
+                        db.PublishedProcedureProjectsVersions.Remove(firstVersion);
                         db.SaveChanges();
                     }
 
                     using (var cache = DiskCache.CreateContext())
                     {
-                        var cachedProject = CachedPublishedTestProject.FromObservable<CachedPublishedTestProject>(project);
+                        var cachedProject = CachedPublishedProcedureProject.FromObservable<CachedPublishedProcedureProject>(project);
 
-                        var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                        var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
 
                         collection.Upsert(cachedProject);
 
@@ -186,19 +186,19 @@ namespace Tango.FSE.BL.Services
             });
         }
 
-        public Task<PublishedTestProject> UnPublishTestProject(PublishedTestProject project)
+        public Task<PublishedProcedureProject> UnPublishProcedureProject(PublishedProcedureProject project)
         {
-            return Task.Factory.StartNew<PublishedTestProject>(() =>
+            return Task.Factory.StartNew<PublishedProcedureProject>(() =>
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    db.PublishedTestProjects.Where(x => x.Guid == project.Guid).Update(x => new PublishedTestProject() { IsVisible = false });
+                    db.PublishedProcedureProjects.Where(x => x.Guid == project.Guid).Update(x => new PublishedProcedureProject() { IsVisible = false });
 
                     project.IsVisible = false;
 
                     using (var cache = DiskCache.CreateContext())
                     {
-                        var collection = cache.Database.GetCollection<CachedPublishedTestProject>(PUBLISHED_TEST_PROJECTS_COLLECTION);
+                        var collection = cache.Database.GetCollection<CachedPublishedProcedureProject>(PUBLISHED_Procedure_PROJECTS_COLLECTION);
                         var cachedProject = collection.FindOne(x => x.Guid == project.Guid);
 
                         if (cachedProject != null)
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
index e548b03db..b1b0b300e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
@@ -82,7 +82,7 @@
   <ItemGroup>
     <Compile Include="AuthorizationException.cs" />
     <Compile Include="CacheEntities\CachedEventType.cs" />
-    <Compile Include="CacheEntities\CachedPublishedTestProject.cs" />
+    <Compile Include="CacheEntities\CachedPublishedProcedureProject.cs" />
     <Compile Include="EntityRepositoryBase.cs" />
     <Compile Include="MemoryCacheDictionary.cs" />
     <Compile Include="CacheEntities\CachedBugInfoResponse.cs" />
@@ -111,7 +111,7 @@
     <Compile Include="Services\MachineEventsService.cs" />
     <Compile Include="Services\MachinesService.cs" />
     <Compile Include="Services\OrganizationsService.cs" />
-    <Compile Include="Services\PublishedTestProjectsService.cs" />
+    <Compile Include="Services\PublishedProcedureProjectsService.cs" />
     <Compile Include="Services\TangoVersionsService.cs" />
     <Compile Include="Services\TechComponentsService.cs" />
     <Compile Include="Services\UsersService.cs" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
index 3fb91367c..743db1886 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
@@ -640,9 +640,9 @@
       <Project>{866b916a-207c-43f0-b403-7c4a820c2e11}</Project>
       <Name>Tango.FSE.PPCConsole</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Modules\Tango.FSE.Stubs\Tango.FSE.Stubs.csproj">
+    <ProjectReference Include="..\Modules\Tango.FSE.Stubs\Tango.FSE.Procedures.csproj">
       <Project>{1754f846-4763-4000-807f-c7bfaa145db2}</Project>
-      <Name>Tango.FSE.Stubs</Name>
+      <Name>Tango.FSE.Procedures</Name>
     </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.FSE.Upgrade\Tango.FSE.Upgrade.csproj">
       <Project>{0c0b24cb-79af-4253-aac3-b2badf034675}</Project>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs
index 1aafdbebc..e6253c85c 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectDTO.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.DTO
 {
-    public class PublishedTestProjectDTO : PublishedTestProjectDTOBase
+    public class PublishedProcedureProjectDTO : PublishedProcedureProjectDTOBase
     {
 
     }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs
index 53ef2576a..ef759e862 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs
@@ -18,7 +18,7 @@ using Tango.BL.Entities;
 
 namespace Tango.BL.DTO
 {
-    public abstract class PublishedTestProjectDTOBase : ObservableEntityDTO<PublishedTestProjectDTO, PublishedTestProject>
+    public abstract class PublishedProcedureProjectDTOBase : ObservableEntityDTO<PublishedProcedureProjectDTO, PublishedProcedureProject>
     {
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectsVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs
index a61ae7ea9..4df16c304 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectsVersionDTO.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.DTO
 {
-    public class PublishedTestProjectsVersionDTO : PublishedTestProjectsVersionDTOBase
+    public class PublishedProcedureProjectsVersionDTO : PublishedProcedureProjectsVersionDTOBase
     {
 
     }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectsVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs
index 88dbc572b..53d833d14 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/PublishedTestProjectsVersionDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs
@@ -18,13 +18,13 @@ using Tango.BL.Entities;
 
 namespace Tango.BL.DTO
 {
-    public abstract class PublishedTestProjectsVersionDTOBase : ObservableEntityDTO<PublishedTestProjectsVersionDTO, PublishedTestProjectsVersion>
+    public abstract class PublishedProcedureProjectsVersionDTOBase : ObservableEntityDTO<PublishedProcedureProjectsVersionDTO, PublishedProcedureProjectsVersion>
     {
 
         /// <summary>
-        /// published test project guid
+        /// published procedure project guid
         /// </summary>
-        public String PublishedTestProjectGuid 
+        public String PublishedProcedureProjectGuid 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProject.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProject.cs
index 46cf1c742..d1848a10c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProject.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProject.cs
@@ -8,15 +8,15 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.Entities
 {
-    public class PublishedTestProject : PublishedTestProjectBase
+    public class PublishedProcedureProject : PublishedProcedureProjectBase
     {
         [NotMapped]
         [JsonIgnore]
-        public PublishedTestProjectsVersion CurrentVersion
+        public PublishedProcedureProjectsVersion CurrentVersion
         {
             get
             {
-                return PublishedTestProjectsVersions.OrderBy(x => x.Version).LastOrDefault();
+                return PublishedProcedureProjectsVersions.OrderBy(x => x.Version).LastOrDefault();
             }
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProjectBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectBase.cs
index cadd50202..272f562d6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProjectBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectBase.cs
@@ -23,8 +23,8 @@ using Tango.Core.CustomAttributes;
 
 namespace Tango.BL.Entities
 {
-    [Table("PUBLISHED_TEST_PROJECTS")]
-    public abstract class PublishedTestProjectBase : ObservableEntity<PublishedTestProject>
+    [Table("PUBLISHED_PROCEDURE_PROJECTS")]
+    public abstract class PublishedProcedureProjectBase : ObservableEntity<PublishedProcedureProject>
     {
 
         public event EventHandler<String> NameChanged;
@@ -35,12 +35,12 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> IsVisibleChanged;
 
-        public event EventHandler<SynchronizedObservableCollection<PublishedTestProjectsVersion>> PublishedTestProjectsVersionsChanged;
+        public event EventHandler<SynchronizedObservableCollection<PublishedProcedureProjectsVersion>> PublishedProcedureProjectsVersionsChanged;
 
         protected String _name;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectbase name.
+        /// Gets or sets the publishedprocedureprojectbase name.
         /// </summary>
 
         [Column("NAME")]
@@ -67,7 +67,7 @@ namespace Tango.BL.Entities
         protected String _description;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectbase description.
+        /// Gets or sets the publishedprocedureprojectbase description.
         /// </summary>
 
         [Column("DESCRIPTION")]
@@ -94,7 +94,7 @@ namespace Tango.BL.Entities
         protected DateTime _publishdate;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectbase publish date.
+        /// Gets or sets the publishedprocedureprojectbase publish date.
         /// </summary>
 
         [Column("PUBLISH_DATE")]
@@ -121,7 +121,7 @@ namespace Tango.BL.Entities
         protected Boolean _isvisible;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectbase is visible.
+        /// Gets or sets the publishedprocedureprojectbase is visible.
         /// </summary>
 
         [Column("IS_VISIBLE")]
@@ -145,26 +145,26 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected SynchronizedObservableCollection<PublishedTestProjectsVersion> _publishedtestprojectsversions;
+        protected SynchronizedObservableCollection<PublishedProcedureProjectsVersion> _publishedprocedureprojectsversions;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectbase published test projects versions.
+        /// Gets or sets the publishedprocedureprojectbase published procedure projects versions.
         /// </summary>
 
-        public virtual SynchronizedObservableCollection<PublishedTestProjectsVersion> PublishedTestProjectsVersions
+        public virtual SynchronizedObservableCollection<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions
         {
             get 
             {
-                return _publishedtestprojectsversions; 
+                return _publishedprocedureprojectsversions; 
             }
 
             set 
             {
-                if (_publishedtestprojectsversions != value)
+                if (_publishedprocedureprojectsversions != value)
                 {
-                    _publishedtestprojectsversions = value;
+                    _publishedprocedureprojectsversions = value;
 
-                    OnPublishedTestProjectsVersionsChanged(value);
+                    OnPublishedProcedureProjectsVersionsChanged(value);
 
                 }
             }
@@ -207,21 +207,21 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the PublishedTestProjectsVersions has changed.
+        /// Called when the PublishedProcedureProjectsVersions has changed.
         /// </summary>
-        protected virtual void OnPublishedTestProjectsVersionsChanged(SynchronizedObservableCollection<PublishedTestProjectsVersion> publishedtestprojectsversions)
+        protected virtual void OnPublishedProcedureProjectsVersionsChanged(SynchronizedObservableCollection<PublishedProcedureProjectsVersion> publishedprocedureprojectsversions)
         {
-            PublishedTestProjectsVersionsChanged?.Invoke(this, publishedtestprojectsversions);
-            RaisePropertyChanged(nameof(PublishedTestProjectsVersions));
+            PublishedProcedureProjectsVersionsChanged?.Invoke(this, publishedprocedureprojectsversions);
+            RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions));
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PublishedTestProjectBase" /> class.
+        /// Initializes a new instance of the <see cref="PublishedProcedureProjectBase" /> class.
         /// </summary>
-        public PublishedTestProjectBase() : base()
+        public PublishedProcedureProjectBase() : base()
         {
 
-            PublishedTestProjectsVersions = new SynchronizedObservableCollection<PublishedTestProjectsVersion>();
+            PublishedProcedureProjectsVersions = new SynchronizedObservableCollection<PublishedProcedureProjectsVersion>();
 
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProjectsVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersion.cs
index a3a5ed06b..d9774f2bc 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProjectsVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersion.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.Entities
 {
-    public class PublishedTestProjectsVersion : PublishedTestProjectsVersionBase
+    public class PublishedProcedureProjectsVersion : PublishedProcedureProjectsVersionBase
     {
 
     }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProjectsVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersionBase.cs
index b250c0636..730ea9758 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/PublishedTestProjectsVersionBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersionBase.cs
@@ -23,8 +23,8 @@ using Tango.Core.CustomAttributes;
 
 namespace Tango.BL.Entities
 {
-    [Table("PUBLISHED_TEST_PROJECTS_VERSIONS")]
-    public abstract class PublishedTestProjectsVersionBase : ObservableEntity<PublishedTestProjectsVersion>
+    [Table("PUBLISHED_PROCEDURE_PROJECTS_VERSIONS")]
+    public abstract class PublishedProcedureProjectsVersionBase : ObservableEntity<PublishedProcedureProjectsVersion>
     {
 
         public event EventHandler<Int32> VersionChanged;
@@ -33,29 +33,29 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> ProjectJsonStringChanged;
 
-        public event EventHandler<PublishedTestProject> PublishedTestProjectChanged;
+        public event EventHandler<PublishedProcedureProject> PublishedProcedureProjectChanged;
 
-        protected String _publishedtestprojectguid;
+        protected String _publishedprocedureprojectguid;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectsversionbase published test project guid.
+        /// Gets or sets the publishedprocedureprojectsversionbase published procedure project guid.
         /// </summary>
 
-        [Column("PUBLISHED_TEST_PROJECT_GUID")]
-        [ForeignKey("PublishedTestProject")]
+        [Column("PUBLISHED_PROCEDURE_PROJECT_GUID")]
+        [ForeignKey("PublishedProcedureProject")]
 
-        public  String PublishedTestProjectGuid
+        public  String PublishedProcedureProjectGuid
         {
             get 
             {
-                return _publishedtestprojectguid; 
+                return _publishedprocedureprojectguid; 
             }
 
             set 
             {
-                if (_publishedtestprojectguid != value)
+                if (_publishedprocedureprojectguid != value)
                 {
-                    _publishedtestprojectguid = value;
+                    _publishedprocedureprojectguid = value;
 
                 }
             }
@@ -64,7 +64,7 @@ namespace Tango.BL.Entities
         protected Int32 _version;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectsversionbase version.
+        /// Gets or sets the publishedprocedureprojectsversionbase version.
         /// </summary>
 
         [Column("VERSION")]
@@ -91,7 +91,7 @@ namespace Tango.BL.Entities
         protected String _author;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectsversionbase author.
+        /// Gets or sets the publishedprocedureprojectsversionbase author.
         /// </summary>
 
         [Column("AUTHOR")]
@@ -118,7 +118,7 @@ namespace Tango.BL.Entities
         protected String _projectjsonstring;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectsversionbase project json string.
+        /// Gets or sets the publishedprocedureprojectsversionbase project json string.
         /// </summary>
 
         [Column("PROJECT_JSON_STRING")]
@@ -142,33 +142,33 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected PublishedTestProject _publishedtestproject;
+        protected PublishedProcedureProject _publishedprocedureproject;
 
         /// <summary>
-        /// Gets or sets the publishedtestprojectsversionbase published test projects.
+        /// Gets or sets the publishedprocedureprojectsversionbase published procedure projects.
         /// </summary>
 
         [XmlIgnore]
         [JsonIgnore]
-        public virtual PublishedTestProject PublishedTestProject
+        public virtual PublishedProcedureProject PublishedProcedureProject
         {
             get 
             {
-                return _publishedtestproject; 
+                return _publishedprocedureproject; 
             }
 
             set 
             {
-                if (_publishedtestproject != value)
+                if (_publishedprocedureproject != value)
                 {
-                    _publishedtestproject = value;
+                    _publishedprocedureproject = value;
 
-                    if (PublishedTestProject != null)
+                    if (PublishedProcedureProject != null)
                     {
-                        PublishedTestProjectGuid = PublishedTestProject.Guid;
+                        PublishedProcedureProjectGuid = PublishedProcedureProject.Guid;
                     }
 
-                    OnPublishedTestProjectChanged(value);
+                    OnPublishedProcedureProjectChanged(value);
 
                 }
             }
@@ -202,18 +202,18 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the PublishedTestProject has changed.
+        /// Called when the PublishedProcedureProject has changed.
         /// </summary>
-        protected virtual void OnPublishedTestProjectChanged(PublishedTestProject publishedtestproject)
+        protected virtual void OnPublishedProcedureProjectChanged(PublishedProcedureProject publishedprocedureproject)
         {
-            PublishedTestProjectChanged?.Invoke(this, publishedtestproject);
-            RaisePropertyChanged(nameof(PublishedTestProject));
+            PublishedProcedureProjectChanged?.Invoke(this, publishedprocedureproject);
+            RaisePropertyChanged(nameof(PublishedProcedureProject));
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PublishedTestProjectsVersionBase" /> class.
+        /// Initializes a new instance of the <see cref="PublishedProcedureProjectsVersionBase" /> class.
         /// </summary>
-        public PublishedTestProjectsVersionBase() : base()
+        public PublishedProcedureProjectsVersionBase() : base()
         {
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
index 2756f8d02..626031872 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
@@ -170,16 +170,16 @@ namespace Tango.BL.Enumerations
         FSE_ManageAllOrganizationsUsersAndRoles = 1003,
 
         /// <summary>
-        /// (Allows running the test designer module)
+        /// (Allows running the procedure designer module)
         /// </summary>
-        [Description("Allows running the test designer module")]
-        FSE_RunTestDesigner = 1004,
+        [Description("Allows running the procedure designer module")]
+        FSE_RunProcedureDesigner = 1004,
 
         /// <summary>
-        /// (Allows publishing test projects)
+        /// (Allows publishing procedure projects)
         /// </summary>
-        [Description("Allows publishing test projects")]
-        FSE_PublishTestProjects = 1005,
+        [Description("Allows publishing procedure projects")]
+        FSE_PublishProcedureProjects = 1005,
 
         /// <summary>
         /// (Allows starting remote desktop sessions)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
index 02e9d41a8..5747cfb59 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
@@ -140,16 +140,16 @@ namespace Tango.BL.Enumerations
         FSETwineDeveloper = 1005,
 
         /// <summary>
-        /// (Twine Test Designer)
+        /// (Twine Procedure Designer)
         /// </summary>
-        [Description("Twine Test Designer")]
-        FSETwineTestDesigner = 1006,
+        [Description("Twine Procedure Designer")]
+        FSETwineProcedureDesigner = 1006,
 
         /// <summary>
-        /// (Twine Test Publisher)
+        /// (Twine Procedure Publisher)
         /// </summary>
-        [Description("Twine Test Publisher")]
-        FSETwineTestPublisher = 1007,
+        [Description("Twine Procedure Publisher")]
+        FSETwineProcedurePublisher = 1007,
 
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index ec071f4d5..0f76f1e45 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -495,17 +495,17 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the PublishedTestProjects.
+        /// Gets or sets the PublishedProcedureProjects.
         /// </summary>
-        public DbSet<PublishedTestProject> PublishedTestProjects 
+        public DbSet<PublishedProcedureProject> PublishedProcedureProjects 
         {
             get; set; 
         }
 
         /// <summary>
-        /// Gets or sets the PublishedTestProjectsVersions.
+        /// Gets or sets the PublishedProcedureProjectsVersions.
         /// </summary>
-        public DbSet<PublishedTestProjectsVersion> PublishedTestProjectsVersions 
+        public DbSet<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index fae9a5b7a..ee04dbae4 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -2141,74 +2141,74 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<PublishedTestProject> _publishedtestprojects;
+        private ObservableCollection<PublishedProcedureProject> _publishedprocedureprojects;
         /// <summary>
-        /// Gets or sets the PublishedTestProjects.
+        /// Gets or sets the PublishedProcedureProjects.
         /// </summary>
-        public ObservableCollection<PublishedTestProject> PublishedTestProjects
+        public ObservableCollection<PublishedProcedureProject> PublishedProcedureProjects
         {
             get 
             {
-                return _publishedtestprojects; 
+                return _publishedprocedureprojects; 
             }
 
             set 
             {
-                _publishedtestprojects = value; RaisePropertyChanged(nameof(PublishedTestProjects)); 
+                _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); 
             }
 
         }
 
-        private ICollectionView _publishedtestprojectsViewSource;
+        private ICollectionView _publishedprocedureprojectsViewSource;
         /// <summary>
-        /// Gets or sets the PublishedTestProjects View Source.
+        /// Gets or sets the PublishedProcedureProjects View Source.
         ///</summary>
-        public ICollectionView PublishedTestProjectsViewSource
+        public ICollectionView PublishedProcedureProjectsViewSource
         {
             get 
             {
-                return _publishedtestprojectsViewSource; 
+                return _publishedprocedureprojectsViewSource; 
             }
 
             set 
             {
-                _publishedtestprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedTestProjectsViewSource)); 
+                _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); 
             }
 
         }
 
-        private ObservableCollection<PublishedTestProjectsVersion> _publishedtestprojectsversions;
+        private ObservableCollection<PublishedProcedureProjectsVersion> _publishedprocedureprojectsversions;
         /// <summary>
-        /// Gets or sets the PublishedTestProjectsVersions.
+        /// Gets or sets the PublishedProcedureProjectsVersions.
         /// </summary>
-        public ObservableCollection<PublishedTestProjectsVersion> PublishedTestProjectsVersions
+        public ObservableCollection<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions
         {
             get 
             {
-                return _publishedtestprojectsversions; 
+                return _publishedprocedureprojectsversions; 
             }
 
             set 
             {
-                _publishedtestprojectsversions = value; RaisePropertyChanged(nameof(PublishedTestProjectsVersions)); 
+                _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); 
             }
 
         }
 
-        private ICollectionView _publishedtestprojectsversionsViewSource;
+        private ICollectionView _publishedprocedureprojectsversionsViewSource;
         /// <summary>
-        /// Gets or sets the PublishedTestProjectsVersions View Source.
+        /// Gets or sets the PublishedProcedureProjectsVersions View Source.
         ///</summary>
-        public ICollectionView PublishedTestProjectsVersionsViewSource
+        public ICollectionView PublishedProcedureProjectsVersionsViewSource
         {
             get 
             {
-                return _publishedtestprojectsversionsViewSource; 
+                return _publishedprocedureprojectsversionsViewSource; 
             }
 
             set 
             {
-                _publishedtestprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedTestProjectsVersionsViewSource)); 
+                _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); 
             }
 
         }
@@ -3129,9 +3129,9 @@ namespace Tango.BL
 
             ProcessParametersTablesGroupsViewSource = CreateCollectionView(ProcessParametersTablesGroups);
 
-            PublishedTestProjectsViewSource = CreateCollectionView(PublishedTestProjects);
+            PublishedProcedureProjectsViewSource = CreateCollectionView(PublishedProcedureProjects);
 
-            PublishedTestProjectsVersionsViewSource = CreateCollectionView(PublishedTestProjectsVersions);
+            PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions);
 
             RmlsViewSource = CreateCollectionView(Rmls);
 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index 86c507bf9..70bc7ed50 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -2141,74 +2141,74 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<PublishedTestProject> _publishedtestprojects;
+        private ObservableCollection<PublishedProcedureProject> _publishedprocedureprojects;
         /// <summary>
-        /// Gets or sets the PublishedTestProjects.
+        /// Gets or sets the PublishedProcedureProjects.
         /// </summary>
-        public ObservableCollection<PublishedTestProject> PublishedTestProjects
+        public ObservableCollection<PublishedProcedureProject> PublishedProcedureProjects
         {
             get 
             {
-                return _publishedtestprojects; 
+                return _publishedprocedureprojects; 
             }
 
             set 
             {
-                _publishedtestprojects = value; RaisePropertyChanged(nameof(PublishedTestProjects)); 
+                _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); 
             }
 
         }
 
-        private ICollectionView _publishedtestprojectsViewSource;
+        private ICollectionView _publishedprocedureprojectsViewSource;
         /// <summary>
-        /// Gets or sets the PublishedTestProjects View Source.
+        /// Gets or sets the PublishedProcedureProjects View Source.
         ///</summary>
-        public ICollectionView PublishedTestProjectsViewSource
+        public ICollectionView PublishedProcedureProjectsViewSource
         {
             get 
             {
-                return _publishedtestprojectsViewSource; 
+                return _publishedprocedureprojectsViewSource; 
             }
 
             set 
             {
-                _publishedtestprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedTestProjectsViewSource)); 
+                _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); 
             }
 
         }
 
-        private ObservableCollection<PublishedTestProjectsVersion> _publishedtestprojectsversions;
+        private ObservableCollection<PublishedProcedureProjectsVersion> _publishedprocedureprojectsversions;
         /// <summary>
-        /// Gets or sets the PublishedTestProjectsVersions.
+        /// Gets or sets the PublishedProcedureProjectsVersions.
         /// </summary>
-        public ObservableCollection<PublishedTestProjectsVersion> PublishedTestProjectsVersions
+        public ObservableCollection<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions
         {
             get 
             {
-                return _publishedtestprojectsversions; 
+                return _publishedprocedureprojectsversions; 
             }
 
             set 
             {
-                _publishedtestprojectsversions = value; RaisePropertyChanged(nameof(PublishedTestProjectsVersions)); 
+                _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); 
             }
 
         }
 
-        private ICollectionView _publishedtestprojectsversionsViewSource;
+        private ICollectionView _publishedprocedureprojectsversionsViewSource;
         /// <summary>
-        /// Gets or sets the PublishedTestProjectsVersions View Source.
+        /// Gets or sets the PublishedProcedureProjectsVersions View Source.
         ///</summary>
-        public ICollectionView PublishedTestProjectsVersionsViewSource
+        public ICollectionView PublishedProcedureProjectsVersionsViewSource
         {
             get 
             {
-                return _publishedtestprojectsversionsViewSource; 
+                return _publishedprocedureprojectsversionsViewSource; 
             }
 
             set 
             {
-                _publishedtestprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedTestProjectsVersionsViewSource)); 
+                _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); 
             }
 
         }
@@ -3129,9 +3129,9 @@ namespace Tango.BL
 
             ProcessParametersTablesGroupsViewSource = CreateCollectionView(ProcessParametersTablesGroups);
 
-            PublishedTestProjectsViewSource = CreateCollectionView(PublishedTestProjects);
+            PublishedProcedureProjectsViewSource = CreateCollectionView(PublishedProcedureProjects);
 
-            PublishedTestProjectsVersionsViewSource = CreateCollectionView(PublishedTestProjectsVersions);
+            PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions);
 
             RmlsViewSource = CreateCollectionView(Rmls);
 
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 89952a289..59b0fee24 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -254,10 +254,10 @@
     <Compile Include="DTO\ProcessParametersTableDTOBase.cs" />
     <Compile Include="DTO\ProcessParametersTablesGroupDTO.cs" />
     <Compile Include="DTO\ProcessParametersTablesGroupDTOBase.cs" />
-    <Compile Include="DTO\PublishedTestProjectDTO.cs" />
-    <Compile Include="DTO\PublishedTestProjectDTOBase.cs" />
-    <Compile Include="DTO\PublishedTestProjectsVersionDTO.cs" />
-    <Compile Include="DTO\PublishedTestProjectsVersionDTOBase.cs" />
+    <Compile Include="DTO\PublishedProcedureProjectDTO.cs" />
+    <Compile Include="DTO\PublishedProcedureProjectDTOBase.cs" />
+    <Compile Include="DTO\PublishedProcedureProjectsVersionDTO.cs" />
+    <Compile Include="DTO\PublishedProcedureProjectsVersionDTOBase.cs" />
     <Compile Include="DTO\RmlDTO.cs" />
     <Compile Include="DTO\RmlDTOBase.cs" />
     <Compile Include="DTO\RmlsSpoolDTO.cs" />
@@ -373,10 +373,10 @@
     <Compile Include="Entities\PermissionBase.cs" />
     <Compile Include="Entities\ProcessParametersTableBase.cs" />
     <Compile Include="Entities\ProcessParametersTablesGroupBase.cs" />
-    <Compile Include="Entities\PublishedTestProject.cs" />
-    <Compile Include="Entities\PublishedTestProjectBase.cs" />
-    <Compile Include="Entities\PublishedTestProjectsVersionBase.cs" />
-    <Compile Include="Entities\PublishedTestProjectsVersion.cs" />
+    <Compile Include="Entities\PublishedProcedureProject.cs" />
+    <Compile Include="Entities\PublishedProcedureProjectBase.cs" />
+    <Compile Include="Entities\PublishedProcedureProjectsVersionBase.cs" />
+    <Compile Include="Entities\PublishedProcedureProjectsVersion.cs" />
     <Compile Include="Entities\RmlBase.cs" />
     <Compile Include="Entities\RmlsSpoolBase.cs" />
     <Compile Include="Entities\RmlsSpool.cs" />
@@ -632,7 +632,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_TEST_PROJECTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS.cs
index c2a1aa9e0..827a2ba94 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_TEST_PROJECTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS.cs
@@ -12,12 +12,12 @@ namespace Tango.DAL.Remote.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class PUBLISHED_TEST_PROJECTS
+    public partial class PUBLISHED_PROCEDURE_PROJECTS
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public PUBLISHED_TEST_PROJECTS()
+        public PUBLISHED_PROCEDURE_PROJECTS()
         {
-            this.PUBLISHED_TEST_PROJECTS_VERSIONS = new HashSet<PUBLISHED_TEST_PROJECTS_VERSIONS>();
+            this.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS = new HashSet<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS>();
         }
     
         public int ID { get; set; }
@@ -29,6 +29,6 @@ namespace Tango.DAL.Remote.DB
         public bool IS_VISIBLE { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<PUBLISHED_TEST_PROJECTS_VERSIONS> PUBLISHED_TEST_PROJECTS_VERSIONS { get; set; }
+        public virtual ICollection<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS> PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_TEST_PROJECTS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs
index f41e3317b..6d601ee71 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_TEST_PROJECTS_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs
@@ -12,16 +12,16 @@ namespace Tango.DAL.Remote.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class PUBLISHED_TEST_PROJECTS_VERSIONS
+    public partial class PUBLISHED_PROCEDURE_PROJECTS_VERSIONS
     {
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
-        public string PUBLISHED_TEST_PROJECT_GUID { get; set; }
+        public string PUBLISHED_PROCEDURE_PROJECT_GUID { get; set; }
         public int VERSION { get; set; }
         public string AUTHOR { get; set; }
         public string PROJECT_JSON_STRING { get; set; }
     
-        public virtual PUBLISHED_TEST_PROJECTS PUBLISHED_TEST_PROJECTS { get; set; }
+        public virtual PUBLISHED_PROCEDURE_PROJECTS PUBLISHED_PROCEDURE_PROJECTS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 9773308c6..730bbbaae 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -84,8 +84,8 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<PERMISSION> PERMISSIONS { get; set; }
         public virtual DbSet<PROCESS_PARAMETERS_TABLES> PROCESS_PARAMETERS_TABLES { get; set; }
         public virtual DbSet<PROCESS_PARAMETERS_TABLES_GROUPS> PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
-        public virtual DbSet<PUBLISHED_TEST_PROJECTS> PUBLISHED_TEST_PROJECTS { get; set; }
-        public virtual DbSet<PUBLISHED_TEST_PROJECTS_VERSIONS> PUBLISHED_TEST_PROJECTS_VERSIONS { get; set; }
+        public virtual DbSet<PUBLISHED_PROCEDURE_PROJECTS> PUBLISHED_PROCEDURE_PROJECTS { get; set; }
+        public virtual DbSet<PUBLISHED_PROCEDURE_PROJECTS_VERSIONS> PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; }
         public virtual DbSet<RML> RMLS { get; set; }
         public virtual DbSet<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 07e5d537c..dab668116 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -916,7 +916,7 @@
           <Property Name="ACTIVE" Type="bit" Nullable="false" />
           <Property Name="SAVE_DATE" Type="datetime2" Precision="3" Nullable="false" />
         </EntityType>
-        <EntityType Name="PUBLISHED_TEST_PROJECTS">
+        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS">
           <Key>
             <PropertyRef Name="GUID" />
           </Key>
@@ -928,14 +928,14 @@
           <Property Name="PUBLISH_DATE" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="IS_VISIBLE" Type="bit" Nullable="false" />
         </EntityType>
-        <EntityType Name="PUBLISHED_TEST_PROJECTS_VERSIONS">
+        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
           </Key>
           <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="PUBLISHED_TEST_PROJECT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="PUBLISHED_PROCEDURE_PROJECT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="VERSION" Type="int" Nullable="false" />
           <Property Name="AUTHOR" Type="nvarchar" MaxLength="200" Nullable="false" />
           <Property Name="PROJECT_JSON_STRING" Type="nvarchar(max)" Nullable="false" />
@@ -2074,16 +2074,16 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-          <End Role="PUBLISHED_TEST_PROJECTS" Type="Self.PUBLISHED_TEST_PROJECTS" Multiplicity="1">
+          <End Role="PUBLISHED_PROCEDURE_PROJECTS" Type="Self.PUBLISHED_PROCEDURE_PROJECTS" Multiplicity="1">
             <OnDelete Action="Cascade" />
           </End>
-          <End Role="PUBLISHED_TEST_PROJECTS_VERSIONS" Type="Self.PUBLISHED_TEST_PROJECTS_VERSIONS" Multiplicity="*" />
+          <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Type="Self.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="PUBLISHED_TEST_PROJECTS">
+            <Principal Role="PUBLISHED_PROCEDURE_PROJECTS">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="PUBLISHED_TEST_PROJECTS_VERSIONS">
-              <PropertyRef Name="PUBLISHED_TEST_PROJECT_GUID" />
+            <Dependent Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
+              <PropertyRef Name="PUBLISHED_PROCEDURE_PROJECT_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -2484,8 +2484,8 @@
           <EntitySet Name="PERMISSIONS" EntityType="Self.PERMISSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES" EntityType="Self.PROCESS_PARAMETERS_TABLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="Self.PROCESS_PARAMETERS_TABLES_GROUPS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="PUBLISHED_TEST_PROJECTS" EntityType="Self.PUBLISHED_TEST_PROJECTS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="PUBLISHED_TEST_PROJECTS_VERSIONS" EntityType="Self.PUBLISHED_TEST_PROJECTS_VERSIONS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS" EntityType="Self.PUBLISHED_PROCEDURE_PROJECTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntityType="Self.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS" EntityType="Self.RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RMLS_SPOOLS" EntityType="Self.RMLS_SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ROLES" EntityType="Self.ROLES" Schema="dbo" store:Type="Tables" />
@@ -2754,8 +2754,8 @@
             <End Role="PROCESS_PARAMETERS_TABLES" EntitySet="PROCESS_PARAMETERS_TABLES" />
           </AssociationSet>
           <AssociationSet Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" Association="Self.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-            <End Role="PUBLISHED_TEST_PROJECTS" EntitySet="PUBLISHED_TEST_PROJECTS" />
-            <End Role="PUBLISHED_TEST_PROJECTS_VERSIONS" EntitySet="PUBLISHED_TEST_PROJECTS_VERSIONS" />
+            <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
+            <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           </AssociationSet>
           <AssociationSet Name="FK_RML_FIBER_SHAPES" Association="Self.FK_RML_FIBER_SHAPES">
             <End Role="FIBER_SHAPES" EntitySet="FIBER_SHAPES" />
@@ -2926,8 +2926,8 @@
           <EntitySet Name="PERMISSIONS" EntityType="RemoteModel.PERMISSION" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" />
-          <EntitySet Name="PUBLISHED_TEST_PROJECTS" EntityType="RemoteModel.PUBLISHED_TEST_PROJECTS" />
-          <EntitySet Name="PUBLISHED_TEST_PROJECTS_VERSIONS" EntityType="RemoteModel.PUBLISHED_TEST_PROJECTS_VERSIONS" />
+          <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS" EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" />
+          <EntitySet Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           <EntitySet Name="RMLS" EntityType="RemoteModel.RML" />
           <EntitySet Name="RMLS_SPOOLS" EntityType="RemoteModel.RMLS_SPOOLS" />
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
@@ -3259,8 +3259,8 @@
             <End Role="PROCESS_PARAMETERS_TABLES_GROUPS" EntitySet="PROCESS_PARAMETERS_TABLES_GROUPS" />
           </AssociationSet>
           <AssociationSet Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" Association="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-            <End Role="PUBLISHED_TEST_PROJECTS" EntitySet="PUBLISHED_TEST_PROJECTS" />
-            <End Role="PUBLISHED_TEST_PROJECTS_VERSIONS" EntitySet="PUBLISHED_TEST_PROJECTS_VERSIONS" />
+            <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
+            <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           </AssociationSet>
           <AssociationSet Name="FK_RMLS_SPOOLS_RMLS" Association="RemoteModel.FK_RMLS_SPOOLS_RMLS">
             <End Role="RML" EntitySet="RMLS" />
@@ -4347,7 +4347,7 @@
           <NavigationProperty Name="PROCESS_PARAMETERS_TABLES" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES_GROUPS" ToRole="PROCESS_PARAMETERS_TABLES" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_GROUPS_RMLS" FromRole="PROCESS_PARAMETERS_TABLES_GROUPS" ToRole="RML" />
         </EntityType>
-        <EntityType Name="PUBLISHED_TEST_PROJECTS">
+        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS">
           <Key>
             <PropertyRef Name="GUID" />
           </Key>
@@ -4358,20 +4358,20 @@
           <Property Name="DESCRIPTION" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="PUBLISH_DATE" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="IS_VISIBLE" Type="Boolean" Nullable="false" />
-          <NavigationProperty Name="PUBLISHED_TEST_PROJECTS_VERSIONS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_TEST_PROJECTS" ToRole="PUBLISHED_TEST_PROJECTS_VERSIONS" />
+          <NavigationProperty Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_PROCEDURE_PROJECTS" ToRole="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
         </EntityType>
-        <EntityType Name="PUBLISHED_TEST_PROJECTS_VERSIONS">
+        <EntityType Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
           </Key>
           <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="PUBLISHED_TEST_PROJECT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="PUBLISHED_PROCEDURE_PROJECT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="VERSION" Type="Int32" Nullable="false" />
           <Property Name="AUTHOR" Type="String" Nullable="false" MaxLength="200" FixedLength="false" Unicode="true" />
           <Property Name="PROJECT_JSON_STRING" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="PUBLISHED_TEST_PROJECTS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_TEST_PROJECTS_VERSIONS" ToRole="PUBLISHED_TEST_PROJECTS" />
+          <NavigationProperty Name="PUBLISHED_PROCEDURE_PROJECTS" Relationship="RemoteModel.FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS" FromRole="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" ToRole="PUBLISHED_PROCEDURE_PROJECTS" />
         </EntityType>
         <EntityType Name="RML">
           <Key>
@@ -5748,16 +5748,16 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_PUBLISHED_TEST_PROJECTS_VERSIONS_PUBLISHED_TEST_PROJECTS">
-          <End Type="RemoteModel.PUBLISHED_TEST_PROJECTS" Role="PUBLISHED_TEST_PROJECTS" Multiplicity="1">
+          <End Type="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Role="PUBLISHED_PROCEDURE_PROJECTS" Multiplicity="1">
             <OnDelete Action="Cascade" />
           </End>
-          <End Type="RemoteModel.PUBLISHED_TEST_PROJECTS_VERSIONS" Role="PUBLISHED_TEST_PROJECTS_VERSIONS" Multiplicity="*" />
+          <End Type="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="PUBLISHED_TEST_PROJECTS">
+            <Principal Role="PUBLISHED_PROCEDURE_PROJECTS">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="PUBLISHED_TEST_PROJECTS_VERSIONS">
-              <PropertyRef Name="PUBLISHED_TEST_PROJECT_GUID" />
+            <Dependent Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
+              <PropertyRef Name="PUBLISHED_PROCEDURE_PROJECT_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -6883,9 +6883,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="PUBLISHED_TEST_PROJECTS">
-            <EntityTypeMapping TypeName="RemoteModel.PUBLISHED_TEST_PROJECTS">
-              <MappingFragment StoreEntitySet="PUBLISHED_TEST_PROJECTS">
+          <EntitySetMapping Name="PUBLISHED_PROCEDURE_PROJECTS">
+            <EntityTypeMapping TypeName="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS">
+              <MappingFragment StoreEntitySet="PUBLISHED_PROCEDURE_PROJECTS">
                 <ScalarProperty Name="IS_VISIBLE" ColumnName="IS_VISIBLE" />
                 <ScalarProperty Name="PUBLISH_DATE" ColumnName="PUBLISH_DATE" />
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
@@ -6896,13 +6896,13 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="PUBLISHED_TEST_PROJECTS_VERSIONS">
-            <EntityTypeMapping TypeName="RemoteModel.PUBLISHED_TEST_PROJECTS_VERSIONS">
-              <MappingFragment StoreEntitySet="PUBLISHED_TEST_PROJECTS_VERSIONS">
+          <EntitySetMapping Name="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
+            <EntityTypeMapping TypeName="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
+              <MappingFragment StoreEntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS">
                 <ScalarProperty Name="PROJECT_JSON_STRING" ColumnName="PROJECT_JSON_STRING" />
                 <ScalarProperty Name="AUTHOR" ColumnName="AUTHOR" />
                 <ScalarProperty Name="VERSION" ColumnName="VERSION" />
-                <ScalarProperty Name="PUBLISHED_TEST_PROJECT_GUID" ColumnName="PUBLISHED_TEST_PROJECT_GUID" />
+                <ScalarProperty Name="PUBLISHED_PROCEDURE_PROJECT_GUID" ColumnName="PUBLISHED_PROCEDURE_PROJECT_GUID" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 8e236fced..6dfe25aad 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,88 +5,88 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="97">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="60.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="66.25" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="30.375" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="54" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="33.875" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="86.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="85.875" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="63.25" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="37.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="4" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="94.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="69.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="98.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="73.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="94.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="73.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="61.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="66.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="76.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="61.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="90.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="69.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="90.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="65.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="42.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="5.75" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="30" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="24.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="13.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="27.625" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="79.875" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="38.625" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.25" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_TEST_PROJECTS" Width="1.5" PointX="3.75" PointY="1.875" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_TEST_PROJECTS_VERSIONS" Width="1.5" PointX="6" PointY="1.875" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="24.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="0.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="38.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="13.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="25.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="13.625" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="28.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="6.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="13.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="18.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="6.5" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="7.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="57.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="81.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="74.375" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3.75" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="20.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="74.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="61.375" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="1.5" PointY="89.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3.75" PointY="88.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="68.5" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="25.125" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="93.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="77.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="97.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="81.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="84.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="68.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="85.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="74.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="92.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="79" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="89.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9.75" PointY="84.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="77.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.5" PointY="62.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="8.75" PointY="70.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3.75" PointY="43.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="6" PointY="41.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.5" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="33.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="65.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="41.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="28.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="13.875" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3.75" PointY="40.5" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="59.25" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.375" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="3.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="6" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="17" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="30.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="7.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="8.25" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="7.75" PointY="5.875" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="9.875" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="8.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="8.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="6.875" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="24.875" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 480158199..9cf9c853a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -240,10 +240,10 @@
     <Compile Include="DB\PROCESS_PARAMETERS_TABLES_GROUPS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\PUBLISHED_TEST_PROJECTS.cs">
+    <Compile Include="DB\PUBLISHED_PROCEDURE_PROJECTS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\PUBLISHED_TEST_PROJECTS_VERSIONS.cs">
+    <Compile Include="DB\PUBLISHED_PROCEDURE_PROJECTS_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\RemoteADO.Context.cs">
@@ -380,7 +380,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 941effb79..749814783 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -381,7 +381,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Scripting.Basic", "Sc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Scripting.Core", "Scripting\Tango.Scripting.Core\Tango.Scripting.Core.csproj", "{5812E1C6-ABAA-4066-94AC-971C27B4F46A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.Stubs", "FSE\Modules\Tango.FSE.Stubs\Tango.FSE.Stubs.csproj", "{1754F846-4763-4000-807F-C7BFAA145DB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.Procedures", "FSE\Modules\Tango.FSE.Stubs\Tango.FSE.Procedures.csproj", "{1754F846-4763-4000-807F-C7BFAA145DB2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Scripting.Formatting", "Scripting\Tango.Scripting.Formatting\Tango.Scripting.Formatting.csproj", "{8D8F06ED-7F75-4933-B0C5-829B0FF654D0}"
 EndProject
@@ -3798,12 +3798,12 @@ Global
 		{A248FF61-94E5-428C-B30C-25CB433C5F53} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal
author	Roy Ben Shabat <Roy.mail.net@gmail.com>	2020-05-27 13:06:05 +0300
committer	Roy Ben Shabat <Roy.mail.net@gmail.com>	2020-05-27 13:06:05 +0300
commit	860b9995abbf63b1085e9b6069e6b53e83d33aaf (patch)
tree	2a75000d380a7f5659bf205354de20338ee032f2 /Software
parent	93cb59d7df48aa2aa89683ed93909c6495b353df (diff)
download	Tango-860b9995abbf63b1085e9b6069e6b53e83d33aaf.tar.gz Tango-860b9995abbf63b1085e9b6069e6b53e83d33aaf.zip