diff --git a/src/devkit/data/models/AchievementModel.cpp b/src/devkit/data/models/AchievementModel.cpp
index cd58c24ba..65913fa66 100644
--- a/src/devkit/data/models/AchievementModel.cpp
+++ b/src/devkit/data/models/AchievementModel.cpp
@@ -312,7 +312,7 @@ void AchievementModel::SyncIDToRuntime() const
 
 void AchievementModel::SyncTitleToRuntime()
 {
-    m_sTitleBuffer = ra::util::String::Narrow(GetTitle());
+    m_sTitleBuffer = ra::util::String::Narrow(GetName());
     m_pAchievementInfo->public_.title = m_sTitleBuffer.c_str();
 }
 
diff --git a/src/devkit/data/models/AssetModelBase.hh b/src/devkit/data/models/AssetModelBase.hh
index 6b915763c..177c9fe8c 100644
--- a/src/devkit/data/models/AssetModelBase.hh
+++ b/src/devkit/data/models/AssetModelBase.hh
@@ -90,7 +90,7 @@ public:
     /// <summary>
     /// Gets the name to display.
     /// </summary>
-    const std::wstring& GetTitle() const { return GetValue(NameProperty); }
+    const std::wstring& GetName() const { return GetValue(NameProperty); }
 
     /// <summary>
     /// Sets the name to display.
diff --git a/src/devkit/data/models/LeaderboardModel.cpp b/src/devkit/data/models/LeaderboardModel.cpp
index 65a410c2a..daaca8732 100644
--- a/src/devkit/data/models/LeaderboardModel.cpp
+++ b/src/devkit/data/models/LeaderboardModel.cpp
@@ -288,7 +288,7 @@ void LeaderboardModel::SyncIDToRuntime() const
 
 void LeaderboardModel::SyncTitleToRuntime()
 {
-    m_sTitleBuffer = ra::util::String::Narrow(GetTitle());
+    m_sTitleBuffer = ra::util::String::Narrow(GetName());
     m_pLeaderboardInfo->public_.title = m_sTitleBuffer.c_str();
 }
 
diff --git a/src/services/AchievementRuntime.cpp b/src/services/AchievementRuntime.cpp
index 59204b573..91257aec8 100644
--- a/src/services/AchievementRuntime.cpp
+++ b/src/services/AchievementRuntime.cpp
@@ -1570,7 +1570,7 @@ static void HandleServerError(const rc_client_server_error_t& pServerError)
             if (pAchievement != nullptr)
             {
                 vmPopup->SetDescription(
-                    ra::util::String::Printf(L"%s (%u)", pAchievement->GetTitle(), pAchievement->GetPoints()));
+                    ra::util::String::Printf(L"%s (%u)", pAchievement->GetName(), pAchievement->GetPoints()));
                 vmPopup->SetImage(ra::ui::ImageType::Badge, ra::util::String::Narrow(pAchievement->GetBadge()));
             }
             else
@@ -1595,7 +1595,7 @@ static void HandleServerError(const rc_client_server_error_t& pServerError)
         const auto& pGameContext = ra::services::ServiceLocator::Get<ra::data::context::GameContext>();
         const auto* pLeaderboard = pGameContext.Assets().FindLeaderboard(nLeaderboardId);
         std::wstring sLeaderboardName = (pLeaderboard != nullptr) ?
-            pLeaderboard->GetTitle() : ra::util::String::Printf(L"Leaderboard %u", nLeaderboardId);
+            pLeaderboard->GetName() : ra::util::String::Printf(L"Leaderboard %u", nLeaderboardId);
         const auto sErrorMessage = pServerError.error_message ?
             ra::util::String::Widen(pServerError.error_message) : L"Error submitting leaderboard entry";
 
diff --git a/src/services/AchievementRuntimeExports.cpp b/src/services/AchievementRuntimeExports.cpp
index 68ff3f897..3e0e3cd85 100644
--- a/src/services/AchievementRuntimeExports.cpp
+++ b/src/services/AchievementRuntimeExports.cpp
@@ -1086,7 +1086,7 @@ const ra::data::models::AchievementModel* CheckForPauseOnTrigger(const rc_client
         if (vmAchievement->IsPauseOnTrigger())
         {
             auto& pFrameEventQueue = ra::services::ServiceLocator::GetMutable<ra::services::FrameEventQueue>();
-            pFrameEventQueue.QueuePauseOnTrigger(vmAchievement->GetTitle());
+            pFrameEventQueue.QueuePauseOnTrigger(vmAchievement->GetName());
         }
     }
 
diff --git a/src/ui/viewmodels/AssetEditorViewModel.cpp b/src/ui/viewmodels/AssetEditorViewModel.cpp
index 1cc453350..2ca78d869 100644
--- a/src/ui/viewmodels/AssetEditorViewModel.cpp
+++ b/src/ui/viewmodels/AssetEditorViewModel.cpp
@@ -193,7 +193,7 @@ void AssetEditorViewModel::LoadAsset(ra::data::models::AssetModelBase* pAsset, b
     {
         pAsset->AddNotifyTarget(*this);
 
-        SetName(pAsset->GetTitle());
+        SetName(pAsset->GetName());
         SetDescription(pAsset->GetDescription());
         SetState(pAsset->GetState());
         SetCategory(pAsset->GetCategory());
diff --git a/src/ui/viewmodels/AssetListViewModel.cpp b/src/ui/viewmodels/AssetListViewModel.cpp
index 5284cd77a..c4bee03cb 100644
--- a/src/ui/viewmodels/AssetListViewModel.cpp
+++ b/src/ui/viewmodels/AssetListViewModel.cpp
@@ -573,7 +573,7 @@ void AssetListViewModel::AddOrRemoveFilteredItem(gsl::index nAssetIndex)
 
 void AssetListViewModel::SyncAsset(AssetSummaryViewModel& vmSummary, const ra::data::models::AssetModelBase& pAsset)
 {
-    vmSummary.SetLabel(pAsset.GetTitle());
+    vmSummary.SetLabel(pAsset.GetName());
     vmSummary.SetType(pAsset.GetType());
     vmSummary.SetCategory(pAsset.GetCategory());
     vmSummary.SetChanges(pAsset.GetChanges());
@@ -1368,26 +1368,26 @@ void AssetListViewModel::ValidateAchievementForPublish(std::wstring& sError, con
 {
     const std::wstring sTriggerError = ValidateTriggerLogic(pAchievement.GetTrigger());
     if (!sTriggerError.empty())
-        sError.append(ra::util::String::Printf(L"\n* %s: %s", pAchievement.GetTitle(), sTriggerError));
+        sError.append(ra::util::String::Printf(L"\n* %s: %s", pAchievement.GetName(), sTriggerError));
 }
 
 void AssetListViewModel::ValidateLeaderboardForPublish(std::wstring& sError, const ra::data::models::LeaderboardModel& pLeaderboard) const
 {
     std::wstring sTriggerError = ValidateTriggerLogic(pLeaderboard.GetStartTrigger());
     if (!sTriggerError.empty())
-        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Start", sTriggerError));
+        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Start", sTriggerError));
 
     sTriggerError = ValidateTriggerLogic(pLeaderboard.GetSubmitTrigger());
     if (!sTriggerError.empty())
-        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Submit", sTriggerError));
+        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Submit", sTriggerError));
 
     sTriggerError = ValidateTriggerLogic(pLeaderboard.GetCancelTrigger());
     if (!sTriggerError.empty())
-        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Cancel", sTriggerError));
+        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Cancel", sTriggerError));
 
     const std::wstring sValueError = ValidateValueLogic(pLeaderboard.GetValueDefinition());
     if (!sValueError.empty())
-        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetTitle(), L"Value", sValueError));
+        sError.append(ra::util::String::Printf(L"\n* %s: %s: %s", pLeaderboard.GetName(), L"Value", sValueError));
 }
 
 
@@ -1415,13 +1415,13 @@ bool AssetListViewModel::ValidateAssetsForPublish(std::vector<ra::data::models::
             if (pLeaderboard != nullptr)
             {
                 if (pLeaderboard->GetStartTrigger().empty())
-                    sError.append(ra::util::String::Printf(L"\n* %s: No Start condition", pLeaderboard->GetTitle()));
+                    sError.append(ra::util::String::Printf(L"\n* %s: No Start condition", pLeaderboard->GetName()));
                 if (pLeaderboard->GetCancelTrigger().empty())
-                    sError.append(ra::util::String::Printf(L"\n* %s: No Cancel condition", pLeaderboard->GetTitle()));
+                    sError.append(ra::util::String::Printf(L"\n* %s: No Cancel condition", pLeaderboard->GetName()));
                 if (pLeaderboard->GetSubmitTrigger().empty())
-                    sError.append(ra::util::String::Printf(L"\n* %s: No Submit condition", pLeaderboard->GetTitle()));
+                    sError.append(ra::util::String::Printf(L"\n* %s: No Submit condition", pLeaderboard->GetName()));
                 if (pLeaderboard->GetValueDefinition().empty())
-                    sError.append(ra::util::String::Printf(L"\n* %s: No Value definition", pLeaderboard->GetTitle()));
+                    sError.append(ra::util::String::Printf(L"\n* %s: No Value definition", pLeaderboard->GetName()));
 
                 ValidateLeaderboardForPublish(sError, *pLeaderboard);
             }
@@ -1941,7 +1941,7 @@ void AssetListViewModel::CloneSelected()
             pAchievement->CreateServerCheckpoint();
             pAchievement->CreateLocalCheckpoint();
 
-            pAchievement->SetName(pSourceAchievement->GetTitle() + L" (copy)");
+            pAchievement->SetName(pSourceAchievement->GetName() + L" (copy)");
             pAchievement->SetDescription(pSourceAchievement->GetDescription());
             pAchievement->SetBadge(pSourceAchievement->GetBadge());
             pAchievement->SetPoints(pSourceAchievement->GetPoints());
@@ -1967,7 +1967,7 @@ void AssetListViewModel::CloneSelected()
             pLeaderboard->CreateServerCheckpoint();
             pLeaderboard->CreateLocalCheckpoint();
 
-            pLeaderboard->SetName(pSourceLeaderboard->GetTitle() + L" (copy)");
+            pLeaderboard->SetName(pSourceLeaderboard->GetName() + L" (copy)");
             pLeaderboard->SetDescription(pSourceLeaderboard->GetDescription());
             pLeaderboard->SetStartTrigger(pSourceLeaderboard->GetStartTrigger());
             pLeaderboard->SetSubmitTrigger(pSourceLeaderboard->GetSubmitTrigger());
diff --git a/src/ui/viewmodels/AssetUploadViewModel.cpp b/src/ui/viewmodels/AssetUploadViewModel.cpp
index 91cf146f1..65a486f6f 100644
--- a/src/ui/viewmodels/AssetUploadViewModel.cpp
+++ b/src/ui/viewmodels/AssetUploadViewModel.cpp
@@ -262,7 +262,7 @@ void AssetUploadViewModel::UploadAchievement(ra::data::models::AchievementModel&
 
     ra::api::UpdateAchievement::Request request;
     request.GameId = pGameContext.GetGameId(pAchievement.GetSubsetID());
-    request.Title = pAchievement.GetTitle();
+    request.Title = pAchievement.GetName();
     request.Description = pAchievement.GetDescription();
     request.Trigger = pAchievement.GetTrigger();
     request.Points = pAchievement.GetPoints();
@@ -329,7 +329,7 @@ void AssetUploadViewModel::UploadAchievement(ra::data::models::AchievementModel&
             if (response.ErrorMessage == "Invalid state")
             {
                 // generic API failure. Try to guess what went wrong
-                if (pAchievement.GetTitle().empty())
+                if (pAchievement.GetName().empty())
                     pScan.sErrorMessage = "Title is required";
                 else if (pAchievement.GetDescription().empty())
                     pScan.sErrorMessage = "Description is required";
@@ -349,7 +349,7 @@ void AssetUploadViewModel::UploadLeaderboard(ra::data::models::LeaderboardModel&
 
     ra::api::UpdateLeaderboard::Request request;
     request.GameId = pGameContext.GetGameId(pLeaderboard.GetSubsetID());
-    request.Title = pLeaderboard.GetTitle();
+    request.Title = pLeaderboard.GetName();
     request.Description = pLeaderboard.GetDescription();
     request.StartTrigger = pLeaderboard.GetStartTrigger();
     request.SubmitTrigger = pLeaderboard.GetSubmitTrigger();
@@ -393,7 +393,7 @@ void AssetUploadViewModel::UploadLeaderboard(ra::data::models::LeaderboardModel&
             if (response.ErrorMessage == "Invalid state")
             {
                 // generic API failure. Try to guess what went wrong
-                if (pLeaderboard.GetTitle().empty())
+                if (pLeaderboard.GetName().empty())
                     pScan.sErrorMessage = "Title is required";
                 else if (pLeaderboard.GetDescription().empty())
                     pScan.sErrorMessage = "Description is required";
@@ -684,7 +684,7 @@ void AssetUploadViewModel::ShowResults() const
 
                     default:
                         sMessage.append(ra::util::String::Printf(L"\n* %s: %s",
-                            pItem.pAsset->GetTitle(),
+                            pItem.pAsset->GetName(),
                             pItem.sErrorMessage));
                         break;
                 }
diff --git a/src/ui/viewmodels/BrokenAchievementsViewModel.cpp b/src/ui/viewmodels/BrokenAchievementsViewModel.cpp
index bbbb109b2..f2dc76532 100644
--- a/src/ui/viewmodels/BrokenAchievementsViewModel.cpp
+++ b/src/ui/viewmodels/BrokenAchievementsViewModel.cpp
@@ -54,7 +54,7 @@ bool BrokenAchievementsViewModel::InitializeAchievements()
                 {
                     auto& vmAchievement = m_vAchievements.Add();
                     vmAchievement.SetId(pAchievement->GetID());
-                    vmAchievement.SetLabel(pAchievement->GetTitle());
+                    vmAchievement.SetLabel(pAchievement->GetName());
                     vmAchievement.SetDescription(pAchievement->GetDescription());
                     vmAchievement.SetAchieved(!pAchievement->IsActive());
                 }
diff --git a/src/ui/viewmodels/TriggerViewModel.cpp b/src/ui/viewmodels/TriggerViewModel.cpp
index b5c9b2418..cea153a49 100644
--- a/src/ui/viewmodels/TriggerViewModel.cpp
+++ b/src/ui/viewmodels/TriggerViewModel.cpp
@@ -987,9 +987,9 @@ void TriggerViewModel::Summarize()
     TriggerSummaryViewModel vmSummary;
 
     if (m_vGroups.Count() == 1)
-        vmSummary.SetWindowTitle(L"Trigger Summary - " + pAssetEditor.GetAsset()->GetTitle());
+        vmSummary.SetWindowTitle(L"Trigger Summary - " + pAssetEditor.GetAsset()->GetName());
     else
-        vmSummary.SetWindowTitle(pGroup->GetLabel() + L" Summary - " + pAssetEditor.GetAsset()->GetTitle());
+        vmSummary.SetWindowTitle(pGroup->GetLabel() + L" Summary - " + pAssetEditor.GetAsset()->GetName());
 
     vmSummary.InitializeFrom(*pCondSet);
     vmSummary.AddHeaders();
diff --git a/tests/data/context/GameContext_Tests.cpp b/tests/data/context/GameContext_Tests.cpp
index f4843e660..ada3a869d 100644
--- a/tests/data/context/GameContext_Tests.cpp
+++ b/tests/data/context/GameContext_Tests.cpp
@@ -683,7 +683,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch1);
         Ensures(vmAch1 != nullptr);
         Assert::AreEqual(5U, vmAch1->GetID());
-        Assert::AreEqual(std::wstring(L"Ach1"), vmAch1->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach1"), vmAch1->GetName());
         Assert::AreEqual(std::wstring(L"Desc1"), vmAch1->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth1"), vmAch1->GetAuthor());
         Assert::AreEqual(ra::data::models::AssetCategory::Promoted, vmAch1->GetCategory());
@@ -696,7 +696,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch2);
         Ensures(vmAch2 != nullptr);
         Assert::AreEqual(7U, vmAch2->GetID());
-        Assert::AreEqual(std::wstring(L"Ach2"), vmAch2->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach2"), vmAch2->GetName());
         Assert::AreEqual(std::wstring(L"Desc2"), vmAch2->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth2"), vmAch2->GetAuthor());
         Assert::AreEqual(ra::data::models::AssetCategory::Unpromoted, vmAch2->GetCategory());
@@ -731,7 +731,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch1);
         Ensures(vmAch1 != nullptr);
         Assert::AreEqual(5U, vmAch1->GetID());
-        Assert::AreEqual(std::wstring(L"Ach1"), vmAch1->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach1"), vmAch1->GetName());
         Assert::AreEqual(std::wstring(L"Desc1"), vmAch1->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth1"), vmAch1->GetAuthor());
         Assert::AreEqual(ra::data::models::AssetCategory::Unpromoted, vmAch1->GetCategory());
@@ -744,7 +744,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch2);
         Ensures(vmAch2 != nullptr);
         Assert::AreEqual(7U, vmAch2->GetID());
-        Assert::AreEqual(std::wstring(L"Ach2"), vmAch2->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach2"), vmAch2->GetName());
         Assert::AreEqual(std::wstring(L"Desc2"), vmAch2->GetDescription());
         Assert::AreEqual(ra::data::models::AssetCategory::Unpromoted, vmAch2->GetCategory());
         Assert::AreEqual(15, vmAch2->GetPoints());
@@ -782,7 +782,7 @@ TEST_CLASS(GameContext_Tests)
         auto* pAch = game.Assets().FindAchievement(5U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach1"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach1"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc1"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth1"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"12345"), pAch->GetBadge());
@@ -794,7 +794,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(7U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach2b"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach2b"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc2b"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth2"), pAch->GetAuthor()); // author not merged
         Assert::AreEqual(std::wstring(L"54321"), pAch->GetBadge());
@@ -809,7 +809,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(9U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach3b"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach3b"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc3b"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth3"), pAch->GetAuthor()); // author not merged
         Assert::AreEqual(std::wstring(L"54321"), pAch->GetBadge());
@@ -824,7 +824,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(ra::data::models::GameAssets::FirstLocalId);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach3"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach3"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc3"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth3"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"00555"), pAch->GetBadge());
@@ -836,7 +836,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(ra::data::models::GameAssets::FirstLocalId + 1);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach4"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach4"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc4"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth4"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"00556"), pAch->GetBadge());
@@ -868,7 +868,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch);
         Ensures(vmAch != nullptr);
         Assert::AreEqual(7U, vmAch->GetID());
-        Assert::AreEqual(std::wstring(L"Ach2b"), vmAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach2b"), vmAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc2b"), vmAch->GetDescription());
         Assert::AreEqual(ra::data::models::AssetCategory::Local, vmAch->GetCategory());
         Assert::AreEqual(25, vmAch->GetPoints());
@@ -882,7 +882,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch);
         Ensures(vmAch != nullptr);
         Assert::AreEqual(999000001U, vmAch->GetID()); // non-vms get first id and first id + 1
-        Assert::AreEqual(std::wstring(L"Ach3"), vmAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach3"), vmAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc3"), vmAch->GetDescription());
         Assert::AreEqual(ra::data::models::AssetCategory::Local, vmAch->GetCategory());
         Assert::AreEqual(20, vmAch->GetPoints());
@@ -896,7 +896,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch);
         Ensures(vmAch != nullptr);
         Assert::AreEqual(999000003U, vmAch->GetID()); // non-vms get first id and first id + 1
-        Assert::AreEqual(std::wstring(L"Ach4"), vmAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach4"), vmAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc4"), vmAch->GetDescription());
         Assert::AreEqual(ra::data::models::AssetCategory::Local, vmAch->GetCategory());
         Assert::AreEqual(10, vmAch->GetPoints());
@@ -963,7 +963,7 @@ TEST_CLASS(GameContext_Tests)
         auto* pAch = game.Assets().FindAchievement(5U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach1b"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach1b"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc1b"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth1"), pAch->GetAuthor()); // author not merged
         Assert::AreEqual(std::wstring(L"54321"), pAch->GetBadge());
@@ -975,7 +975,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(7U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach2b"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach2b"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc2b"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth2"), pAch->GetAuthor()); // author not merged
         Assert::AreEqual(std::wstring(L"54321"), pAch->GetBadge());
@@ -987,7 +987,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(111000002U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach3"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach3"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc3"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth3"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"00555"), pAch->GetBadge());
@@ -999,7 +999,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(111000003U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach4"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach4"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc4"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth4"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"00556"), pAch->GetBadge());
@@ -1011,7 +1011,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(111000004U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach5"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach5"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc5"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth5"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"00555"), pAch->GetBadge());
@@ -1023,7 +1023,7 @@ TEST_CLASS(GameContext_Tests)
         pAch = game.Assets().FindAchievement(111000005U);
         Assert::IsNotNull(pAch);
         Ensures(pAch != nullptr);
-        Assert::AreEqual(std::wstring(L"Ach6"), pAch->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach6"), pAch->GetName());
         Assert::AreEqual(std::wstring(L"Desc6"), pAch->GetDescription());
         Assert::AreEqual(std::wstring(L"Auth6"), pAch->GetAuthor());
         Assert::AreEqual(std::wstring(L"00556"), pAch->GetBadge());
@@ -1060,13 +1060,13 @@ TEST_CLASS(GameContext_Tests)
         const auto* pLb1 = game.Assets().FindLeaderboard(7U);
         Assert::IsNotNull(pLb1);
         Ensures(pLb1 != nullptr);
-        Assert::AreEqual(std::wstring(L"LB1"), pLb1->GetTitle());
+        Assert::AreEqual(std::wstring(L"LB1"), pLb1->GetName());
         Assert::AreEqual(std::wstring(L"Desc1"), pLb1->GetDescription());
 
         const auto* pLb2 = game.Assets().FindLeaderboard(8U);
         Assert::IsNotNull(pLb2);
         Ensures(pLb2 != nullptr);
-        Assert::AreEqual(std::wstring(L"LB2"), pLb2->GetTitle());
+        Assert::AreEqual(std::wstring(L"LB2"), pLb2->GetName());
         Assert::AreEqual(std::wstring(L"Desc2"), pLb2->GetDescription());
     }
 
@@ -1106,7 +1106,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch1);
         Ensures(vmAch1 != nullptr);
         Assert::AreEqual(9U, vmAch1->GetID());
-        Assert::AreEqual(std::wstring(L"Ach9"), vmAch1->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach9"), vmAch1->GetName());
         Assert::AreEqual(std::wstring(L"Desc9"), vmAch1->GetDescription());
         Assert::AreEqual(ra::data::models::AssetCategory::Promoted, vmAch1->GetCategory());
         Assert::AreEqual(9, vmAch1->GetPoints());
@@ -1118,7 +1118,7 @@ TEST_CLASS(GameContext_Tests)
         Assert::IsNotNull(vmAch2);
         Ensures(vmAch2 != nullptr);
         Assert::AreEqual(11U, vmAch2->GetID());
-        Assert::AreEqual(std::wstring(L"Ach11"), vmAch2->GetTitle());
+        Assert::AreEqual(std::wstring(L"Ach11"), vmAch2->GetName());
         Assert::AreEqual(std::wstring(L"Desc11"), vmAch2->GetDescription());
         Assert::AreEqual(ra::data::models::AssetCategory::Unpromoted, vmAch2->GetCategory());
         Assert::AreEqual(11, vmAch2->GetPoints());
diff --git a/tests/devkit/data/models/AchievementModel_Tests.cpp b/tests/devkit/data/models/AchievementModel_Tests.cpp
index 9f9f5c34d..c7d937a2c 100644
--- a/tests/devkit/data/models/AchievementModel_Tests.cpp
+++ b/tests/devkit/data/models/AchievementModel_Tests.cpp
@@ -51,7 +51,7 @@ TEST_CLASS(AchievementModel_Tests)
 
         Assert::AreEqual(AssetType::Achievement, achievement.GetType());
         Assert::AreEqual(0U, achievement.GetID());
-        Assert::AreEqual(std::wstring(L""), achievement.GetTitle());
+        Assert::AreEqual(std::wstring(L""), achievement.GetName());
         Assert::AreEqual(std::wstring(L""), achievement.GetDescription());
         Assert::AreEqual(AssetCategory::Promoted, achievement.GetCategory());
         Assert::AreEqual(AssetState::Inactive, achievement.GetState());
diff --git a/tests/devkit/data/models/AssetModelBase_Tests.cpp b/tests/devkit/data/models/AssetModelBase_Tests.cpp
index ac9ae8b41..7b1669e95 100644
--- a/tests/devkit/data/models/AssetModelBase_Tests.cpp
+++ b/tests/devkit/data/models/AssetModelBase_Tests.cpp
@@ -37,7 +37,7 @@ TEST_CLASS(AssetModelBase_Tests)
 
         void Serialize(ra::services::TextWriter& pWriter) const override
         {
-            WriteQuoted(pWriter, GetTitle());
+            WriteQuoted(pWriter, GetName());
             WritePossiblyQuoted(pWriter, GetString());
             WriteNumber(pWriter, GetInt());
             WriteQuoted(pWriter, Utf8QuotedString);
@@ -115,7 +115,7 @@ TEST_CLASS(AssetModelBase_Tests)
 
         Assert::AreEqual(AssetType::Achievement, asset.GetType());
         Assert::AreEqual(0U, asset.GetID());
-        Assert::AreEqual(std::wstring(L""), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L""), asset.GetName());
         Assert::AreEqual(std::wstring(L""), asset.GetDescription());
         Assert::AreEqual(AssetCategory::Promoted, asset.GetCategory());
         Assert::AreEqual(AssetState::Inactive, asset.GetState());
@@ -215,7 +215,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsTrue(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"Name"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"Name"), asset.GetName());
         Assert::AreEqual(std::wstring(L"String"), asset.GetString());
         Assert::AreEqual(99U, asset.GetInt());
         Assert::AreEqual(std::string("UTF-8-Quoted"), asset.Utf8QuotedString);
@@ -231,7 +231,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsTrue(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"Mission: Impossible"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"Mission: Impossible"), asset.GetName());
         Assert::AreEqual(std::wstring(L"Mission: Impossible"), asset.GetString());
         Assert::AreEqual(0U, asset.GetInt());
         Assert::AreEqual(std::string("Mission: Impossible"), asset.Utf8QuotedString);
@@ -247,7 +247,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsTrue(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"A \"Test\" B"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"A \"Test\" B"), asset.GetName());
         Assert::AreEqual(std::wstring(L"A \"Test\" B"), asset.GetString());
         Assert::AreEqual(0U, asset.GetInt());
         Assert::AreEqual(std::string("A \"Test\" B"), asset.Utf8QuotedString);
@@ -263,7 +263,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsTrue(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"A\\B"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"A\\B"), asset.GetName());
         Assert::AreEqual(std::wstring(L"A\\B"), asset.GetString());
         Assert::AreEqual(0U, asset.GetInt());
         Assert::AreEqual(std::string("A\\B"), asset.Utf8QuotedString);
@@ -279,7 +279,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsFalse(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"A"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"A"), asset.GetName());
         Assert::AreEqual(std::wstring(L"B"), asset.GetString());
         Assert::AreEqual(0U, asset.GetInt());
         Assert::AreEqual(std::string(), asset.Utf8QuotedString);
@@ -295,7 +295,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsFalse(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"A"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"A"), asset.GetName());
         Assert::AreEqual(std::wstring(L"B"), asset.GetString());
         Assert::AreEqual(5U, asset.GetInt());
         Assert::AreEqual(std::string("D"), asset.Utf8QuotedString);
@@ -311,7 +311,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsFalse(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(), asset.GetTitle());
+        Assert::AreEqual(std::wstring(), asset.GetName());
         Assert::AreEqual(std::wstring(), asset.GetString());
         Assert::AreEqual(0U, asset.GetInt());
         Assert::AreEqual(std::string(), asset.Utf8QuotedString);
@@ -327,7 +327,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         Assert::IsFalse(asset.Deserialize(pTokenizer));
 
-        Assert::AreEqual(std::wstring(L"A"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"A"), asset.GetName());
         Assert::AreEqual(std::wstring(), asset.GetString());
         Assert::AreEqual(0U, asset.GetInt());
         Assert::AreEqual(std::string(), asset.Utf8QuotedString);
@@ -349,11 +349,11 @@ TEST_CLASS(AssetModelBase_Tests)
 
         asset.UpdateLocalCheckpoint();
         Assert::AreEqual(AssetChanges::Unpublished, asset.GetChanges());
-        Assert::AreEqual(std::wstring(L"LocalName"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"LocalName"), asset.GetName());
 
         asset.UpdateServerCheckpoint();
         Assert::AreEqual(AssetChanges::None, asset.GetChanges());
-        Assert::AreEqual(std::wstring(L"LocalName"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"LocalName"), asset.GetName());
     }
 
     TEST_METHOD(TestRestoreCheckpoint)
@@ -372,14 +372,14 @@ TEST_CLASS(AssetModelBase_Tests)
 
         asset.RestoreLocalCheckpoint();
         Assert::AreEqual(AssetChanges::Unpublished, asset.GetChanges());
-        Assert::AreEqual(std::wstring(L"LocalName"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"LocalName"), asset.GetName());
 
         asset.SetName(L"ModifiedName");
         Assert::AreEqual(AssetChanges::Modified, asset.GetChanges());
 
         asset.RestoreServerCheckpoint();
         Assert::AreEqual(AssetChanges::None, asset.GetChanges());
-        Assert::AreEqual(std::wstring(L"ServerName"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"ServerName"), asset.GetName());
     }
 
     TEST_METHOD(TestUpdateDefinitionCheckpoint)
@@ -470,7 +470,7 @@ TEST_CLASS(AssetModelBase_Tests)
         pTokenizer.Advance(); // skip leading colon
         asset.ResetLocalCheckpoint(pTokenizer);
 
-        Assert::AreEqual(std::wstring(L"Name"), asset.GetTitle());
+        Assert::AreEqual(std::wstring(L"Name"), asset.GetName());
         Assert::AreEqual(AssetChanges::Unpublished, asset.GetChanges());
     }
 
diff --git a/tests/devkit/data/models/GameAssets_Tests.cpp b/tests/devkit/data/models/GameAssets_Tests.cpp
index 823169ce0..83c69de2c 100644
--- a/tests/devkit/data/models/GameAssets_Tests.cpp
+++ b/tests/devkit/data/models/GameAssets_Tests.cpp
@@ -623,7 +623,7 @@ TEST_CLASS(GameAssets_Tests)
         const auto* pAsset2 = gameAssets.FindAchievement({ 1U });
         Assert::IsNotNull(pAsset2);
         Ensures(pAsset2 != nullptr);
-        Assert::AreEqual(std::wstring(L"Server"), pAsset2->GetTitle());
+        Assert::AreEqual(std::wstring(L"Server"), pAsset2->GetName());
         Assert::AreEqual(AssetCategory::Promoted, pAsset2->GetCategory());
         Assert::AreEqual(AssetChanges::None, pAsset2->GetChanges());
     }
@@ -650,7 +650,7 @@ TEST_CLASS(GameAssets_Tests)
         const auto* pAsset2 = gameAssets.FindAchievement({ 1U });
         Assert::IsNotNull(pAsset2);
         Ensures(pAsset2 != nullptr);
-        Assert::AreEqual(std::wstring(L"Server"), pAsset2->GetTitle());
+        Assert::AreEqual(std::wstring(L"Server"), pAsset2->GetName());
         Assert::AreEqual(AssetCategory::Promoted, pAsset2->GetCategory());
         Assert::AreEqual(AssetChanges::None, pAsset2->GetChanges());
     }
diff --git a/tests/devkit/data/models/LeaderboardModel_Tests.cpp b/tests/devkit/data/models/LeaderboardModel_Tests.cpp
index f440833e8..798c48f70 100644
--- a/tests/devkit/data/models/LeaderboardModel_Tests.cpp
+++ b/tests/devkit/data/models/LeaderboardModel_Tests.cpp
@@ -42,7 +42,7 @@ TEST_CLASS(LeaderboardModel_Tests)
 
         Assert::AreEqual(AssetType::Leaderboard, leaderboard.GetType());
         Assert::AreEqual(0U, leaderboard.GetID());
-        Assert::AreEqual(std::wstring(L""), leaderboard.GetTitle());
+        Assert::AreEqual(std::wstring(L""), leaderboard.GetName());
         Assert::AreEqual(std::wstring(L""), leaderboard.GetDescription());
         Assert::AreEqual(AssetCategory::Promoted, leaderboard.GetCategory());
         Assert::AreEqual(AssetState::Inactive, leaderboard.GetState());
@@ -68,7 +68,7 @@ TEST_CLASS(LeaderboardModel_Tests)
         Assert::AreEqual(std::string("0xH1234=3"), leaderboard.GetSubmitTrigger());
         Assert::AreEqual(std::string("0xH1234"), leaderboard.GetValueDefinition());
         Assert::AreEqual(Value::Format::Frames, leaderboard.GetValueFormat());
-        Assert::AreEqual(std::wstring(L"Title"), leaderboard.GetTitle());
+        Assert::AreEqual(std::wstring(L"Title"), leaderboard.GetName());
         Assert::AreEqual(std::wstring(L"Desc"), leaderboard.GetDescription());
         Assert::IsFalse(leaderboard.IsLowerBetter());
     }
@@ -88,7 +88,7 @@ TEST_CLASS(LeaderboardModel_Tests)
         Assert::AreEqual(std::string("0xH1234>3"), leaderboard.GetSubmitTrigger());
         Assert::AreEqual(std::string("M:0xH1234"), leaderboard.GetValueDefinition());
         Assert::AreEqual(Value::Format::Centiseconds, leaderboard.GetValueFormat());
-        Assert::AreEqual(std::wstring(L"My Title"), leaderboard.GetTitle());
+        Assert::AreEqual(std::wstring(L"My Title"), leaderboard.GetName());
         Assert::AreEqual(std::wstring(L"My Desc"), leaderboard.GetDescription());
         Assert::IsTrue(leaderboard.IsLowerBetter());
     }
@@ -108,7 +108,7 @@ TEST_CLASS(LeaderboardModel_Tests)
         Assert::AreEqual(std::string("0xH1234=3"), leaderboard.GetSubmitTrigger());
         Assert::AreEqual(std::string("0xH1234"), leaderboard.GetValueDefinition());
         Assert::AreEqual(Value::Format::Frames, leaderboard.GetValueFormat());
-        Assert::AreEqual(std::wstring(L"Title"), leaderboard.GetTitle());
+        Assert::AreEqual(std::wstring(L"Title"), leaderboard.GetName());
         Assert::AreEqual(std::wstring(L"Desc"), leaderboard.GetDescription());
         Assert::IsFalse(leaderboard.IsLowerBetter());
     }
@@ -128,7 +128,7 @@ TEST_CLASS(LeaderboardModel_Tests)
         Assert::AreEqual(std::string(), leaderboard.GetSubmitTrigger());
         Assert::AreEqual(std::string(), leaderboard.GetValueDefinition());
         Assert::AreEqual(Value::Format::Value, leaderboard.GetValueFormat());
-        Assert::AreEqual(std::wstring(), leaderboard.GetTitle());
+        Assert::AreEqual(std::wstring(), leaderboard.GetName());
         Assert::AreEqual(std::wstring(), leaderboard.GetDescription());
         Assert::IsFalse(leaderboard.IsLowerBetter());
     }
diff --git a/tests/devkit/data/models/LocalBadgesModel_Tests.cpp b/tests/devkit/data/models/LocalBadgesModel_Tests.cpp
index 4aeca85df..9e4f6a789 100644
--- a/tests/devkit/data/models/LocalBadgesModel_Tests.cpp
+++ b/tests/devkit/data/models/LocalBadgesModel_Tests.cpp
@@ -34,7 +34,7 @@ TEST_CLASS(LocalBadgesModel_Tests)
 
         Assert::AreEqual(AssetType::LocalBadges, badges.GetType());
         Assert::AreEqual(0U, badges.GetID());
-        Assert::AreEqual(std::wstring(L"Local Badges"), badges.GetTitle());
+        Assert::AreEqual(std::wstring(L"Local Badges"), badges.GetName());
         Assert::AreEqual(std::wstring(L""), badges.GetDescription());
         Assert::AreEqual(AssetCategory::Local, badges.GetCategory());
         Assert::AreEqual(AssetState::Inactive, badges.GetState());
diff --git a/tests/devkit/data/models/MemoryNotesModel_Tests.cpp b/tests/devkit/data/models/MemoryNotesModel_Tests.cpp
index 20d27f60a..2affb41c2 100644
--- a/tests/devkit/data/models/MemoryNotesModel_Tests.cpp
+++ b/tests/devkit/data/models/MemoryNotesModel_Tests.cpp
@@ -194,7 +194,7 @@ TEST_CLASS(MemoryNotesModel_Tests)
 
         Assert::AreEqual(AssetType::MemoryNotes, notes.GetType());
         Assert::AreEqual(0U, notes.GetID());
-        Assert::AreEqual(std::wstring(L"Memory Notes"), notes.GetTitle());
+        Assert::AreEqual(std::wstring(L"Memory Notes"), notes.GetName());
         Assert::AreEqual(std::wstring(L""), notes.GetDescription());
         Assert::AreEqual(AssetCategory::Promoted, notes.GetCategory());
         Assert::AreEqual(AssetState::Inactive, notes.GetState());
diff --git a/tests/devkit/data/models/MemoryRegionsModel_Tests.cpp b/tests/devkit/data/models/MemoryRegionsModel_Tests.cpp
index 4a5a76c01..9f6589315 100644
--- a/tests/devkit/data/models/MemoryRegionsModel_Tests.cpp
+++ b/tests/devkit/data/models/MemoryRegionsModel_Tests.cpp
@@ -51,7 +51,7 @@ TEST_CLASS(MemoryRegionsModel_Tests)
 
         Assert::AreEqual(AssetType::MemoryRegions, regions.GetType());
         Assert::AreEqual(0U, regions.GetID());
-        Assert::AreEqual(std::wstring(L"Memory Regions"), regions.GetTitle());
+        Assert::AreEqual(std::wstring(L"Memory Regions"), regions.GetName());
         Assert::AreEqual(std::wstring(L""), regions.GetDescription());
         Assert::AreEqual(AssetCategory::Promoted, regions.GetCategory());
         Assert::AreEqual(AssetState::Inactive, regions.GetState());
diff --git a/tests/devkit/data/models/RichPresenceModel_Tests.cpp b/tests/devkit/data/models/RichPresenceModel_Tests.cpp
index 560a6463e..481afb5e5 100644
--- a/tests/devkit/data/models/RichPresenceModel_Tests.cpp
+++ b/tests/devkit/data/models/RichPresenceModel_Tests.cpp
@@ -39,7 +39,7 @@ TEST_CLASS(RichPresenceModel_Tests)
 
         Assert::AreEqual(AssetType::RichPresence, richPresence.GetType());
         Assert::AreEqual(0U, richPresence.GetID());
-        Assert::AreEqual(std::wstring(L"Rich Presence"), richPresence.GetTitle());
+        Assert::AreEqual(std::wstring(L"Rich Presence"), richPresence.GetName());
         Assert::AreEqual(std::wstring(L""), richPresence.GetDescription());
         Assert::AreEqual(AssetCategory::Promoted, richPresence.GetCategory());
         Assert::AreEqual(AssetState::Inactive, richPresence.GetState());
diff --git a/tests/services/AchievementRuntime_Tests.cpp b/tests/services/AchievementRuntime_Tests.cpp
index e53794c0c..e07f3f81f 100644
--- a/tests/services/AchievementRuntime_Tests.cpp
+++ b/tests/services/AchievementRuntime_Tests.cpp
@@ -578,7 +578,7 @@ TEST_CLASS(AchievementRuntime_Tests)
         Assert::IsNotNull(pSubset->next); // there will be an inactive local subset
         const auto* pOriginalTrigger = pSubset->achievements->trigger;
 
-        Assert::AreEqual(std::wstring(L"Achievement Name"), vmAchievement.GetTitle());
+        Assert::AreEqual(std::wstring(L"Achievement Name"), vmAchievement.GetName());
         Assert::AreEqual(std::wstring(L"Do something cool"), vmAchievement.GetDescription());
         Assert::AreEqual(25, vmAchievement.GetPoints());
         Assert::AreEqual(12345U, vmAchievement.GetID());
diff --git a/tests/ui/viewmodels/AssetEditorViewModel_Tests.cpp b/tests/ui/viewmodels/AssetEditorViewModel_Tests.cpp
index 7f4c84eab..c5645d6e7 100644
--- a/tests/ui/viewmodels/AssetEditorViewModel_Tests.cpp
+++ b/tests/ui/viewmodels/AssetEditorViewModel_Tests.cpp
@@ -890,19 +890,19 @@ TEST_CLASS(AssetEditorViewModel_Tests)
 
         editor.LoadAsset(&achievement);
         Assert::AreEqual(std::wstring(L"Test Achievement"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"Test Achievement"), achievement.GetTitle());
+        Assert::AreEqual(std::wstring(L"Test Achievement"), achievement.GetName());
 
         editor.SetName(L"New Name");
         Assert::AreEqual(std::wstring(L"New Name"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name"), achievement.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name"), achievement.GetName());
 
         editor.SetName(L"New Name 2");
         Assert::AreEqual(std::wstring(L"New Name 2"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name 2"), achievement.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name 2"), achievement.GetName());
 
         achievement.SetName(L"New Name 3");
         Assert::AreEqual(std::wstring(L"New Name 3"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name 3"), achievement.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name 3"), achievement.GetName());
     }
 
     TEST_METHOD(TestSyncDescription)
@@ -1329,28 +1329,28 @@ TEST_CLASS(AssetEditorViewModel_Tests)
 
         editor.LoadAsset(&achievement1);
         Assert::AreEqual(std::wstring(L"Achievement1"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"Achievement1"), achievement1.GetTitle());
-        Assert::AreEqual(std::wstring(L"Achievement2"), achievement2.GetTitle());
+        Assert::AreEqual(std::wstring(L"Achievement1"), achievement1.GetName());
+        Assert::AreEqual(std::wstring(L"Achievement2"), achievement2.GetName());
 
         editor.SetName(L"New Name");
         Assert::AreEqual(std::wstring(L"New Name"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name"), achievement1.GetTitle());
-        Assert::AreEqual(std::wstring(L"Achievement2"), achievement2.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name"), achievement1.GetName());
+        Assert::AreEqual(std::wstring(L"Achievement2"), achievement2.GetName());
 
         editor.LoadAsset(&achievement2);
         Assert::AreEqual(std::wstring(L"Achievement2"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name"), achievement1.GetTitle());
-        Assert::AreEqual(std::wstring(L"Achievement2"), achievement2.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name"), achievement1.GetName());
+        Assert::AreEqual(std::wstring(L"Achievement2"), achievement2.GetName());
 
         editor.SetName(L"New Name 2");
         Assert::AreEqual(std::wstring(L"New Name 2"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name"), achievement1.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name 2"), achievement2.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name"), achievement1.GetName());
+        Assert::AreEqual(std::wstring(L"New Name 2"), achievement2.GetName());
 
         achievement1.SetName(L"New Name 3");
         Assert::AreEqual(std::wstring(L"New Name 2"), editor.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name 3"), achievement1.GetTitle());
-        Assert::AreEqual(std::wstring(L"New Name 2"), achievement2.GetTitle());
+        Assert::AreEqual(std::wstring(L"New Name 3"), achievement1.GetName());
+        Assert::AreEqual(std::wstring(L"New Name 2"), achievement2.GetName());
     }
 
     TEST_METHOD(TestUpdateActiveTrigger)
diff --git a/tests/ui/viewmodels/AssetListViewModel_Tests.cpp b/tests/ui/viewmodels/AssetListViewModel_Tests.cpp
index b4f4c7a6a..298d4733d 100644
--- a/tests/ui/viewmodels/AssetListViewModel_Tests.cpp
+++ b/tests/ui/viewmodels/AssetListViewModel_Tests.cpp
@@ -603,7 +603,7 @@ TEST_CLASS(AssetListViewModel_Tests)
             {
                 const auto pIter = m_mValidationErrors.find(pAchievement.GetID());
                 if (pIter != m_mValidationErrors.end())
-                    sError.append(ra::util::String::Printf(L"\n* %s: %s", pAchievement.GetTitle(), pIter->second));
+                    sError.append(ra::util::String::Printf(L"\n* %s: %s", pAchievement.GetName(), pIter->second));
             }
         }