diff --git a/PCK-Studio/Forms/AppSettingsForm.cs b/PCK-Studio/Forms/AppSettingsForm.cs
index 81fa8cf3..5f66dd87 100644
--- a/PCK-Studio/Forms/AppSettingsForm.cs
+++ b/PCK-Studio/Forms/AppSettingsForm.cs
@@ -15,7 +15,6 @@ namespace PckStudio.Forms
     public partial class AppSettingsForm : MetroForm
     {
         private ApplicationSettingsBase _applicationSettings;
-        internal const string keyToStringContextKey = "keyToString";
 
         public AppSettingsForm()
             : this("Application Settings", Settings.Default, new Dictionary<string, string>()
@@ -36,8 +35,8 @@ namespace PckStudio.Forms
             InitializeComponent();
             Text = title;
             _applicationSettings = applicationSettings;
-            if (keyToStringMap is not null && !_applicationSettings.Context.ContainsKey(SettingsManager.KeyToStringContextKeyConst))
-                _applicationSettings.Context.Add(SettingsManager.KeyToStringContextKeyConst, keyToStringMap);
+            if (keyToStringMap is not null && !_applicationSettings.Context.ContainsKey(SettingsManager.KEY_FOR_CONTEXT))
+                _applicationSettings.Context.Add(SettingsManager.KEY_FOR_CONTEXT, keyToStringMap);
             LoadSettings();
         }
 
@@ -45,8 +44,8 @@ namespace PckStudio.Forms
         {
             value = default;
             return
-                context.ContainsKey(SettingsManager.KeyToStringContextKeyConst) &&
-                context[SettingsManager.KeyToStringContextKeyConst] is Dictionary<string, string> keyToString &&
+                context.ContainsKey(SettingsManager.KEY_FOR_CONTEXT) &&
+                context[SettingsManager.KEY_FOR_CONTEXT] is Dictionary<string, string> keyToString &&
                 keyToString.TryGetValue(key, out value);
         }
 
@@ -110,6 +109,7 @@ namespace PckStudio.Forms
         Dictionary<Type, ControlCreateDelegate> _typeToControl = new Dictionary<Type, ControlCreateDelegate>()
         {
             [typeof(bool)] = CreateCheckBox,
+            //! TODO(null): remove ConsolePlatform.Unknown from selection
             [typeof(ConsolePlatform)] = CreateEnumComboBox,
             [typeof(AppLanguage)] = CreateEnumComboBox,
         };
diff --git a/PckStudio.Core/App/SettingsManager.cs b/PckStudio.Core/App/SettingsManager.cs
index 3559138d..f365fcc3 100644
--- a/PckStudio.Core/App/SettingsManager.cs
+++ b/PckStudio.Core/App/SettingsManager.cs
@@ -26,7 +26,7 @@ namespace PckStudio.Core.App
     {
         public bool IsReadOnly => _isReadOnly;
 
-        public const string KeyToStringContextKeyConst = "keyToString";
+        public const string KEY_FOR_CONTEXT = "keyToString";
 
         private Dictionary<string, Action<object>> _registery = new Dictionary<string, Action<object>>();
 
@@ -97,14 +97,14 @@ namespace PckStudio.Core.App
             if (_isReadOnly)
                 throw new SettingsPropertyIsReadOnlyException("Can't add setting. Underlying SettingsBase is readonly.");
 
-            if (!_settings.Context.ContainsKey(KeyToStringContextKeyConst))
-                _settings.Context.Add(KeyToStringContextKeyConst, new Dictionary<string, string>());
+            if (!_settings.Context.ContainsKey(KEY_FOR_CONTEXT))
+                _settings.Context.Add(KEY_FOR_CONTEXT, new Dictionary<string, string>());
             
             var settingsProperty = new SettingsProperty(
                 name, typeof(T), null, false, default(T), SettingsSerializeAs.String, null, false, false);
             _settings.Properties.Add(settingsProperty);
             _settings.PropertyValues.Add(new SettingsPropertyValue(settingsProperty) { PropertyValue = initialValue });
-            if (_settings.Context[KeyToStringContextKeyConst] is Dictionary<string, string> dict)
+            if (_settings.Context[KEY_FOR_CONTEXT] is Dictionary<string, string> dict)
                 dict.Add(name, description);
             callback(initialValue);
             return RegisterPropertyChangedCallback(name, callback);