From 8f9ea2d4772222ae01413874bbea2df985689742 Mon Sep 17 00:00:00 2001
From: Claire Kuang <kuang.claire@gmail.com>
Date: Wed, 28 Feb 2024 14:00:35 +0000
Subject: [PATCH] feat(DUI2): Cnx 9068 update dui2 to use new fe2 terminology
 (#3200)

* updates all user-facing terminology to use FE2 conditionally on fe2 button or account

* changes config fe2 default to true, and uses config first for activity and streams

* sets useFE2 to true for stored configs

* removes all terminology switching code

* removes config fe2 setting and fe2 prop in some view models

* removes unnecessary string interpolations
---
 DesktopUI2/DesktopUI2/Models/ConfigManager.cs | 11 ++--
 DesktopUI2/DesktopUI2/Styles/Button.xaml      | 11 ++--
 DesktopUI2/DesktopUI2/Styles/Playground.xaml  |  4 +-
 .../ViewModels/ActivityViewModel.cs           |  2 +-
 .../DesktopUI2/ViewModels/DialogViewModel.cs  | 13 +----
 .../DesktopUI2/ViewModels/HomeViewModel.cs    | 48 ++++------------
 .../MappingTool/MappingsViewModel.cs          | 10 ++--
 .../ViewModels/OneClickViewModel.cs           |  4 +-
 .../DesktopUI2/ViewModels/StreamViewModel.cs  | 18 ++----
 .../Views/Controls/SavedStreams.xaml          | 13 ++---
 .../Controls/StreamEditControls/Comments.xaml |  3 +-
 .../Controls/StreamEditControls/Receive.xaml  | 14 ++---
 .../Controls/StreamEditControls/Send.xaml     |  8 +--
 .../Views/Controls/StreamSelector.xaml        |  8 +--
 .../Views/Converters/Fe2TextValueConverter.cs | 30 ----------
 .../DesktopUI2/Views/MappingsControl.xaml     | 16 +++---
 .../DesktopUI2/Views/Pages/HomeView.xaml      | 57 +++----------------
 DesktopUI2/DesktopUI2/Views/Scheduler.xaml    | 12 ++--
 .../Windows/Dialogs/AddFromUrlDialog.xaml     | 10 +---
 .../Windows/Dialogs/NewBranchDialog.xaml      |  4 +-
 .../Windows/Dialogs/NewStreamDialog.xaml      |  7 +--
 21 files changed, 83 insertions(+), 220 deletions(-)
 delete mode 100644 DesktopUI2/DesktopUI2/Views/Converters/Fe2TextValueConverter.cs

diff --git a/DesktopUI2/DesktopUI2/Models/ConfigManager.cs b/DesktopUI2/DesktopUI2/Models/ConfigManager.cs
index e606549027..115219640f 100644
--- a/DesktopUI2/DesktopUI2/Models/ConfigManager.cs
+++ b/DesktopUI2/DesktopUI2/Models/ConfigManager.cs
@@ -25,12 +25,11 @@ public static Config Load()
       var oldConfig = ConfigStorage.GetObject("config");
       var newConfig = ConfigStorage.GetObject("configDUI");
 
-      if (!string.IsNullOrEmpty(newConfig))
-      {
-        return JsonConvert.DeserializeObject<Config>(newConfig);
-      }
+      Config deserializedConfig = !string.IsNullOrWhiteSpace(newConfig)
+        ? JsonConvert.DeserializeObject<Config>(newConfig)
+        : JsonConvert.DeserializeObject<Config>(oldConfig);
 
-      return JsonConvert.DeserializeObject<Config>(oldConfig);
+      return deserializedConfig;
     }
     catch (Exception e) { }
     return new Config();
@@ -45,5 +44,5 @@ public class Config
   public bool DarkTheme { set; get; }
   public bool OneClickMode { set; get; } = true;
   public bool ShowImportExportAlert { set; get; } = true;
-  public bool UseFe2 { set; get; } = false;
+  public bool UseFe2 { set; get; }
 }
diff --git a/DesktopUI2/DesktopUI2/Styles/Button.xaml b/DesktopUI2/DesktopUI2/Styles/Button.xaml
index 9a14d3b731..53e1b67a5d 100644
--- a/DesktopUI2/DesktopUI2/Styles/Button.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/Button.xaml
@@ -65,9 +65,6 @@
 
   <Style Selector="Button.Send">
 
-    <Style.Resources>
-      <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
-    </Style.Resources>
     <Setter Property="Template">
       <ControlTemplate>
         <Grid Margin="4">
@@ -76,7 +73,7 @@
             Command="{Binding SendCommand, FallbackValue={x:Null}}"
             IsDefault="True"
             IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
-            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Send to this stream'}">
+            ToolTip.Tip="Send to this project">
             <Button.Content>
               <icons:MaterialIcon
                 Name="send"
@@ -140,7 +137,7 @@
             CornerRadius="40"
             IsDefault="True"
             IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
-            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Send to this stream'}">
+            ToolTip.Tip="Send to this project">
             <Button.Content>
               <StackPanel Orientation="Horizontal" Spacing="12">
 
@@ -233,7 +230,7 @@
             Command="{Binding ReceiveCommand}"
             IsDefault="True"
             IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}}"
-            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Receive from this stream'}">
+            ToolTip.Tip="Receive from this project">
             <Button.Content>
               <icons:MaterialIcon
                 Name="receive"
@@ -301,7 +298,7 @@
             CornerRadius="40"
             IsDefault="True"
             IsEnabled="{Binding Progress.IsProgressing, Converter={x:Static BoolConverters.Not}, FallbackValue=True}"
-            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Receive from this stream'}">
+            ToolTip.Tip="Receive from this project">
             <Button.Content>
               <StackPanel Orientation="Horizontal" Spacing="12">
 
diff --git a/DesktopUI2/DesktopUI2/Styles/Playground.xaml b/DesktopUI2/DesktopUI2/Styles/Playground.xaml
index d6826e208b..478cac8cb6 100644
--- a/DesktopUI2/DesktopUI2/Styles/Playground.xaml
+++ b/DesktopUI2/DesktopUI2/Styles/Playground.xaml
@@ -20,7 +20,7 @@
             <TextBlock
               Margin="0,0,0,5"
               Classes="Medium"
-              Text="Sample stream"
+              Text="Sample project"
               TextTrimming="CharacterEllipsis" />
             <!--  SENDER  -->
             <Grid Grid.Row="1" ColumnDefinitions="auto,auto,auto,*">
@@ -101,7 +101,7 @@
               Margin="0,8,0,0"
               Classes="Small"
               Foreground="Gray"
-              Watermark="Commit message" />
+              Watermark="Version message" />
             <m:ColorZone
               Margin="0,10,0,0"
               CornerRadius="25"
diff --git a/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs
index 20a9252752..b671d2ee1d 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/ActivityViewModel.cs
@@ -31,7 +31,7 @@ public ActivityViewModel(ActivityItem item, Client client)
         Margin = new Thickness(10, 10, 10, 0);
         Icon = "Pencil";
         Align = HorizontalAlignment.Center;
-        Message = $"created this stream • {Formatting.TimeAgo(item.time)}";
+        Message = $"created this project • {Formatting.TimeAgo(item.time)}";
         break;
     }
 
diff --git a/DesktopUI2/DesktopUI2/ViewModels/DialogViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/DialogViewModel.cs
index 7c9007d6ba..3621f691ee 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/DialogViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/DialogViewModel.cs
@@ -3,15 +3,4 @@
 
 namespace DesktopUI2.ViewModels;
 
-public class DialogViewModel : ReactiveObject
-{
-  //UI Binding
-  public bool UseFe2
-  {
-    get
-    {
-      var config = ConfigManager.Load();
-      return config.UseFe2;
-    }
-  }
-}
+public class DialogViewModel : ReactiveObject { }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
index 547d10041c..4e6169fb8f 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
@@ -239,7 +239,7 @@ private async Task GetStreams()
               MainUserControl.NotificationManager.Show(
                 new PopUpNotificationViewModel
                 {
-                  Title = "⚠️ Could not get streams",
+                  Title = "⚠️ Could not get projects",
                   Message =
                     $"With account {account.Account.userInfo.email} on server {account.Account.serverInfo.url}\n\n",
                   Type = NotificationType.Error
@@ -420,7 +420,7 @@ private void Client_OnUserStreamAdded(object sender, StreamInfo e)
       MainUserControl.NotificationManager.Show(
         new PopUpNotificationViewModel
         {
-          Title = "🥳 You have a new Stream!",
+          Title = "🥳 You have a new project!",
           Message = e.sharedBy == null ? $"You have created '{e.name}'." : $"'{e.name}' has been shared with you."
         }
       );
@@ -460,7 +460,7 @@ private void Client_OnUserStreamRemoved(object sender, StreamInfo e)
       MainUserControl.NotificationManager.Show(
         new PopUpNotificationViewModel
         {
-          Title = "❌ Stream removed!",
+          Title = "❌ Project removed!",
           Message = $"'{streamName}' has been deleted or un-shared."
         }
       );
@@ -535,7 +535,7 @@ private void GenerateMenuItems()
         new MenuItemViewModel(LaunchManagerCommand, "Manage accounts in Manager", MaterialIconKind.AccountCog)
       );
 
-      menu.Items.Add(new MenuItemViewModel(RefreshCommand, "Refresh streams & accounts", MaterialIconKind.Refresh));
+      menu.Items.Add(new MenuItemViewModel(RefreshCommand, "Refresh projects & accounts", MaterialIconKind.Refresh));
       menu.Items.Add(
         new MenuItemViewModel(ToggleDarkThemeCommand, "Toggle dark/light theme", MaterialIconKind.SunMoonStars)
       );
@@ -760,7 +760,7 @@ private Tuple<bool, string> ValidateUrl(string url)
     }
     catch
     {
-      return new Tuple<bool, string>(false, "URL is not a Stream.");
+      return new Tuple<bool, string>(false, "URL is not a project.");
     }
 
     return new Tuple<bool, string>(true, "");
@@ -770,7 +770,7 @@ private Tuple<bool, string> ValidateName(string name)
   {
     if (string.IsNullOrEmpty(name))
     {
-      return new Tuple<bool, string>(false, "Streams need a name too!");
+      return new Tuple<bool, string>(false, "Projects need a name too!");
     }
 
     if (name.Trim().Length < 3)
@@ -801,8 +801,8 @@ private async void OpenStreamCommand(object streamAccountWrapper)
       if (!await streamState.Client.IsStreamAccessible(streamState.StreamId).ConfigureAwait(true))
       {
         Dialogs.ShowDialog(
-          "Stream not found",
-          "Please ensure the stream exists and that you have access to it.",
+          "Project not found",
+          "Please ensure the project exists and that you have access to it.",
           DialogIconKind.Error
         );
         return;
@@ -829,8 +829,8 @@ private async void OpenSavedStreamCommand(object streamViewModel)
         if (!await svm.Client.IsStreamAccessible(svm.Stream.id).ConfigureAwait(true))
         {
           Dialogs.ShowDialog(
-            "Stream not found",
-            "Please ensure the stream exists and that you have access to it.",
+            "Project not found",
+            "Please ensure the project exists and that you have access to it.",
             DialogIconKind.Error
           );
           return;
@@ -861,17 +861,6 @@ public void ToggleDarkThemeCommand()
     ConfigManager.Save(config);
   }
 
-  public void ToggleFe2Command()
-  {
-    Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object> { { "name", "Toggle Fe2" } });
-
-    var config = ConfigManager.Load();
-    config.UseFe2 = !config.UseFe2;
-    ConfigManager.Save(config);
-
-    this.RaisePropertyChanged(nameof(UseFe2));
-  }
-
   public void RefreshCommand()
   {
     Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary<string, object> { { "name", "Refresh" } });
@@ -1014,28 +1003,13 @@ public List<StreamAccountWrapper> FilteredStreams
   public bool HasSavedStreams => SavedStreams != null && SavedStreams.Any();
   public bool HasStreams => FilteredStreams != null && FilteredStreams.Any();
 
-  //UI Binding
-  public bool UseFe2
-  {
-    get
-    {
-      var config = ConfigManager.Load();
-      return config.UseFe2;
-    }
-  }
-
   public string StreamsText
   {
     get
     {
       if (string.IsNullOrEmpty(SearchQuery))
       {
-        if (UseFe2)
-        {
-          return "ALL YOUR PROJECTS:";
-        }
-
-        return "ALL YOUR STREAMS:";
+        return "ALL YOUR PROJECTS:";
       }
 
       if (SearchQuery.Length <= 2)
diff --git a/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs
index 4c3372ddad..f0e309d50b 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/MappingTool/MappingsViewModel.cs
@@ -178,11 +178,11 @@ private void UpdateSelection(MappingSelectionInfo info)
       }
       else if (!AvailableRevitTypes.Any())
       {
-        PromptMsg = "The selected branch does not contain any Revit types, try changing mapping data source.";
+        PromptMsg = "The selected model does not contain any Revit types, try changing mapping data source.";
       }
       else if (!AvailableRevitLevels.Any())
       {
-        PromptMsg = "The selected branch does not contain any Revit levels, try changing mapping data source.";
+        PromptMsg = "The selected model does not contain any Revit levels, try changing mapping data source.";
       }
       else
       {
@@ -244,7 +244,7 @@ private async Task<Base> GetCommit()
     if (commit == null)
     {
       throw new Exception(
-        $"Branch {StreamSelector.SelectedBranch.name} in stream {StreamSelector.SelectedStream.Stream.id} has no commits"
+        $"Model {StreamSelector.SelectedBranch.name} in project {StreamSelector.SelectedStream.Stream.id} has no versions"
       );
     }
 
@@ -293,7 +293,7 @@ private void GetTypesAndLevels(Base model)
         () =>
           Dialogs.ShowMapperDialog(
             "No types available",
-            "The selected stream does not contain any Revit types.\nMake sure to send Project Information > Families & Types from Revit\nusing the latest version of the connector.\n\n👉 And no worries, you can keep using Speckle Mapper with default types!",
+            "The selected project does not contain any Revit types.\nMake sure to send Project Information > Families & Types from Revit\nusing the latest version of the connector.\n\n👉 And no worries, you can keep using Speckle Mapper with default types!",
             Material.Dialog.Icons.DialogIconKind.Info
           )
       );
@@ -314,7 +314,7 @@ private void GetTypesAndLevels(Base model)
         () =>
           Dialogs.ShowMapperDialog(
             "No levels available",
-            "The selected stream does not contain any Revit levels.\nMake sure to send Project Information > Levels from Revit\nusing the latest version of the connector.",
+            "The selected project does not contain any Revit levels.\nMake sure to send Project Information > Levels from Revit\nusing the latest version of the connector.",
             Material.Dialog.Icons.DialogIconKind.Info
           )
       );
diff --git a/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs
index 35a8a622d9..b1f2865823 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/OneClickViewModel.cs
@@ -25,7 +25,7 @@ public OneClickViewModel(IScreen screen)
     }
     catch (Exception ex)
     {
-      SpeckleLog.Logger.Fatal(ex, "Could not initialize one click screen {excep tionMessage}", ex.Message);
+      SpeckleLog.Logger.Fatal(ex, "Could not initialize one click screen {exceptionMessage}", ex.Message);
     }
   }
 
@@ -186,7 +186,7 @@ private async Task<StreamState> GetOrCreateStreamState()
       .StreamCreate(
         new StreamCreateInput
         {
-          description = "Autogenerated Stream for QuickSend",
+          description = "Autogenerated project for QuickSend",
           name = _fileName,
           isPublic = false
         }
diff --git a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
index 4c651126e0..87fd03799d 100644
--- a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
+++ b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
@@ -493,7 +493,7 @@ private async Task GetCommits()
           new Commit
           {
             id = ConnectorHelpers.LatestCommitString,
-            message = "Always receive the latest commit sent to this branch."
+            message = "Always receive the latest version sent to this model."
           }
         );
         Commits = branch.commits.items;
@@ -653,12 +653,6 @@ public string LastUsed
     }
   }
 
-  //UI Binding
-  public bool UseFe2
-  {
-    get { return Client.Account.serverInfo.frontend2; }
-  }
-
   public DateTime? LastUsedTime
   {
     get => StreamState.LastUsed;
@@ -814,7 +808,7 @@ public List<BranchViewModel> BranchesViewModel
 
       if (!IsReceiver)
       {
-        _branchesViewModel.Add(new BranchViewModel(new Branch { name = "Add New Branch" }, "Plus"));
+        _branchesViewModel.Add(new BranchViewModel(new Branch { name = "Add New Model" }, "Plus"));
       }
 
       return _branchesViewModel;
@@ -1233,7 +1227,7 @@ private async void Client_OnCommitCreated(object sender, CommitInfo info)
           new PopUpNotificationViewModel
           {
             Title = $"🆕 {authorName} sent to {Stream.name}/{info.branchName}'",
-            Message = openOnline ? "Click to view it online" : "Click open the stream",
+            Message = openOnline ? "Click to view it online" : "Click open the project",
             OnClick = () =>
             {
               //if in stream edit open online
@@ -1672,7 +1666,7 @@ public static void HandleCommandException(
         notificationViewModel = new PopUpNotificationViewModel
         {
           Title = $"😞 {commandPrettyName} Failed!",
-          Message = $"Failed to fetch stream data from server. Reason: {ex.Message}",
+          Message = $"Failed to fetch project data from server. Reason: {ex.Message}",
           Type = NotificationType.Error
         };
         break;
@@ -1773,8 +1767,8 @@ private void SaveCommand()
       MainUserControl.NotificationManager.Show(
         new PopUpNotificationViewModel
         {
-          Title = "💾 Stream Saved",
-          Message = "This stream has been saved to this file",
+          Title = "💾 Project Saved",
+          Message = "This project has been saved to this file",
           Type = NotificationType.Success
         }
       );
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml b/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml
index 51a001130c..c82647958e 100644
--- a/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/SavedStreams.xaml
@@ -18,7 +18,6 @@
   </Design.DataContext>
   <UserControl.Resources>
     <conv:OpacityValueConverter x:Key="OpacityValueConverter" />
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
   </UserControl.Resources>
 
   <ItemsRepeater Background="Transparent" Items="{Binding SavedStreams}">
@@ -94,13 +93,13 @@
                       Classes="StreamCard"
                       IsVisible="{Binding Stream.favoritedDate, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                       Kind="Heart"
-                      ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='This is a favorite stream'}" />
+                      ToolTip.Tip="This is a favorite project" />
                     <icons:MaterialIcon
                       Grid.Column="1"
                       Classes="StreamCard"
                       IsVisible="{Binding StreamState.SchedulerEnabled}"
                       Kind="ClockCheck"
-                      ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Scheduler is enabled on this stream'}" />
+                      ToolTip.Tip="Scheduler is enabled on this project" />
                     <icons:MaterialIcon
                       Grid.Column="2"
                       Margin="0,0,5,0"
@@ -144,14 +143,14 @@
                       Classes="StreamCard"
                       IsVisible="{Binding Stream.favoritedDate, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                       Kind="Heart"
-                      ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='This is a favorite stream'}" />
+                      ToolTip.Tip="This is a favorite project" />
                     <icons:MaterialIcon
                       Grid.Column="1"
                       VerticalAlignment="Center"
                       Classes="StreamCard"
                       IsVisible="{Binding StreamState.AutoReceive}"
                       Kind="CallReceived"
-                      ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Auto Receive is ON for this stream'}" />
+                      ToolTip.Tip="Auto Receive is ON for this project" />
                     <icons:MaterialIcon
                       Grid.Column="2"
                       Margin="0,0,2,0"
@@ -226,7 +225,7 @@
                     Classes="Mini"
                     Command="{Binding AskRemoveSavedStreamCommand}"
                     IsEnabled="{Binding !Progress.IsProgressing}"
-                    ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Remove this stream'}">
+                    ToolTip.Tip="Remove this project">
                     <Button.Content>
                       <icons:MaterialIcon
                         Width="15"
@@ -259,7 +258,7 @@
               Command="{Binding AskRemoveSavedStreamCommand}"
               IsEnabled="{Binding !IsRemovingStream}"
               IsVisible="{Binding NoAccess}"
-              ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Remove this stream'}">
+              ToolTip.Tip="Remove this project">
               <Button.Content>
                 <icons:MaterialIcon
                   Width="15"
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml
index 791dd95c21..87c948ef5a 100644
--- a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Comments.xaml
@@ -18,7 +18,6 @@
     <conv:RoleCanSendValueConverter x:Key="RoleCanSendValueConverter" />
     <conv:RoleValueConverter x:Key="RoleValueConverter" />
     <conv:StringOpacityValueConverter x:Key="StringOpacityValueConverter" />
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
   </UserControl.Resources>
   <ScrollViewer Name="activityScroller">
     <Grid RowDefinitions="*,auto">
@@ -27,7 +26,7 @@
         IsVisible="{Binding !Comments.Count}"
         Orientation="Vertical"
         Spacing="20">
-        <TextBlock Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='💬 There are no comments yet on this Stream!'}" TextWrapping="Wrap" />
+        <TextBlock Text="💬 There are no comments yet on this project!" TextWrapping="Wrap" />
         <Button
           Classes="Flat"
           Command="{Binding ViewOnlineSavedStreamCommand}"
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml
index 6ec533460f..ddec6afad6 100644
--- a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Receive.xaml
@@ -4,7 +4,6 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
-  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
@@ -12,9 +11,6 @@
   d:DesignHeight="650"
   d:DesignWidth="400"
   mc:Ignorable="d">
-  <UserControl.Resources>
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
-  </UserControl.Resources>
   <UserControl.Styles>
     <Style Selector="icons|MaterialIcon#receive">
       <Setter Property="RenderTransform" Value="rotate(30deg) scaleX(-1)" />
@@ -35,7 +31,7 @@
         VerticalAlignment="Center"
         Classes="SpeckleFont"
         FontWeight="Bold"
-        Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Branch:'}" />
+        Text="Model:" />
 
       <!--<icons:MaterialIcon
         Margin="0"
@@ -49,7 +45,7 @@
         HorizontalAlignment="Stretch"
         VerticalAlignment="Center"
         Items="{Binding BranchesViewModel}"
-        PlaceholderText="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Select a branch'}"
+        PlaceholderText="Select a model"
         SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
         <ComboBox.ItemsPanel />
         <ComboBox.ItemTemplate>
@@ -95,7 +91,7 @@
             VerticalAlignment="Center"
             Foreground="Gray"
             Kind="InfoCircle"
-            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='A commit is a snapshot in time&#x0a;of a branch.&#x0a;Every time you send to a Speckle branch from a connector,&#x0a;a commit is created.'}" />
+            ToolTip.Tip="A version is a snapshot in time&#x0a;of a model.&#x0a;Every time you send to a Speckle model from a connector,&#x0a;a version is created." />
           <ComboBox
             Grid.Column="3"
             Margin="5,10,0,10"
@@ -152,7 +148,7 @@
             VerticalAlignment="Center"
             Foreground="Gray"
             Kind="InfoCircle"
-            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Automatically receive&#x0a;when this branch is updated.&#x0a;NOTE: use with caution!'}" />
+            ToolTip.Tip="Automatically receive&#x0a;when this model is updated.&#x0a;NOTE: use with caution!" />
           <ToggleSwitch
             Grid.Row="1"
             Grid.Column="1"
@@ -199,7 +195,7 @@
       <StackPanel>
         <TextBlock
           IsVisible="{Binding !Commits.Count}"
-          Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='This branch has no commits. Commits are generated what data is sent to a Branch in a Stream.&#x0a;&#x0a;Please select a different Branch or Stream.'}"
+          Text="This model has no versions. Versions are generated what data is sent to a model in a project.&#x0a;&#x0a;Please select a different model or project."
           TextWrapping="Wrap" />
         <!--  360 preview and hide logic in Receive.xaml.cs  -->
         <Grid IsVisible="{Binding Commits.Count}">
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml
index 7e90782606..bb7de91c5f 100644
--- a/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamEditControls/Send.xaml
@@ -4,7 +4,6 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
   xmlns:c="clr-namespace:DesktopUI2.Views.Controls"
-  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:icons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:m="clr-namespace:Material.Styles;assembly=Material.Styles"
@@ -12,9 +11,6 @@
   d:DesignHeight="450"
   d:DesignWidth="400"
   mc:Ignorable="d">
-  <UserControl.Resources>
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
-  </UserControl.Resources>
   <UserControl.Styles>
     <Style Selector="icons|MaterialIcon#send">
       <Setter Property="RenderTransform" Value="rotate(-30deg)" />
@@ -33,14 +29,14 @@
         VerticalAlignment="Center"
         Classes="SpeckleFont"
         FontWeight="Bold"
-        Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Branch:'}" />
+        Text="Model:" />
       <ComboBox
         Grid.Column="1"
         Margin="5,10,5,10"
         HorizontalAlignment="Stretch"
         VerticalAlignment="Center"
         Items="{Binding BranchesViewModel}"
-        PlaceholderText="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Select a branch'}"
+        PlaceholderText="Select a model"
         SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
         <ComboBox.ItemsPanel />
         <ComboBox.ItemTemplate>
diff --git a/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml b/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml
index 16e84dea7f..f2223e5eeb 100644
--- a/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Controls/StreamSelector.xaml
@@ -35,7 +35,7 @@
           Grid.Row="1"
           Margin="15"
           Foreground="Gray"
-          Text="Select a stream and branch coming from Revit with the Mapping Data"
+          Text="Select a project and model coming from Revit with the Mapping Data"
           TextWrapping="Wrap" />
 
         <Expander
@@ -63,7 +63,7 @@
                   Name="SearchBox"
                   Margin="0"
                   Padding="0"
-                  assists:TextFieldAssist.Label="Stream"
+                  assists:TextFieldAssist.Label="Project"
                   Text="{Binding SearchQuery}"
                   UseFloatingWatermark="True">
                   <TextBox.InnerRightContent>
@@ -121,10 +121,10 @@
             <ComboBox
               HorizontalAlignment="Stretch"
               VerticalAlignment="Center"
-              assists:ComboBoxAssist.Label="Branch"
+              assists:ComboBoxAssist.Label="Model"
               Classes="Outline"
               Items="{Binding Branches}"
-              PlaceholderText="Branch"
+              PlaceholderText="Model"
               SelectedItem="{Binding SelectedBranch, Mode=TwoWay}">
               <ComboBox.ItemTemplate>
                 <DataTemplate>
diff --git a/DesktopUI2/DesktopUI2/Views/Converters/Fe2TextValueConverter.cs b/DesktopUI2/DesktopUI2/Views/Converters/Fe2TextValueConverter.cs
deleted file mode 100644
index 34d02d4494..0000000000
--- a/DesktopUI2/DesktopUI2/Views/Converters/Fe2TextValueConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Data.Converters;
-
-namespace DesktopUI2.Views.Converters;
-
-public class Fe2TextValueConverter : IValueConverter
-{
-  public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-  {
-    var text = (string)parameter;
-    //if usefe2
-    if ((bool)value)
-    {
-      text = text.Replace("stream", "project");
-      text = text.Replace("STREAM", "PROJECT");
-      text = text.Replace("Stream", "Project");
-      text = text.Replace("branch", "model");
-      text = text.Replace("Branch", "Model");
-      text = text.Replace("commit", "version");
-      text = text.Replace("Commit", "Version");
-    }
-    return text;
-  }
-
-  public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-  {
-    throw new NotSupportedException();
-  }
-}
diff --git a/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml b/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml
index 6054bc9214..afee6333ea 100644
--- a/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml
+++ b/DesktopUI2/DesktopUI2/Views/MappingsControl.xaml
@@ -163,7 +163,7 @@
                           VerticalAlignment="Center"
                           Foreground="Gray"
                           Kind="InfoCircle"
-                          ToolTip.Tip="Select a stream coming from Revit with types and levels" />
+                          ToolTip.Tip="Select a project coming from Revit with types and levels" />
                         <TextBlock
                           Margin="5,0"
                           VerticalAlignment="Center"
@@ -185,9 +185,9 @@
                             <TextBlock
                               Classes="SpeckleFont"
                               IsVisible="{Binding SelectedStream, Converter={x:Static ObjectConverters.IsNull}}"
-                              Text="Choose Stream" />
+                              Text="Choose Project" />
                             <StackPanel IsVisible="{Binding SelectedStream, Converter={x:Static ObjectConverters.IsNotNull}}" Orientation="Horizontal">
-                              <TextBlock Classes="SpeckleFont" Text="Stream: " />
+                              <TextBlock Classes="SpeckleFont" Text="Project: " />
                               <TextBlock Classes="SpeckleFont" Text="{Binding SelectedStream.Stream.name}" />
                             </StackPanel>
                           </Grid>
@@ -362,10 +362,10 @@
 
                       <!--  APPLY MAPPINGS  -->
                       <Button
-                                                                                                            Command="{Binding SetMappingsCommand}"
-                                                                                                            Content="Apply Mappings"
-                                                                                                            IsEnabled="{Binding SelectedSchema.IsValid}"
-                                                                                                            ToolTip.Tip="Apply mappings to all the selected elements" />
+                        Command="{Binding SetMappingsCommand}"
+                        Content="Apply Mappings"
+                        IsEnabled="{Binding SelectedSchema.IsValid}"
+                        ToolTip.Tip="Apply mappings to all the selected elements" />
 
 
 
@@ -381,7 +381,7 @@
                         VerticalAlignment="Center"
                         Foreground="Gray"
                         Kind="InfoCircle"
-                        ToolTip.Tip="A commit is a snapshot in time&#x0a;of the data inside a branch.&#x0a;Every time you send to Speckle from a connector,&#x0a;a commit is created." />
+                        ToolTip.Tip="A version is a snapshot in time&#x0a;of the data inside a model.&#x0a;Every time you send to Speckle from a connector,&#x0a;a version is created." />
                       <TextBlock
                         Margin="5,0"
                         VerticalAlignment="Center"
diff --git a/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml
index fc79b30637..f767ff877d 100644
--- a/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Pages/HomeView.xaml
@@ -19,7 +19,6 @@
   </Design.DataContext>
   <UserControl.Resources>
     <conv:EnumBooleanConverter x:Key="EnumBooleanConverter" />
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
   </UserControl.Resources>
   <Grid RowDefinitions="auto, *">
     <!--  HEADER BAR  -->
@@ -68,49 +67,7 @@
           Foreground="White"
           Text="{Binding Version}"
           TextTrimming="CharacterEllipsis" />
-
-
-        <!--<icons:MaterialIcon
-          Grid.Column="4"
-          Width="18"
-          Height="18"
-          Margin="0,0,5,0"
-          assists:ShadowAssist.ShadowDepth="0"
-          Foreground="White"
-          IsVisible="{Binding UseFe2}"
-          Kind="NewBox"
-          ToolTip.Tip="Links are pointing to the NEW frontend" />-->
-
-        <!--  FE2  -->
-        <m:FloatingButton
-          Grid.Column="5"
-          VerticalAlignment="Center"
-          assists:ShadowAssist.ShadowDepth="Depth0"
-          Background="Transparent"
-          Classes="Mini"
-          Command="{Binding ToggleFe2Command}"
-          ToolTip.Tip="Toggle NEW Frontend terminology">
-          <Button.Content>
-            <Grid>
-              <icons:MaterialIcon
-                Width="18"
-                Height="18"
-                assists:ShadowAssist.ShadowDepth="0"
-                Foreground="White"
-                IsVisible="{Binding UseFe2}"
-                Kind="NewBox" />
-              <icons:MaterialIcon
-                Width="18"
-                Height="18"
-                assists:ShadowAssist.ShadowDepth="0"
-                Foreground="White"
-                IsVisible="{Binding !UseFe2}"
-                Kind="NewBox"
-                Opacity="0.5" />
-            </Grid>
-          </Button.Content>
-        </m:FloatingButton>
-
+        
 
         <!--  ACCOUNT MENU  -->
 
@@ -193,7 +150,7 @@
             Padding="0"
             Classes="Solo Small"
             Text="{Binding SearchQuery}"
-            Watermark="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Search streams'}">
+            Watermark="Search projects">
             <TextBox.InnerRightContent>
               <StackPanel Orientation="Horizontal">
                 <m:FloatingButton
@@ -220,7 +177,7 @@
                   Grid.Column="1"
                   Margin="2,0,0,0"
                   VerticalAlignment="Center"
-                  ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Filter streams by ownership or favorite'}">
+                  ToolTip.Tip="Filter projects by ownership or favorite">
 
                   <MenuItem
                     Width="30"
@@ -302,7 +259,7 @@
               Margin="8,0"
               Padding="0"
               VerticalAlignment="Center"
-              Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Create new Stream'}"
+              Text="Create new project"
               TextTrimming="CharacterEllipsis" />
           </Grid>
         </Button>
@@ -346,7 +303,7 @@
                 Classes="Overline"
                 Foreground="Gray"
                 IsVisible="{Binding HasSavedStreams}"
-                Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='SAVED STREAMS:'}" />
+                Text="SAVED PROJECTS:" />
             </Expander.Header>
             <c:SavedStreams />
           </Expander>
@@ -368,7 +325,7 @@
               <TextBlock
                 Margin="15"
                 IsVisible="{Binding HasStreams, Converter={x:Static BoolConverters.Not}, FallbackValue=False}"
-                Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='No streams found 😅&#x0a;&#x0a;You can create a new one or add a public stream by ID or URL.'}"
+                Text="No projects found 😅&#x0a;&#x0a;You can create a new one or add a public project by ID or URL."
                 TextAlignment="Center"
                 TextWrapping="Wrap" />
               <ItemsRepeater
@@ -408,7 +365,7 @@
                             VerticalAlignment="Center"
                             IsVisible="{Binding Stream.favoritedDate, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                             Kind="Heart"
-                            ToolTip.Tip="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='This is a favorite stream'}" />
+                            ToolTip.Tip="This is a favorite project" />
                         </Grid>
                         <Grid
                           Grid.Row="1"
diff --git a/DesktopUI2/DesktopUI2/Views/Scheduler.xaml b/DesktopUI2/DesktopUI2/Views/Scheduler.xaml
index 0dc8b3ca18..321ce90d37 100644
--- a/DesktopUI2/DesktopUI2/Views/Scheduler.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Scheduler.xaml
@@ -46,11 +46,11 @@
         HorizontalContentAlignment="Stretch"
         Classes="Mini">
         <StackPanel>
-          <TextBlock Text="Speckle Scheduler lets you schedule when to automatically send to a stream based on a few triggers." TextWrapping="Wrap" />
+          <TextBlock Text="Speckle Scheduler lets you schedule when to automatically send to a project based on a few triggers." TextWrapping="Wrap" />
           <TextBlock
             Margin="0,15,0,0"
             IsVisible="{Binding HasSavedSenders, Converter={x:Static BoolConverters.Not}}"
-            Text="⚠ Please save a Sender Stream form the main Connector UI to continue."
+            Text="⚠ Please save a Sender Project form the main Connector UI to continue."
             TextWrapping="Wrap" />
         </StackPanel>
       </m:Card>
@@ -77,8 +77,8 @@
           VerticalAlignment="Center"
           Foreground="Gray"
           Kind="InfoCircle"
-          ToolTip.Tip="Data in a stream can be organized in branches,&#x0a;for instance, to have multiple design options&#x0a;or to store data by discipline.&#x0a;The default branch is called main." />
-        <TextBlock Text="Stream:" />
+          ToolTip.Tip="Data in a project can be organized in models,&#x0a;for instance, to have multiple design options&#x0a;or to store data by discipline.&#x0a;The default model is called main." />
+        <TextBlock Text="Project:" />
       </StackPanel>
 
       <StackPanel
@@ -90,7 +90,7 @@
           VerticalAlignment="Center"
           Foreground="Gray"
           Kind="InfoCircle"
-          ToolTip.Tip="A commit is a snapshot in time&#x0a;of the data inside a branch.&#x0a;Every time you send to Speckle from a connector,&#x0a;a commit is created." />
+          ToolTip.Tip="A version is a snapshot in time&#x0a;of the data inside a model.&#x0a;Every time you send to Speckle from a connector,&#x0a;a version is created." />
         <TextBlock Text="Trigger:" />
       </StackPanel>
 
@@ -108,7 +108,7 @@
         HorizontalAlignment="Stretch"
         VerticalAlignment="Center"
         Items="{Binding SavedSenders}"
-        PlaceholderText="Select a stream"
+        PlaceholderText="Select a project"
         SelectedItem="{Binding SelectedStream}">
         <ComboBox.ItemTemplate>
           <DataTemplate>
diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddFromUrlDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddFromUrlDialog.xaml
index f0828a3dc9..171c8e9acf 100644
--- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddFromUrlDialog.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/AddFromUrlDialog.xaml
@@ -2,32 +2,28 @@
   x:Class="DesktopUI2.Views.Windows.Dialogs.AddFromUrlDialog"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:conv="clr-namespace:DesktopUI2.Views.Converters"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   mc:Ignorable="d">
-  <UserControl.Resources>
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
-  </UserControl.Resources>
   <Grid RowDefinitions="auto, auto, auto, auto, auto, auto">
     <TextBlock
       Margin="15,15,15,0"
       Classes="Subtitle1"
-      Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Add a Stream by ID or URL'}"
+      Text="Add a project by ID or URL"
       TextTrimming="CharacterEllipsis" />
 
     <TextBlock
       Grid.Row="1"
       Margin="15"
       Foreground="Gray"
-      Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Stream IDs and Stream/Branch/Commit URLs are supported.'}"
+      Text="Project IDs and project/model/version URLs are supported"
       TextWrapping="Wrap" />
 
     <TextBox
       Name="url"
       Grid.Row="2"
       Margin="15,0"
-      Watermark="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Stream URL'}" />
+      Watermark="Project URL" />
 
     <StackPanel
       Grid.Row="5"
diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewBranchDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewBranchDialog.xaml
index ddb4cffe54..2a5a0dc990 100644
--- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewBranchDialog.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewBranchDialog.xaml
@@ -9,14 +9,14 @@
     <TextBlock
       Margin="15,15,15,0"
       Classes="Subtitle1"
-      Text="Create a new Branch"
+      Text="Create a new model"
       TextTrimming="CharacterEllipsis" />
 
     <TextBox
       Grid.Row="1"
       Margin="15,5"
       Text="{Binding BranchName}"
-      Watermark="Branch Name" />
+      Watermark="Model Name" />
 
     <TextBox
       Grid.Row="2"
diff --git a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml
index f0cadb3dbe..771e44b635 100644
--- a/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml
+++ b/DesktopUI2/DesktopUI2/Views/Windows/Dialogs/NewStreamDialog.xaml
@@ -19,14 +19,11 @@
 
 
   </UserControl.Styles>
-  <UserControl.Resources>
-    <conv:Fe2TextValueConverter x:Key="Fe2TextValueConverter" />
-  </UserControl.Resources>
   <Grid RowDefinitions="auto, auto, auto, auto, auto, auto">
     <TextBlock
       Margin="15,15,15,0"
       Classes="Subtitle1"
-      Text="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Create a new Stream'}"
+      Text="Create a new project"
       TextTrimming="CharacterEllipsis" />
     <ComboBox
       Name="accounts"
@@ -66,7 +63,7 @@
       Name="name"
       Grid.Row="2"
       Margin="15,5"
-      Watermark="{Binding UseFe2, Converter={StaticResource Fe2TextValueConverter}, ConverterParameter='Stream Name (optional)'}" />
+      Watermark="Project Name (optional)" />
 
     <TextBox
       Name="description"