diff --git a/Source/Data/Achievement.cs b/Source/Data/Achievement.cs
index 205390f1..eae028ae 100644
--- a/Source/Data/Achievement.cs
+++ b/Source/Data/Achievement.cs
@@ -49,14 +49,14 @@ public static bool IsValidBadgeName(string badgeName)
         public Trigger Trigger { get; internal set; }
 
         /// <summary>
-        /// Gets the achievement category (3=Core, 5=Unofficial).
+        /// Gets the achievement category (3=Promoted, 5=Unpromoted).
         /// </summary>
         public int Category { get; internal set; }
 
         /// <summary>
-        /// Gets whether or not the achievement is Unofficial.
+        /// Gets whether or not the achievement is Unpromoted.
         /// </summary>
-        public override bool IsUnofficial
+        public override bool IsUnpromoted
         {
             get { return Category == 5; }
         }
diff --git a/Source/Data/AssetBase.cs b/Source/Data/AssetBase.cs
index 76c6ff20..e7dc15f3 100644
--- a/Source/Data/AssetBase.cs
+++ b/Source/Data/AssetBase.cs
@@ -35,9 +35,9 @@ public class AssetBase
         public DateTime LastModified { get; set; }
 
         /// <summary>
-        /// Gets whether or not the asset has been published but not promoted to Core.
+        /// Gets whether or not the asset has been published but not promoted.
         /// </summary>
-        public virtual bool IsUnofficial
+        public virtual bool IsUnpromoted
         {
             get { return false; }
         }
diff --git a/Source/Parser/PublishedAssets.cs b/Source/Parser/PublishedAssets.cs
index 3229f363..6fda3278 100644
--- a/Source/Parser/PublishedAssets.cs
+++ b/Source/Parser/PublishedAssets.cs
@@ -164,6 +164,7 @@ private static AchievementSetType ConvertType(string type)
             {
                 case "core": return AchievementSetType.Core;
                 case "bonus": return AchievementSetType.Bonus;
+                case "challenge": return AchievementSetType.Challenge;
                 case "specialty": return AchievementSetType.Specialty;
                 case "exclusive": return AchievementSetType.Exclusive;
                 default: return AchievementSetType.None;
diff --git a/Source/ViewModels/AchievementsListViewModel.cs b/Source/ViewModels/AchievementsListViewModel.cs
index 6a30675a..fbf9bdd7 100644
--- a/Source/ViewModels/AchievementsListViewModel.cs
+++ b/Source/ViewModels/AchievementsListViewModel.cs
@@ -56,18 +56,18 @@ private void CountAchievements(AchievementViewModel[] achievements)
             var initialPointsLength = points.Length;
             points.Append(" (");
 
-            var published = achievements.Where(a => !a.Published?.Asset?.IsUnofficial ?? false);
-            if (published.Any())
+            var promoted = achievements.Where(a => !a.Published?.Asset?.IsUnpromoted ?? false);
+            if (promoted.Any())
             {
-                description.AppendFormat("{0} published, ", published.Count());
-                points.AppendFormat("{0} published, ", published.Sum(a => a.Points));
+                description.AppendFormat("{0} promoted, ", promoted.Count());
+                points.AppendFormat("{0} promoted, ", promoted.Sum(a => a.Points));
             }
 
-            var unpublished = achievements.Where(a => a.Published?.Asset?.IsUnofficial ?? false);
-            if (unpublished.Any())
+            var unpromoted = achievements.Where(a => a.Published?.Asset?.IsUnpromoted ?? false);
+            if (unpromoted.Any())
             {
-                description.AppendFormat("{0} unpublished, ", unpublished.Count());
-                points.AppendFormat("{0} unpublished, ", unpublished.Sum(a => a.Points));
+                description.AppendFormat("{0} unpromoted, ", unpromoted.Count());
+                points.AppendFormat("{0} unpromoted, ", unpromoted.Sum(a => a.Points));
             }
 
             var local = achievements.Where(a => a.Published?.Asset == null);
diff --git a/Source/ViewModels/AssetSourceViewModel.cs b/Source/ViewModels/AssetSourceViewModel.cs
index 725d9d33..d3b61212 100644
--- a/Source/ViewModels/AssetSourceViewModel.cs
+++ b/Source/ViewModels/AssetSourceViewModel.cs
@@ -26,10 +26,10 @@ public AssetSourceViewModel(AssetViewModelBase owner, string source)
 
         protected readonly AssetViewModelBase _owner;
 
-        internal AssetBase Asset 
+        public AssetBase Asset 
         { 
             get { return _asset; } 
-            set
+            internal set
             {
                 bool hadAsset = _asset != null;
                 if (hadAsset && value == null)
diff --git a/Source/ViewModels/AssetViewModelBase.cs b/Source/ViewModels/AssetViewModelBase.cs
index 4ab02dbd..7e70c549 100644
--- a/Source/ViewModels/AssetViewModelBase.cs
+++ b/Source/ViewModels/AssetViewModelBase.cs
@@ -178,7 +178,7 @@ public bool IsPointsModified
 
         private void UpdateModified()
         {
-            var coreAsset = Published.Asset;
+            var publishedAsset = Published.Asset;
 
             if (!IsGenerated || Generated.Asset.IsInvalid)
             {
@@ -200,13 +200,14 @@ private void UpdateModified()
                     ModificationMessage = "Generation failed";
                 }
 
-                if (coreAsset != null)
+                if (publishedAsset != null)
                 {
                     Triggers = Published.TriggerList;
-                    if (coreAsset.IsUnofficial)
-                        TriggerSource = String.Format("Unpublished ({0})", ModificationMessage);
+
+                    if (publishedAsset.IsUnpromoted)
+                        TriggerSource = String.Format("Unpromoted ({0})", ModificationMessage);
                     else
-                        TriggerSource = String.Format("Core ({0})", ModificationMessage);
+                        TriggerSource = String.Format("Promoted ({0})", ModificationMessage);
                 }
                 else if (Local.Asset != null)
                 {
@@ -221,17 +222,17 @@ private void UpdateModified()
             {
                 TriggerSource = "Generated";
 
-                if (coreAsset != null)
+                if (publishedAsset != null)
                 {
                     bool differsFromPublished = !IsModified(Published, false);
                     UpdateModifiedProperties(Local); // reset title/description modified properties
 
                     if (differsFromPublished)
                     {
-                        if (coreAsset.IsUnofficial)
-                            TriggerSource = "Generated (Same as Unpublished)";
+                        if (publishedAsset.IsUnpromoted)
+                            TriggerSource = "Generated (Same as Unpromoted)";
                         else
-                            TriggerSource = "Generated (Same as Core)";
+                            TriggerSource = "Generated (Same as Promoted)";
                     }
                 }
 
@@ -240,7 +241,7 @@ private void UpdateModified()
                 CompareState = GeneratedCompareState.LocalDiffers;
                 CanUpdate = true;
             }
-            else if (coreAsset != null && IsModified(Published, true))
+            else if (publishedAsset != null && IsModified(Published, true))
             {
                 if (Local.Asset != null)
                 {
@@ -253,10 +254,10 @@ private void UpdateModified()
                     CanUpdate = true;
                 }
 
-                if (coreAsset.IsUnofficial)
-                    ModificationMessage = "Unpublished differs from generated";
+                if (publishedAsset.IsUnpromoted)
+                    ModificationMessage = "Unpromoted differs from generated";
                 else
-                    ModificationMessage = "Core differs from generated";
+                    ModificationMessage = "Promoted differs from generated";
 
                 Other = Published;
                 CompareState = (Local.Asset != null) ? GeneratedCompareState.PublishedDiffers : GeneratedCompareState.LocalDiffers;
@@ -265,7 +266,7 @@ private void UpdateModified()
             {
                 if (Local.Asset == null && IsGenerated)
                 {
-                    if (coreAsset == null)
+                    if (publishedAsset == null)
                     {
                         TriggerSource = "Generated (Not in Local)";
                         ModificationMessage = "Local " + ViewerType + " does not exist";
@@ -273,10 +274,10 @@ private void UpdateModified()
                     }
                     else
                     {
-                        if (coreAsset.IsUnofficial)
-                            TriggerSource = "Generated (Same as Unpublished, not in Local)";
+                        if (publishedAsset.IsUnpromoted)
+                            TriggerSource = "Generated (Same as Unpromoted, not in Local)";
                         else
-                            TriggerSource = "Generated (Same as Core, not in Local)";
+                            TriggerSource = "Generated (Same as Promoted, not in Local)";
 
                         ModificationMessage = null;
                         CompareState = GeneratedCompareState.Same;
@@ -287,12 +288,12 @@ private void UpdateModified()
                 }
                 else
                 {
-                    if (coreAsset == null)
+                    if (publishedAsset == null)
                         TriggerSource = "Generated (Same as Local)";
-                    else if (coreAsset.IsUnofficial)
-                        TriggerSource = "Generated (Same as Unpublished and Local)";
+                    else if (publishedAsset.IsUnpromoted)
+                        TriggerSource = "Generated (Same as Unpromoted and Local)";
                     else
-                        TriggerSource = "Generated (Same as Core and Local)";
+                        TriggerSource = "Generated (Same as Promoted and Local)";
 
                     ModificationMessage = null;
                     CompareState = GeneratedCompareState.Same;
@@ -456,10 +457,10 @@ public override void Refresh()
         {
             var generatedAsset = Generated.Asset;
             var localAsset = Local.Asset;
-            var coreAsset = Published.Asset;
+            var publishedAsset = Published.Asset;
 
-            Published.Source = (coreAsset == null) ? "Published" :
-                coreAsset.IsUnofficial ? "Published (Unofficial)" : "Published (Core)";
+            Published.Source = (publishedAsset == null) ? "Published" :
+                publishedAsset.IsUnpromoted ? "Published (Unpromoted)" : "Published (Promoted)";
 
             if (generatedAsset != null)
             {
@@ -468,7 +469,7 @@ public override void Refresh()
             else
             {
                 ClearBindings();
-                if (coreAsset != null)
+                if (publishedAsset != null)
                     LoadViewModel(Published);
                 else if (localAsset != null)
                     LoadViewModel(Local);
diff --git a/Source/ViewModels/ConditionsAnalyzerViewModel.cs b/Source/ViewModels/ConditionsAnalyzerViewModel.cs
index aa85d3a7..3db936fe 100644
--- a/Source/ViewModels/ConditionsAnalyzerViewModel.cs
+++ b/Source/ViewModels/ConditionsAnalyzerViewModel.cs
@@ -124,7 +124,7 @@ public class Result
             public int AchievementId { get; internal set; }
             public int LeaderboardId { get; internal set; }
             public string Details { get; internal set; }
-            public bool IsUnofficial { get; internal set; }
+            public bool IsUnpromoted { get; internal set; }
         }
 
         public ObservableCollection<Result> Results { get; private set; }
@@ -245,18 +245,18 @@ private void OnDialogResultPropertyChanged(object sender, ModelPropertyChangedEv
             Progress.IsEnabled = false;
         }
 
-        public static readonly ModelProperty IsCoreAchievementsScannedProperty = ModelProperty.Register(typeof(ConditionsAnalyzerViewModel), "IsAchievementsScanned", typeof(bool), true);
-        public bool IsCoreAchievementsScanned
+        public static readonly ModelProperty IsPromotedAchievementsScannedProperty = ModelProperty.Register(typeof(ConditionsAnalyzerViewModel), "IsPromotedAchievementsScanned", typeof(bool), true);
+        public bool IsPromotedAchievementsScanned
         {
-            get { return (bool)GetValue(IsCoreAchievementsScannedProperty); }
-            set { SetValue(IsCoreAchievementsScannedProperty, value); }
+            get { return (bool)GetValue(IsPromotedAchievementsScannedProperty); }
+            set { SetValue(IsPromotedAchievementsScannedProperty, value); }
         }
 
-        public static readonly ModelProperty IsNonCoreAchievementsScannedProperty = ModelProperty.Register(typeof(ConditionsAnalyzerViewModel), "IsAchievementsScanned", typeof(bool), true);
-        public bool IsNonCoreAchievementsScanned
+        public static readonly ModelProperty IsUnpromotedAchievementsScannedProperty = ModelProperty.Register(typeof(ConditionsAnalyzerViewModel), "IsUnpromotedAchievementsScanned", typeof(bool), true);
+        public bool IsUnpromotedAchievementsScanned
         {
-            get { return (bool)GetValue(IsNonCoreAchievementsScannedProperty); }
-            set { SetValue(IsNonCoreAchievementsScannedProperty, value); }
+            get { return (bool)GetValue(IsUnpromotedAchievementsScannedProperty); }
+            set { SetValue(IsUnpromotedAchievementsScannedProperty, value); }
         }
 
         public static readonly ModelProperty IsLeaderboardStartScannedProperty = ModelProperty.Register(typeof(ConditionsAnalyzerViewModel), "IsLeaderboardStartScanned", typeof(bool), true);
@@ -329,7 +329,7 @@ private void DoSearch()
             var directory = _settings.DumpDirectory;
 
             var filesToRead = 0;
-            if (IsCoreAchievementsScanned || IsNonCoreAchievementsScanned)
+            if (IsPromotedAchievementsScanned || IsUnpromotedAchievementsScanned)
                 filesToRead += Snapshot.AchievementGameCount;
             if (IsLeaderboardCancelScanned || IsLeaderboardStartScanned || IsLeaderboardSubmitScanned)
                 filesToRead += Snapshot.LeaderboardGameCount;
@@ -341,7 +341,7 @@ private void DoSearch()
 
             var results = new List<Result>();
 
-            if (IsCoreAchievementsScanned || IsNonCoreAchievementsScanned)
+            if (IsPromotedAchievementsScanned || IsUnpromotedAchievementsScanned)
             {
                 Progress.Label = "Processing Achievements...";
 
@@ -365,12 +365,12 @@ private void DoSearch()
                     foreach (var achievement in achievements)
                     {
                         var flags = achievement.GetField("Flags").IntegerValue;
-                        if (!IsCoreAchievementsScanned)
+                        if (!IsPromotedAchievementsScanned)
                         {
                             if (flags == 3)
                                 continue;
                         }
-                        else if (!IsNonCoreAchievementsScanned)
+                        else if (!IsUnpromotedAchievementsScanned)
                         {
                             if (flags != 3)
                                 continue;
@@ -386,7 +386,7 @@ private void DoSearch()
                                 AchievementId = achievement.GetField("ID").IntegerValue.GetValueOrDefault(),
                                 ItemName = achievement.GetField("Title").StringValue,
                                 Details = memAddr,
-                                IsUnofficial = flags == 5
+                                IsUnpromoted = flags == 5
                             });
                         }
                     }
diff --git a/Source/ViewModels/GameBadgesViewModel.cs b/Source/ViewModels/GameBadgesViewModel.cs
index 578627b9..fa0248d4 100644
--- a/Source/ViewModels/GameBadgesViewModel.cs
+++ b/Source/ViewModels/GameBadgesViewModel.cs
@@ -99,7 +99,7 @@ private bool LoadGameFromCache()
                     var badgeDirectory = Path.Combine(directory, "RACache", "Badge");
                     foreach (var achievement in publishedAssets.Achievements)
                     {
-                        if (achievement.IsUnofficial)
+                        if (achievement.IsUnpromoted)
                             continue;
 
                         var path = Path.Combine(badgeDirectory, achievement.BadgeName);
diff --git a/Source/ViewModels/GameViewModel.cs b/Source/ViewModels/GameViewModel.cs
index d8dba841..a7f9da30 100644
--- a/Source/ViewModels/GameViewModel.cs
+++ b/Source/ViewModels/GameViewModel.cs
@@ -596,32 +596,32 @@ public int GeneratedAchievementCount
             private set { SetValue(GeneratedAchievementCountProperty, value); }
         }
 
-        public static readonly ModelProperty CoreAchievementCountProperty = ModelProperty.Register(typeof(GameViewModel), "CoreAchievementCount", typeof(int), 0);
-        public int CoreAchievementCount
+        public static readonly ModelProperty PromotedAchievementCountProperty = ModelProperty.Register(typeof(GameViewModel), "PromotedAchievementCount", typeof(int), 0);
+        public int PromotedAchievementCount
         {
-            get { return (int)GetValue(CoreAchievementCountProperty); }
-            private set { SetValue(CoreAchievementCountProperty, value); }
+            get { return (int)GetValue(PromotedAchievementCountProperty); }
+            private set { SetValue(PromotedAchievementCountProperty, value); }
         }
 
-        public static readonly ModelProperty CoreAchievementPointsProperty = ModelProperty.Register(typeof(GameViewModel), "CoreAchievementPoints", typeof(int), 0);
-        public int CoreAchievementPoints
+        public static readonly ModelProperty PromotedAchievementPointsProperty = ModelProperty.Register(typeof(GameViewModel), "PromotedAchievementPoints", typeof(int), 0);
+        public int PromotedAchievementPoints
         {
-            get { return (int)GetValue(CoreAchievementPointsProperty); }
-            private set { SetValue(CoreAchievementPointsProperty, value); }
+            get { return (int)GetValue(PromotedAchievementPointsProperty); }
+            private set { SetValue(PromotedAchievementPointsProperty, value); }
         }
 
-        public static readonly ModelProperty UnofficialAchievementCountProperty = ModelProperty.Register(typeof(GameViewModel), "UnofficialAchievementCount", typeof(int), 0);
-        public int UnofficialAchievementCount
+        public static readonly ModelProperty UnpromotedAchievementCountProperty = ModelProperty.Register(typeof(GameViewModel), "UnpromotedAchievementCount", typeof(int), 0);
+        public int UnpromotedAchievementCount
         {
-            get { return (int)GetValue(UnofficialAchievementCountProperty); }
-            private set { SetValue(UnofficialAchievementCountProperty, value); }
+            get { return (int)GetValue(UnpromotedAchievementCountProperty); }
+            private set { SetValue(UnpromotedAchievementCountProperty, value); }
         }
 
-        public static readonly ModelProperty UnofficialAchievementPointsProperty = ModelProperty.Register(typeof(GameViewModel), "UnofficialAchievementPoints", typeof(int), 0);
-        public int UnofficialAchievementPoints
+        public static readonly ModelProperty UnpromotedAchievementPointsProperty = ModelProperty.Register(typeof(GameViewModel), "UnpromotedAchievementPoints", typeof(int), 0);
+        public int UnpromotedAchievementPoints
         {
-            get { return (int)GetValue(UnofficialAchievementPointsProperty); }
-            private set { SetValue(UnofficialAchievementPointsProperty, value); }
+            get { return (int)GetValue(UnpromotedAchievementPointsProperty); }
+            private set { SetValue(UnpromotedAchievementPointsProperty, value); }
         }
 
         public static readonly ModelProperty LocalAchievementCountProperty = ModelProperty.Register(typeof(GameViewModel), "LocalAchievementCount", typeof(int), 0);
@@ -663,34 +663,34 @@ private void ReadPublished()
             var fileName = Path.Combine(RACacheDirectory, GameId + ".json");
             var publishedAssets = new PublishedAssets(fileName, _fileSystemService);
 
-            var coreCount = 0;
-            var corePoints = 0;
-            var unofficialCount = 0;
-            var unofficialPoints = 0;
+            var promotedCount = 0;
+            var promotedPoints = 0;
+            var unpromotedCount = 0;
+            var unpromotedPoints = 0;
             foreach (var achievement in publishedAssets.Achievements)
             {
                 if (achievement.Category == 3)
                 {
-                    coreCount++;
-                    corePoints += achievement.Points;
+                    promotedCount++;
+                    promotedPoints += achievement.Points;
                 }
                 else
                 {
-                    unofficialCount++;
-                    unofficialPoints += achievement.Points;
+                    unpromotedCount++;
+                    unpromotedPoints += achievement.Points;
                 }
             }
 
-            CoreAchievementCount = coreCount;
-            CoreAchievementPoints = corePoints;
-            UnofficialAchievementCount = unofficialCount;
-            UnofficialAchievementPoints = unofficialPoints;
+            PromotedAchievementCount = promotedCount;
+            PromotedAchievementPoints = promotedPoints;
+            UnpromotedAchievementCount = unpromotedCount;
+            UnpromotedAchievementPoints = unpromotedPoints;
 
             Title = publishedAssets.Title;
             ConsoleId = publishedAssets.ConsoleId;
 
-            _logger.WriteVerbose(String.Format("Identified {0} core achievements ({1} points)", coreCount, corePoints));
-            _logger.WriteVerbose(String.Format("Identified {0} unofficial achievements ({1} points)", unofficialCount, unofficialPoints));
+            _logger.WriteVerbose(String.Format("Identified {0} promoted achievements ({1} points)", promotedCount, promotedPoints));
+            _logger.WriteVerbose(String.Format("Identified {0} unpromoted achievements ({1} points)", unpromotedCount, unpromotedPoints));
 
             publishedAssets.LoadNotes();
             Notes = publishedAssets.Notes;
diff --git a/Source/ViewModels/NewScriptDialogViewModel.cs b/Source/ViewModels/NewScriptDialogViewModel.cs
index b83b3b49..e7764828 100644
--- a/Source/ViewModels/NewScriptDialogViewModel.cs
+++ b/Source/ViewModels/NewScriptDialogViewModel.cs
@@ -156,7 +156,7 @@ private void LoadGame(int gameId, string raCacheDirectory)
 
         private void LoadAchievements()
         {
-            var unofficialAchievements = new List<DumpAsset>();
+            var unpromotedAchievements = new List<DumpAsset>();
             foreach (var publishedAchievement in _publishedAssets.Achievements)
             {
                 var dumpAchievement = new DumpAsset(publishedAchievement.Id, publishedAchievement.Title)
@@ -166,11 +166,11 @@ private void LoadAchievements()
                     ViewerType = "Achievement",
                 };
 
-                if (publishedAchievement.IsUnofficial)
+                if (publishedAchievement.IsUnpromoted)
                 {
-                    dumpAchievement.IsUnofficial = true;
-                    dumpAchievement.ViewerType = "Unofficial Achievement";
-                    unofficialAchievements.Add(dumpAchievement);
+                    dumpAchievement.IsUnpromoted = true;
+                    dumpAchievement.ViewerType = "Unpromoted Achievement";
+                    unpromotedAchievements.Add(dumpAchievement);
                 }
                 else
                 {
@@ -181,15 +181,15 @@ private void LoadAchievements()
                 dumpAchievement.PropertyChanged += DumpAsset_PropertyChanged;
             }
 
-            foreach (var unofficialAchievement in unofficialAchievements)
-                _assets.Add(unofficialAchievement);
+            foreach (var unpromotedAchievement in unpromotedAchievements)
+                _assets.Add(unpromotedAchievement);
 
             foreach (var localAchievement in _localAssets.Achievements)
             {
                 var dumpAchievement = _assets.FirstOrDefault(a => a.Id == localAchievement.Id && a.Type == DumpAssetType.Achievement);
                 if (dumpAchievement != null)
                 {
-                    dumpAchievement.IsUnofficial = true;
+                    dumpAchievement.IsUnpromoted = true;
                     dumpAchievement.ViewerType = "Local Achievement";
                 }
                 else
@@ -199,7 +199,7 @@ private void LoadAchievements()
                         Type = DumpAssetType.Achievement,
                         ViewerImage = "/RATools;component/Resources/achievement.png",
                         ViewerType = "Local Achievement",
-                        IsUnofficial = true
+                        IsUnpromoted = true
                     };
 
                     dumpAchievement.PropertyChanged += DumpAsset_PropertyChanged;
@@ -230,7 +230,7 @@ private void LoadLeaderboards()
                 var dumpLeaderboard = _assets.FirstOrDefault(a => a.Id == localLeaderboard.Id && a.Type == DumpAssetType.Leaderboard);
                 if (dumpLeaderboard != null)
                 {
-                    dumpLeaderboard.IsUnofficial = true;
+                    dumpLeaderboard.IsUnpromoted = true;
                     dumpLeaderboard.ViewerType = "Local Leaderboard";
                 }
                 else
@@ -240,7 +240,7 @@ private void LoadLeaderboards()
                         Type = DumpAssetType.Achievement,
                         ViewerImage = "/RATools;component/Resources/leaderboard.png",
                         ViewerType = "Local Leaderboard",
-                        IsUnofficial = true
+                        IsUnpromoted = true
                     };
 
                     dumpLeaderboard.PropertyChanged += DumpAsset_PropertyChanged;
@@ -479,7 +479,7 @@ public DumpAsset(int id, string label)
                 MemoryAddresses = new List<MemoryItem>();
             }
 
-            public bool IsUnofficial { get; set; }
+            public bool IsUnpromoted { get; set; }
 
             public DumpAssetType Type { get; set; }
 
diff --git a/Source/ViewModels/ViewerViewModelBase.cs b/Source/ViewModels/ViewerViewModelBase.cs
index c7deb7d6..29464bc6 100644
--- a/Source/ViewModels/ViewerViewModelBase.cs
+++ b/Source/ViewModels/ViewerViewModelBase.cs
@@ -99,7 +99,7 @@ public enum GeneratedCompareState
         None = 0,
 
         /// <summary>
-        ///   published by not generated or generated matches core and/or local. no icon
+        ///   published but not generated or generated matches published and/or local. no icon
         /// </summary>
         Same,
 
diff --git a/Source/Views/AssetViewer.xaml b/Source/Views/AssetViewer.xaml
index 0bfc14ee..21dd2d52 100644
--- a/Source/Views/AssetViewer.xaml
+++ b/Source/Views/AssetViewer.xaml
@@ -96,10 +96,10 @@
             <DataTrigger Binding="{Binding Id}" Value="0">
                 <Setter Property="Visibility" Value="Collapsed" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Published.IsUnofficial}" Value="True">
+            <DataTrigger Binding="{Binding Published.Asset.IsUnpromoted}" Value="True">
                 <Setter Property="Text">
                     <Setter.Value>
-                        <Binding StringFormat="{}ID: {0} (Unofficial)" Path="Id" />
+                        <Binding StringFormat="{}ID: {0} (Unpromoted)" Path="Id" />
                     </Setter.Value>
                 </Setter>
             </DataTrigger>
diff --git a/Source/Views/ConditionsAnalyzerDialog.xaml b/Source/Views/ConditionsAnalyzerDialog.xaml
index 06d60272..ace7471b 100644
--- a/Source/Views/ConditionsAnalyzerDialog.xaml
+++ b/Source/Views/ConditionsAnalyzerDialog.xaml
@@ -89,8 +89,8 @@
         <TextBlock Grid.Row="1" Text="Scan:" />
         <StackPanel Grid.Row="1" Grid.Column="1">
             <StackPanel Orientation="Horizontal">
-                <CheckBox Content="Core Achievements" IsChecked="{Binding IsCoreAchievementsScanned}" Margin="6,0,6,0" />
-                <CheckBox Content="Non-Core Achievements" IsChecked="{Binding IsNonCoreAchievementsScanned}" Margin="6,0,6,0" />
+                <CheckBox Content="Promoted Achievements" IsChecked="{Binding IsPromotedAchievementsScanned}" Margin="6,0,6,0" />
+                <CheckBox Content="Unpromoted Achievements" IsChecked="{Binding IsUnpromotedAchievementsScanned}" Margin="6,0,6,0" />
                 <CheckBox Content="Rich Presence" IsChecked="{Binding IsRichPresenceScanned}" Margin="6,0,6,0" />
                 <CheckBox Content="Leaderboard Start" IsChecked="{Binding IsLeaderboardStartScanned}" Margin="6,0,6,0" />
                 <CheckBox Content="Leaderboard Submit" IsChecked="{Binding IsLeaderboardSubmitScanned}" Margin="6,0,6,0" />
@@ -146,7 +146,7 @@
                                     <TextBlock.Style>
                                         <Style TargetType="{x:Type TextBlock}">
                                             <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsUnofficial}" Value="True">
+                                                <DataTrigger Binding="{Binding IsUnpromoted}" Value="True">
                                                     <DataTrigger.Setters>
                                                         <Setter Property="FontStyle" Value="Italic" />
                                                     </DataTrigger.Setters>
diff --git a/Source/Views/GameViewer.xaml b/Source/Views/GameViewer.xaml
index 3240d0ca..37acd192 100644
--- a/Source/Views/GameViewer.xaml
+++ b/Source/Views/GameViewer.xaml
@@ -182,32 +182,32 @@
                         <TextBlock.Style>
                             <Style TargetType="{x:Type TextBlock}">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding CoreAchievementCount}" Value="0">
+                                    <DataTrigger Binding="{Binding PromotedAchievementCount}" Value="0">
                                         <Setter Property="Visibility" Value="Collapsed" />
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </TextBlock.Style>
-                        <Run Text="Core(" />
-                        <TextBlock Text="{Binding CoreAchievementCount}" Margin="-3,0,-3,0" />                        
+                        <Run Text="Promoted(" />
+                        <TextBlock Text="{Binding PromotedAchievementCount}" Margin="-3,0,-3,0" />                        
                         <Run Text="): " />
-                        <TextBlock Text="{Binding CoreAchievementPoints, FallbackValue=0}" Margin="-3,0,-3,0" />
+                        <TextBlock Text="{Binding PromotedAchievementPoints, FallbackValue=0}" Margin="-3,0,-3,0" />
                         <Run Text="pts" />
                     </TextBlock>
                     <TextBlock Grid.Column="1" Margin="4,0,4,0">
                         <TextBlock.Style>
                             <Style TargetType="{x:Type TextBlock}">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding UnofficialAchievementCount}" Value="0">
+                                    <DataTrigger Binding="{Binding UnpromotedAchievementCount}" Value="0">
                                         <Setter Property="Visibility" Value="Collapsed" />
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </TextBlock.Style>
-                        <Run Text="Unofficial(" />
-                        <TextBlock Text="{Binding UnofficialAchievementCount}" Margin="-3,0,-3,0" />
+                        <Run Text="Unpromoted(" />
+                        <TextBlock Text="{Binding UnpromotedAchievementCount}" Margin="-3,0,-3,0" />
                         <Run Text="): " />
-                        <TextBlock Text="{Binding UnofficialAchievementPoints, FallbackValue=0}" Margin="-3,0,-3,0" />
+                        <TextBlock Text="{Binding UnpromotedAchievementPoints, FallbackValue=0}" Margin="-3,0,-3,0" />
                         <Run Text="pts" />
                     </TextBlock>
                     <TextBlock Grid.Column="2" Margin="4,0,4,0" ToolTip="{Binding LocalFilePath}">
diff --git a/Source/Views/NewScriptDialog.xaml b/Source/Views/NewScriptDialog.xaml
index 093139de..b2d1b1b4 100644
--- a/Source/Views/NewScriptDialog.xaml
+++ b/Source/Views/NewScriptDialog.xaml
@@ -68,7 +68,7 @@
                             <TextBlock.Style>
                                 <Style TargetType="{x:Type TextBlock}">
                                     <Style.Triggers>
-                                        <DataTrigger Binding="{Binding IsUnofficial}" Value="True">
+                                        <DataTrigger Binding="{Binding IsUnpromoted}" Value="True">
                                             <Setter Property="FontStyle" Value="Italic" />
                                         </DataTrigger>
                                     </Style.Triggers>
diff --git a/Tests/ViewModels/AssetViewModelBaseTests.cs b/Tests/ViewModels/AssetViewModelBaseTests.cs
index e445f14b..69e24403 100644
--- a/Tests/ViewModels/AssetViewModelBaseTests.cs
+++ b/Tests/ViewModels/AssetViewModelBaseTests.cs
@@ -113,7 +113,7 @@ public void TestInitialization()
         }
 
         [Test]
-        public void TestRefreshCoreNotGenerated()
+        public void TestRefreshPromotedNotGenerated()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -137,11 +137,11 @@ public void TestRefreshCoreNotGenerated()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Core (Not generated)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Promoted (Not generated)"));
         }
 
         [Test]
-        public void TestRefreshUnofficialNotGenerated()
+        public void TestRefreshUnpromotedNotGenerated()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -166,7 +166,7 @@ public void TestRefreshUnofficialNotGenerated()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Unpublished (Not generated)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Unpromoted (Not generated)"));
         }
 
         [Test]
@@ -198,7 +198,7 @@ public void TestRefreshLocalNotGenerated()
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsCore()
+        public void TestRefreshGeneratedSameAsPromoted()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1235, "TitleG", "DescriptionG")
@@ -230,11 +230,11 @@ public void TestRefreshGeneratedSameAsCore()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1235"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Core)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Promoted)"));
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsUnofficial()
+        public void TestRefreshGeneratedSameAsUnpromoted()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1235, "TitleG", "DescriptionG")
@@ -267,7 +267,7 @@ public void TestRefreshGeneratedSameAsUnofficial()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1235"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Unpublished)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Unpromoted)"));
         }
 
         [Test]
@@ -304,7 +304,7 @@ public void TestRefreshGenerationFailedWithCore()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.InstanceOf<TriggerViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Core (Generation failed)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Promoted (Generation failed)"));
         }
 
         [Test]
@@ -373,7 +373,7 @@ public void TestRefreshGeneratedDiffersFromLocal()
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsLocalButNotCore()
+        public void TestRefreshGeneratedSameAsLocalButNotPromoted()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1235, "TitleP", "DescriptionP")
@@ -398,7 +398,7 @@ public void TestRefreshGeneratedSameAsLocalButNotCore()
             Assert.That(vmAsset.IsDescriptionModified, Is.True);
             Assert.That(vmAsset.BadgeName, Is.EqualTo("Badge"));
             Assert.That(vmAsset.CompareState, Is.EqualTo(GeneratedCompareState.PublishedDiffers));
-            Assert.That(vmAsset.ModificationMessage, Is.EqualTo("Core differs from generated"));
+            Assert.That(vmAsset.ModificationMessage, Is.EqualTo("Promoted differs from generated"));
             Assert.That(vmAsset.IsGenerated, Is.True);
             Assert.That(vmAsset.CanUpdate, Is.False);
             Assert.That(vmAsset.Other, Is.SameAs(vmAsset.Published));
@@ -409,7 +409,7 @@ public void TestRefreshGeneratedSameAsLocalButNotCore()
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsLocalButNotUnofficial()
+        public void TestRefreshGeneratedSameAsLocalButNotUnpromoted()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1235, "TitleP", "DescriptionP")
@@ -435,7 +435,7 @@ public void TestRefreshGeneratedSameAsLocalButNotUnofficial()
             Assert.That(vmAsset.IsDescriptionModified, Is.True);
             Assert.That(vmAsset.BadgeName, Is.EqualTo("Badge"));
             Assert.That(vmAsset.CompareState, Is.EqualTo(GeneratedCompareState.PublishedDiffers));
-            Assert.That(vmAsset.ModificationMessage, Is.EqualTo("Unpublished differs from generated"));
+            Assert.That(vmAsset.ModificationMessage, Is.EqualTo("Unpromoted differs from generated"));
             Assert.That(vmAsset.IsGenerated, Is.True);
             Assert.That(vmAsset.CanUpdate, Is.False);
             Assert.That(vmAsset.Other, Is.SameAs(vmAsset.Published));
@@ -446,7 +446,7 @@ public void TestRefreshGeneratedSameAsLocalButNotUnofficial()
         }
 
         [Test]
-        public void TestRefreshGeneratedNotInLocalDiffersFromCore()
+        public void TestRefreshGeneratedNotInLocalDiffersFromPromoted()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1235, "TitleP", "DescriptionP")
@@ -468,7 +468,7 @@ public void TestRefreshGeneratedNotInLocalDiffersFromCore()
             Assert.That(vmAsset.IsDescriptionModified, Is.True);
             Assert.That(vmAsset.BadgeName, Is.EqualTo("Badge"));
             Assert.That(vmAsset.CompareState, Is.EqualTo(GeneratedCompareState.LocalDiffers));
-            Assert.That(vmAsset.ModificationMessage, Is.EqualTo("Unpublished differs from generated"));
+            Assert.That(vmAsset.ModificationMessage, Is.EqualTo("Unpromoted differs from generated"));
             Assert.That(vmAsset.IsGenerated, Is.True);
             Assert.That(vmAsset.CanUpdate, Is.True);
             Assert.That(vmAsset.Other, Is.SameAs(vmAsset.Published));
@@ -507,7 +507,7 @@ public void TestRefreshGeneratedNotInLocal()
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsCoreNotInLocal()
+        public void TestRefreshGeneratedSameAsPromotedNotInLocal()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -535,11 +535,11 @@ public void TestRefreshGeneratedSameAsCoreNotInLocal()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Core, not in Local)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Promoted, not in Local)"));
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsUnofficialNotInLocal()
+        public void TestRefreshGeneratedSameAsUnpromotedNotInLocal()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -568,7 +568,7 @@ public void TestRefreshGeneratedSameAsUnofficialNotInLocal()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Unpublished, not in Local)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Unpromoted, not in Local)"));
         }
 
         [Test]
@@ -604,7 +604,7 @@ public void TestRefreshGeneratedSameAsLocal()
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsCoreAndLocal()
+        public void TestRefreshGeneratedSameAsPromotedAndLocal()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -636,11 +636,11 @@ public void TestRefreshGeneratedSameAsCoreAndLocal()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Core and Local)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Promoted and Local)"));
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsCoreAndLocalExceptBadge()
+        public void TestRefreshGeneratedSameAsPromotedAndLocalExceptBadge()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -672,11 +672,11 @@ public void TestRefreshGeneratedSameAsCoreAndLocalExceptBadge()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Core and Local)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Promoted and Local)"));
         }
 
         [Test]
-        public void TestRefreshGeneratedSameAsUnofficialAndLocal()
+        public void TestRefreshGeneratedSameAsUnpromotedAndLocal()
         {
             var vmAsset = new AssetViewModelBaseHarness();
             vmAsset.Published.Asset = new TestAchievement(1234, "Title", "Description")
@@ -709,7 +709,7 @@ public void TestRefreshGeneratedSameAsUnofficialAndLocal()
             Assert.That(vmAsset.Triggers.Count(), Is.EqualTo(1));
             Assert.That(vmAsset.Triggers.ElementAt(0), Is.Not.InstanceOf<TriggerComparisonViewModel>());
             Assert.That(vmAsset.Triggers.ElementAt(0).Label, Is.EqualTo("Trigger1234"));
-            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Unpublished and Local)"));
+            Assert.That(vmAsset.TriggerSource, Is.EqualTo("Generated (Same as Unpromoted and Local)"));
         }
     }
 }
diff --git a/Tests/ViewModels/GameViewModelTests.cs b/Tests/ViewModels/GameViewModelTests.cs
index 09dfdd56..9ea6caa4 100644
--- a/Tests/ViewModels/GameViewModelTests.cs
+++ b/Tests/ViewModels/GameViewModelTests.cs
@@ -105,10 +105,10 @@ public void TestInitialization()
             Assert.That(vmGame.CompileProgress, Is.EqualTo(0));
             Assert.That(vmGame.CompileProgressLine, Is.EqualTo(0));
             Assert.That(vmGame.GeneratedAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.CoreAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.CoreAchievementPoints, Is.EqualTo(0));
-            Assert.That(vmGame.UnofficialAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.UnofficialAchievementPoints, Is.EqualTo(0));
+            Assert.That(vmGame.PromotedAchievementCount, Is.EqualTo(0));
+            Assert.That(vmGame.PromotedAchievementPoints, Is.EqualTo(0));
+            Assert.That(vmGame.UnpromotedAchievementCount, Is.EqualTo(0));
+            Assert.That(vmGame.UnpromotedAchievementPoints, Is.EqualTo(0));
             Assert.That(vmGame.LocalAchievementCount, Is.EqualTo(0));
             Assert.That(vmGame.LocalAchievementPoints, Is.EqualTo(0));
         }
@@ -196,10 +196,10 @@ public void TestPopulateEditorListNull()
             Assert.That(vmGame.SelectedEditor, Is.SameAs(vmGame.Script));
             Assert.That(vmGame.Notes, Is.Not.Null.And.Empty);
             Assert.That(vmGame.GeneratedAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.CoreAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.CoreAchievementPoints, Is.EqualTo(0));
-            Assert.That(vmGame.UnofficialAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.UnofficialAchievementPoints, Is.EqualTo(0));
+            Assert.That(vmGame.PromotedAchievementCount, Is.EqualTo(0));
+            Assert.That(vmGame.PromotedAchievementPoints, Is.EqualTo(0));
+            Assert.That(vmGame.UnpromotedAchievementCount, Is.EqualTo(0));
+            Assert.That(vmGame.UnpromotedAchievementPoints, Is.EqualTo(0));
             Assert.That(vmGame.LocalAchievementCount, Is.EqualTo(0));
             Assert.That(vmGame.LocalAchievementPoints, Is.EqualTo(0));
         }
@@ -346,10 +346,10 @@ public void TestReadPublished()
             Assert.That(ach234.LastModified, Is.EqualTo(new DateTime(2021, 07, 09, 04, 44, 13, DateTimeKind.Utc)));
 
             Assert.That(vmGame.GeneratedAchievementCount, Is.EqualTo(0));
-            Assert.That(vmGame.CoreAchievementCount, Is.EqualTo(1));
-            Assert.That(vmGame.CoreAchievementPoints, Is.EqualTo(6));
-            Assert.That(vmGame.UnofficialAchievementCount, Is.EqualTo(1));
-            Assert.That(vmGame.UnofficialAchievementPoints, Is.EqualTo(3));
+            Assert.That(vmGame.PromotedAchievementCount, Is.EqualTo(1));
+            Assert.That(vmGame.PromotedAchievementPoints, Is.EqualTo(6));
+            Assert.That(vmGame.UnpromotedAchievementCount, Is.EqualTo(1));
+            Assert.That(vmGame.UnpromotedAchievementPoints, Is.EqualTo(3));
             Assert.That(vmGame.LocalAchievementCount, Is.EqualTo(0));
             Assert.That(vmGame.LocalAchievementPoints, Is.EqualTo(0));
         }