Twine RSM

31 files changed, 79 insertions, 79 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj
index dfe7cc101..c6ba79753 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj
@@ -35,7 +35,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -44,7 +44,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj
index 4e4aa75ae..d99844efa 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj
@@ -35,7 +35,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -44,7 +44,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj
index c2dfeb2a6..70a938940 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj
@@ -37,7 +37,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -46,7 +46,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj
index d09860120..300916443 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj
@@ -37,7 +37,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -46,7 +46,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj
index 51e9dc119..a40822a8a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj
@@ -34,7 +34,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -43,7 +43,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj
index cbf76444d..e6104f060 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj
@@ -35,7 +35,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -44,7 +44,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml
index 919d47132..2e2c1e0d0 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml
@@ -33,10 +33,10 @@
                 <commonControls:FSETabControl TabsWidth="1000" x:Name="tabs" SelectedObject="{Binding SelectedView,Mode=TwoWay}">
                     <local:MonitoringView Tag="MONITORING" />
                     <local:RemoteDesktopView Tag="REMOTE DESKTOP" />
-                    <local:ConsoleView Tag="CONSOLE" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineStudio}" />
-                    <local:FileSystemView Tag="FILE SYSTEM" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineStudio}" />
+                    <local:ConsoleView Tag="CONSOLE" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineRSM}" />
+                    <local:FileSystemView Tag="FILE SYSTEM" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineRSM}" />
                     <local:UpdatesView Tag="UPDATES" />
-                    <local:LogsView Tag="LOGS" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineStudio}" />
+                    <local:LogsView Tag="LOGS" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineRSM}" />
                 </commonControls:FSETabControl>
 
                 <TextBlock resolution:ResolutionHelper.MinWidth="1500" Margin="10 0 0 0" FontFamily="{StaticResource hand}" FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentDarkBrush}" VerticalAlignment="Top" HorizontalAlignment="Left" Text="{Binding ElementName=tabs,Path=SelectedElement.Tag,Converter={StaticResource StringToTitleCaseConverter}}"></TextBlock>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
index d93bb617a..77e3dff8f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj
index 8c01285b0..585cb6cf9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj
@@ -241,7 +241,7 @@
     </PreBuildEvent>
 <PostBuildEvent>
   copy /Y "$(OutputPath)proc-doc.chm" "$(SolutionDir)Build\FSE\$(Configuration)"
-  if $(Configuration) == TS copy /Y "$(OutputPath)proc-doc.chm" "$(SolutionDir)Build\Twine Studio\Release\"
+  if $(Configuration) == TS copy /Y "$(OutputPath)proc-doc.chm" "$(SolutionDir)Build\Twine RSM\Release\"
 </PostBuildEvent>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
index f310eaf63..1c2638abb 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
@@ -38,7 +38,7 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -47,7 +47,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj
index ac7c32b57..ede305fb7 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj
@@ -34,7 +34,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -43,7 +43,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
index b5b0ebd27..2b46ad72f 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
@@ -372,7 +372,7 @@ namespace Tango.FSE.Statistics.ViewModels
                     stop.JobIndex = _currentJobIndex;
                     stop.SegmentIndex = job.Job.Segments.IndexOf(jobSegment) + 1;
                     stop.ThreadName = rmlName;
-                    stop.IsAdvancedMode = !BuildProvider.IsTwineStudio && CurrentUser.HasRole(Roles.FSEAdvancedTechnician);
+                    stop.IsAdvancedMode = !BuildProvider.IsTwineRSM && CurrentUser.HasRole(Roles.FSEAdvancedTechnician);
 
                     stop.ColorSpace = jobStop.ColorSpace;
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj
index 7d38491cb..095ad3cb3 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj
@@ -35,7 +35,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -44,7 +44,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj
index 20e2b1fe1..edcab2f65 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj
@@ -34,7 +34,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -43,7 +43,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
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 78731ad15..a8d824a22 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
@@ -204,7 +204,7 @@ namespace Tango.FSE.UsersAndRoles.ViewModels
                 collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineDeveloper), Roles.FSETechnician, Roles.FSEAdvancedTechnician, Roles.FSETwineTechnician) { IsVisible = CurrentUser.HasRole(Roles.FSETwineDeveloper) });
             }
 
-            collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.TwineStudioUser)));
+            collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.TwineRSMUser)));
             collection.ToList().ForEach(x => x.IsSelected = user.FSERoles.Any(y => y.Code == x.Role.Code));
 
             RolesCollection = collection;
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs
index ae7c716d2..94f2867cf 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs
@@ -14,7 +14,7 @@ namespace Tango.FSE.BL
         static BuildProvider()
         {
 #if TS
-            Build = BuildVariants.TwineStudio; 
+            Build = BuildVariants.TwineRSM; 
 #endif
         }
     }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs
index 417f1bd2f..7337ac9a5 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs
@@ -76,7 +76,7 @@ namespace Tango.FSE.BL.Services
                     using (ObservablesContext db = ObservablesContext.CreateDefault())
                     {
                         return db.Roles
-                        .Where(x => x.Code >= 1000 && x.Code < 3000) //Only FSE & Twine Studio
+                        .Where(x => x.Code >= 1000 && x.Code < 3000) //Only FSE & Twine RSM
                         .Include(x => x.RolesPermissions)
                         .Include(x => x.RolesPermissions.Select(y => y.Permission))
                         .ToList();
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 34f514c23..cfa983d77 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
@@ -32,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE;TS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -41,7 +41,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>TRACE;TS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs
index ee99f24d1..ccf44dfcd 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs
@@ -9,13 +9,13 @@ namespace Tango.FSE.Common.Build
     public enum BuildVariants
     {
         FSE,
-        TwineStudio
+        TwineRSM
     }
 
     public interface IBuildProvider
     {
         BuildVariants CurrentBuild { get; }
         String BuildName { get; }
-        bool IsTwineStudio { get; }
+        bool IsTwineRSM { get; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
index 2c7e2f586..95ee0b2f5 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
@@ -39,9 +39,9 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>..\..\Build\Twine Studio\Release\Tango.FSE.Common.xml</DocumentationFile>
+    <DocumentationFile>..\..\Build\Twine RSM\Release\Tango.FSE.Common.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>1591</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -50,9 +50,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>..\..\Build\Twine Studio\Debug\Tango.FSE.Common.xml</DocumentationFile>
+    <DocumentationFile>..\..\Build\Twine RSM\Debug\Tango.FSE.Common.xml</DocumentationFile>
     <Optimize>false</Optimize>
     <NoWarn>1591</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml
index cb99015a9..57119d1fe 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         xmlns:local="clr-namespace:Tango.FSE.Publisher.UI"
         mc:Ignorable="d"
-        Title="Tango FSE/Twine Studio Publisher" Height="600" Width="400" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
+        Title="Tango FSE/Twine RSM Publisher" Height="600" Width="400" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
     <Window.Style>
         <Style TargetType="Window">
             <Setter Property="Cursor" Value="Arrow"></Setter>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
index 93a93bab5..eb3ed41c9 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
@@ -27,7 +27,7 @@ namespace Tango.FSE.Publisher.UI
         private String _buildFolder;
 
 #if TS
-        private const String APP_EXE_NAME = "Tango.TwineStudio.UI.exe";
+        private const String APP_EXE_NAME = "Tango.TwineRSM.UI.exe";
 #else
         private const String APP_EXE_NAME = "Tango.FSE.UI.exe";
 #endif
@@ -114,7 +114,7 @@ namespace Tango.FSE.Publisher.UI
             get
             {
 #if TS
-                return BuildVariants.TwineStudio;
+                return BuildVariants.TwineRSM;
 #else
                 return BuildVariants.FSE;
 #endif
@@ -187,7 +187,7 @@ namespace Tango.FSE.Publisher.UI
         {
             UpdateProgress("Searching build path...");
 
-            String path = Path.GetFullPath($@"../../../../Build\{(BuildVariant == BuildVariants.FSE ? "FSE" : "Twine Studio")}\{BuildConfig}");
+            String path = Path.GetFullPath($@"../../../../Build\{(BuildVariant == BuildVariants.FSE ? "FSE" : "Twine RSM")}\{BuildConfig}");
             if (!Directory.Exists(path))
             {
                 ShowError($"Could not locate {BuildVariant} build folder at '{path}'.");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
index 401c2ab71..9793e3c76 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
@@ -12,9 +12,9 @@ namespace Tango.FSE.UI.Build
         public BuildVariants CurrentBuild { get; private set; }
         public string BuildName { get; private set; }
 
-        public bool IsTwineStudio
+        public bool IsTwineRSM
         {
-            get { return CurrentBuild == BuildVariants.TwineStudio; }
+            get { return CurrentBuild == BuildVariants.TwineRSM; }
         }
 
         public DefaultBuildProvider()
@@ -22,8 +22,8 @@ namespace Tango.FSE.UI.Build
             BuildName = "Tango FSE";
 
 #if TS
-            CurrentBuild = BuildVariants.TwineStudio;
-            BuildName = "Twine Studio";
+            CurrentBuild = BuildVariants.TwineRSM;
+            BuildName = "Twine RSM";
 #endif
         }
     }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
index 98a250875..b4b70cffd 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
@@ -47,7 +47,7 @@
                             </ListBox>
                         </DockPanel>
                     </Grid>
-                    <Grid Margin="0 10 0 0" Grid.Row="1" Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                    <Grid Margin="0 10 0 0" Grid.Row="1" Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <DockPanel>
                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines on the local serial ports..."></TextBlock>
                             <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
@@ -70,13 +70,13 @@
                             </ListBox>
                         </DockPanel>
                     </Grid>
-                    <GridSplitter Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="2" />
+                    <GridSplitter Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityInverseConverter}}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="2" />
                     <Grid>
                         <Grid.Style>
                             <Style TargetType="Grid">
                                 <Setter Property="Grid.Row" Value="3"></Setter>
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding BuildProvider.IsTwineStudio}" Value="True">
+                                    <DataTrigger Binding="{Binding BuildProvider.IsTwineRSM}" Value="True">
                                         <Setter Property="Grid.Row" Value="1"></Setter>
                                         <Setter Property="Grid.RowSpan" Value="5"></Setter>
                                     </DataTrigger>
@@ -108,8 +108,8 @@
                             </ListBox>
                         </DockPanel>
                     </Grid>
-                    <GridSplitter Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="4" />
-                    <Grid Grid.Row="5" Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                    <GridSplitter Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityInverseConverter}}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="4" />
+                    <Grid Grid.Row="5" Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <DockPanel>
                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines across the internet..."></TextBlock>
                             <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs
index b48b6254d..32553fe0f 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs
@@ -187,7 +187,7 @@ namespace Tango.FSE.UI.Panes
                 }
                 catch { }
 
-                if (machine is ExternalBridgeUsbClient && !BuildProvider.IsTwineStudio)
+                if (machine is ExternalBridgeUsbClient && !BuildProvider.IsTwineRSM)
                 {
                     if (insert)
                     {
@@ -198,7 +198,7 @@ namespace Tango.FSE.UI.Panes
                         UsbMachines.Add(machine as ExternalBridgeUsbClient);
                     }
                 }
-                else if (machine is ExternalBridgeSignalRClient && !BuildProvider.IsTwineStudio)
+                else if (machine is ExternalBridgeSignalRClient && !BuildProvider.IsTwineRSM)
                 {
                     if (!CurrentUser.PreventRemoteMachineAccess)
                     {
@@ -295,7 +295,7 @@ namespace Tango.FSE.UI.Panes
 
             TryAutoSelectMachine();
 
-            _scanner.SignalRConfiguration.Enabled = Settings.EnableExternalBridgeSignalR && !BuildProvider.IsTwineStudio;
+            _scanner.SignalRConfiguration.Enabled = Settings.EnableExternalBridgeSignalR && !BuildProvider.IsTwineRSM;
             if (ApplicationManager.IsWebDebugMode)
             {
                 LogManager.Log($"Application is in web debug mode. Scanning for SignalR machine on address '{WEB_DEBUG_ADDRESS}'...");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat b/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat
index a9c113561..de7822846 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat
@@ -15,37 +15,37 @@ RD /S /Q "Roslyn\"
 
 del WebRtc.NET.pdb
 
-rem -------------------- Twine Studio -----------------------------------
+rem -------------------- Twine RSM -----------------------------------
 
-del "Tango.TwineStudio.UI.exe"
-del "Tango.TwineStudio.UI.exe.config"
-del "Tango.TwineStudio.UI.pdb"
+del "Tango.TwineRSM.UI.exe"
+del "Tango.TwineRSM.UI.exe.config"
+del "Tango.TwineRSM.UI.pdb"
 
 if %1==TS (
-	goto TwineStudioRelease
-	goto TwineStudio
+	goto TwineRSMRelease
+	goto TwineRSM
 )
 
 if %1==TS_Debug (
-	goto TwineStudio
+	goto TwineRSM
 )
 
 exit
 
-:TwineStudioRelease
-echo Modifying Assembly to "Twine Studio"
-ren "Tango.FSE.UI.exe" "Tango.TwineStudio.UI.exe"
-ren "Tango.FSE.UI.exe.config" "Tango.TwineStudio.UI.exe.config"
-ren "Tango.FSE.UI.pdb" "Tango.TwineStudio.UI.pdb"
+:TwineRSMRelease
+echo Modifying Assembly to "Twine RSM"
+ren "Tango.FSE.UI.exe" "Tango.TwineRSM.UI.exe"
+ren "Tango.FSE.UI.exe.config" "Tango.TwineRSM.UI.exe.config"
+ren "Tango.FSE.UI.pdb" "Tango.TwineRSM.UI.pdb"
 
 rem Modify EXE attributes
-rc "Tango.TwineStudio.UI.exe" --set-version-string "FileDescription" "Twine Studio"
-rc "Tango.TwineStudio.UI.exe" --set-version-string "OriginalFilename" "Tango.TwineStudio.UI.exe"
+rc "Tango.TwineRSM.UI.exe" --set-version-string "FileDescription" "Twine RSM"
+rc "Tango.TwineRSM.UI.exe" --set-version-string "OriginalFilename" "Tango.TwineRSM.UI.exe"
 
 del rc.exe
 
-:TwineStudio
-echo Excluding Assemblies for Twine Studio
+:TwineRSM
+echo Excluding Assemblies for Twine RSM
 
 rem Exclude Modules
 del Tango.FSE.Diagnostics.*
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
index e440a05bb..a42c92c22 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango FSE")]
-[assembly: AssemblyVersion("1.3.5.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
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 12b2ffc5a..a9e4abc33 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
@@ -44,8 +44,8 @@
     <ApplicationIcon>machine_full.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
-    <AssemblyTitle>Twine Studio</AssemblyTitle>
+    <OutputPath>..\..\Build\Twine RSM\Release\</OutputPath>
+    <AssemblyTitle>Twine RSM</AssemblyTitle>
     <DefineConstants>TRACE;TS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -56,7 +56,7 @@
     <ApplicationIcon>twine_studio_small.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;TS</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -64,7 +64,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
-    <AssemblyTitle>Twine Studio</AssemblyTitle>
+    <AssemblyTitle>Twine RSM</AssemblyTitle>
     <ApplicationIcon>twine_studio_small.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
index 390b892cc..a69facafe 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
@@ -148,8 +148,8 @@
                                     </StackPanel>
 
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 5 0">
-                                        <commonControls:IconButton Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}" Command="{Binding ReportIssueCommand}" ToolTip="Report Issue" ToolTipService.Placement="Top" Icon="Bugfood" Foreground="{StaticResource FSE_ErrorBrush}" Height="26" Cursor="Hand" Margin="0 -2 0 0" VerticalAlignment="Center"></commonControls:IconButton>
-                                        <Grid Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <commonControls:IconButton Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityInverseConverter}}" Command="{Binding ReportIssueCommand}" ToolTip="Report Issue" ToolTipService.Placement="Top" Icon="Bugfood" Foreground="{StaticResource FSE_ErrorBrush}" Height="26" Cursor="Hand" Margin="0 -2 0 0" VerticalAlignment="Center"></commonControls:IconButton>
+                                        <Grid Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=logsPane,Path=(win:WindowsManagerHelper.IsDetached),Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                 <Rectangle Width="1" HorizontalAlignment="Center" Stroke="{StaticResource FSE_BorderBrush}" Margin="10 4"></Rectangle>
                                                 <commonControls:ToggleIconButton x:Name="chkLogsViewer" Cursor="Hand" FontSize="{StaticResource FSE_SmallerFontSize}" Margin="5 0 0 0" UncheckedText="Open Log Viewer" CheckedText="Close Log Viewer" TextAlignment="Left" Height="24" Width="Auto" Checked="OnLogsChecked" Unchecked="OnLogsUnChecked" VerticalAlignment="Center" IsChecked="{Binding IsLogsOpened}" CheckedIcon="ChevronDoubleDown" UncheckedIcon="ChevronDoubleUp" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
index dd3428091..5b5342e41 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
@@ -11,7 +11,7 @@ namespace Tango.FSE.Web.Messages
     {
         [Description("Tango FSE")]
         FSE,
-        [Description("Twine Studio")]
-        TwineStudio
+        [Description("Twine RSM")]
+        TwineRSM
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
index f1b44f747..1da2ea638 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
@@ -31,7 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -40,7 +40,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
-    <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
+    <OutputPath>..\..\Build\Twine RSM\Release\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>