diff --git a/src/CalcViewModel/Snapshots.cpp b/src/CalcViewModel/Snapshots.cpp
index 69c082ad..0389afc5 100644
--- a/src/CalcViewModel/Snapshots.cpp
+++ b/src/CalcViewModel/Snapshots.cpp
@@ -121,13 +121,13 @@ namespace CalculatorApp::ViewModel::Snapshot
         }
     }
 
-    CalcManagerHistoryToken::CalcManagerHistoryToken()
+    CalcManagerToken::CalcManagerToken()
     {
         OpCodeName = ref new Platform::String();
         CommandIndex = 0;
     }
 
-    CalcManagerHistoryToken::CalcManagerHistoryToken(Platform::String ^ opCodeName, int cmdIndex)
+    CalcManagerToken::CalcManagerToken(Platform::String ^ opCodeName, int cmdIndex)
     {
         assert(opCodeName != nullptr && "opCodeName is mandatory.");
         OpCodeName = opCodeName;
@@ -136,7 +136,7 @@ namespace CalculatorApp::ViewModel::Snapshot
 
     CalcManagerHistoryItem::CalcManagerHistoryItem()
     {
-        Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>();
+        Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
         Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
         Expression = ref new Platform::String();
         Result = ref new Platform::String();
@@ -144,11 +144,11 @@ namespace CalculatorApp::ViewModel::Snapshot
 
     CalcManagerHistoryItem::CalcManagerHistoryItem(const CalculationManager::HISTORYITEM& item)
     {
-        Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>();
+        Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
         assert(item.historyItemVector.spTokens != nullptr && "spTokens shall not be null.");
         for (auto& [opCode, cmdIdx] : *item.historyItemVector.spTokens)
         {
-            Tokens->Append(ref new CalcManagerHistoryToken(ref new Platform::String(opCode.c_str()), cmdIdx));
+            Tokens->Append(ref new CalcManagerToken(ref new Platform::String(opCode.c_str()), cmdIdx));
         }
         Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
         assert(item.historyItemVector.spCommands != nullptr && "spCommands shall not be null.");
@@ -193,7 +193,7 @@ namespace CalculatorApp::ViewModel::Snapshot
 
     ExpressionDisplaySnapshot::ExpressionDisplaySnapshot()
     {
-        Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>();
+        Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
         Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
     }
 
@@ -201,10 +201,10 @@ namespace CalculatorApp::ViewModel::Snapshot
         const std::vector<CalcHistoryToken>& tokens,
         const std::vector<std::shared_ptr<IExpressionCommand>>& commands)
     {
-        Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>();
+        Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
         for (auto& [opCode, cmdIdx] : tokens)
         {
-            Tokens->Append(ref new CalcManagerHistoryToken(ref new Platform::String(opCode.c_str()), cmdIdx));
+            Tokens->Append(ref new CalcManagerToken(ref new Platform::String(opCode.c_str()), cmdIdx));
         }
 
         Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
@@ -229,7 +229,7 @@ namespace CalculatorApp::ViewModel::Snapshot
         {
             CalculationManager::HISTORYITEMVECTOR nativeItem;
             nativeItem.spTokens = std::make_shared<std::vector<std::pair<std::wstring, int>>>();
-            for (CalcManagerHistoryToken ^ token : item->Tokens)
+            for (CalcManagerToken ^ token : item->Tokens)
             {
                 nativeItem.spTokens->push_back(std::make_pair(token->OpCodeName->Data(), token->CommandIndex));
             }
diff --git a/src/CalcViewModel/Snapshots.h b/src/CalcViewModel/Snapshots.h
index cee12933..65afd4e4 100644
--- a/src/CalcViewModel/Snapshots.h
+++ b/src/CalcViewModel/Snapshots.h
@@ -70,21 +70,21 @@ public
     };
 
 public
-    ref struct CalcManagerHistoryToken sealed
+    ref struct CalcManagerToken sealed
     {
         property Platform::String ^ OpCodeName; // mandatory
         property int CommandIndex;
 
-        CalcManagerHistoryToken();
+        CalcManagerToken();
 
         internal :;
-        explicit CalcManagerHistoryToken(Platform::String ^ opCodeName, int cmdIndex);
+        explicit CalcManagerToken(Platform::String ^ opCodeName, int cmdIndex);
     };
 
 public
     ref struct CalcManagerHistoryItem sealed
     {
-        property Windows::Foundation::Collections::IVector<CalcManagerHistoryToken ^> ^ Tokens;    // mandatory
+        property Windows::Foundation::Collections::IVector<CalcManagerToken ^> ^ Tokens;           // mandatory
         property Windows::Foundation::Collections::IVector<ICalcManagerIExprCommand ^> ^ Commands; // mandatory
         property Platform::String ^ Expression;                                                    // mandatory
         property Platform::String ^ Result;                                                        // mandatory
@@ -121,7 +121,7 @@ public
 public
     ref struct ExpressionDisplaySnapshot sealed
     {
-        property Windows::Foundation::Collections::IVector<CalcManagerHistoryToken ^> ^ Tokens;
+        property Windows::Foundation::Collections::IVector<CalcManagerToken ^> ^ Tokens;
         property Windows::Foundation::Collections::IVector<ICalcManagerIExprCommand ^> ^ Commands;
 
         ExpressionDisplaySnapshot();
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index a1cee93b..0839a9f2 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -1827,7 +1827,7 @@ void CalculatorApp::ViewModel::StandardCalculatorViewModel::Snapshot::set(Calcul
     {
         using RawTokenCollection = std::vector<std::pair<std::wstring, int>>;
         RawTokenCollection rawTokens;
-        for (CalculatorApp::ViewModel::Snapshot::CalcManagerHistoryToken ^ token : snapshot->ExpressionDisplay->Tokens)
+        for (CalculatorApp::ViewModel::Snapshot::CalcManagerToken ^ token : snapshot->ExpressionDisplay->Tokens)
         {
             rawTokens.push_back(std::pair{ token->OpCodeName->Data(), token->CommandIndex });
         }
diff --git a/src/Calculator/Utils/JsonUtils.cs b/src/Calculator/Utils/JsonUtils.cs
index 86fbc953..7d4ffd09 100644
--- a/src/Calculator/Utils/JsonUtils.cs
+++ b/src/Calculator/Utils/JsonUtils.cs
@@ -7,10 +7,10 @@ using Windows.ApplicationModel;
 
 namespace CalculatorApp.JsonUtils
 {
-    internal class CalcManagerHistoryTokenAlias
+    internal class CalcManagerTokenAlias
     {
         [JsonIgnore]
-        public CalcManagerHistoryToken Value;
+        public CalcManagerToken Value;
 
         [JsonPropertyName("t")]
         public string OpCodeName
@@ -25,8 +25,8 @@ namespace CalculatorApp.JsonUtils
             set => Value.CommandIndex = value;
         }
 
-        public CalcManagerHistoryTokenAlias() => Value = new CalcManagerHistoryToken();
-        public CalcManagerHistoryTokenAlias(CalcManagerHistoryToken value) => Value = value;
+        public CalcManagerTokenAlias() => Value = new CalcManagerToken();
+        public CalcManagerTokenAlias(CalcManagerToken value) => Value = value;
     }
 
     [JsonPolymorphic(TypeDiscriminatorPropertyName = "$t")]
@@ -126,9 +126,9 @@ namespace CalculatorApp.JsonUtils
         public CalcManagerHistoryItem Value;
 
         [JsonPropertyName("t")]
-        public IEnumerable<CalcManagerHistoryTokenAlias> Tokens
+        public IEnumerable<CalcManagerTokenAlias> Tokens
         {
-            get => Value.Tokens.Select(x => new CalcManagerHistoryTokenAlias(x));
+            get => Value.Tokens.Select(x => new CalcManagerTokenAlias(x));
             set => Value.Tokens = value.Select(Helpers.MapHistoryToken).ToList();
         }
         [JsonPropertyName("c")]
@@ -204,9 +204,9 @@ namespace CalculatorApp.JsonUtils
         public ExpressionDisplaySnapshot Value;
 
         [JsonPropertyName("t")]
-        public IEnumerable<CalcManagerHistoryTokenAlias> Tokens
+        public IEnumerable<CalcManagerTokenAlias> Tokens
         {
-            get => Value.Tokens.Select(x => new CalcManagerHistoryTokenAlias(x));
+            get => Value.Tokens.Select(x => new CalcManagerTokenAlias(x));
             set => Value.Tokens = value.Select(Helpers.MapHistoryToken).ToList();
         }
         [JsonPropertyName("c")]
@@ -274,9 +274,9 @@ namespace CalculatorApp.JsonUtils
 
     internal static class Helpers
     {
-        public static CalcManagerHistoryToken MapHistoryToken(CalcManagerHistoryTokenAlias token)
+        public static CalcManagerToken MapHistoryToken(CalcManagerTokenAlias token)
         {
-            return new CalcManagerHistoryToken { OpCodeName = token.OpCodeName, CommandIndex = token.CommandIndex };
+            return new CalcManagerToken { OpCodeName = token.OpCodeName, CommandIndex = token.CommandIndex };
         }
 
         public static ICalcManagerIExprCommandAlias MapCommandAlias(ICalcManagerIExprCommand exprCmd)