diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
index 259f2dda..4a6fbdbf 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
+++ b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
@@ -42,7 +42,7 @@ namespace SafeExamBrowser.Browser
 
 		private BrowserWindowSettings WindowSettings
 		{
-			get { return isMainInstance ? settings.MainWindowSettings : settings.AdditionalWindowSettings; }
+			get { return isMainInstance ? settings.MainWindow : settings.AdditionalWindow; }
 		}
 
 		public InstanceIdentifier Id { get; private set; }
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs
index 4cabd897..10f43543 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs
@@ -19,7 +19,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.MainWindowSettings.AllowAddressBar = allow;
+				settings.Browser.MainWindow.AllowAddressBar = allow;
 			}
 		}
 
@@ -27,7 +27,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.AdditionalWindowSettings.AllowAddressBar = allow;
+				settings.Browser.AdditionalWindow.AllowAddressBar = allow;
 			}
 		}
 
@@ -43,8 +43,8 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.MainWindowSettings.AllowDeveloperConsole = allow;
-				settings.Browser.AdditionalWindowSettings.AllowDeveloperConsole = allow;
+				settings.Browser.MainWindow.AllowDeveloperConsole = allow;
+				settings.Browser.AdditionalWindow.AllowDeveloperConsole = allow;
 			}
 		}
 
@@ -60,8 +60,8 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.MainWindowSettings.AllowBackwardNavigation = allow;
-				settings.Browser.MainWindowSettings.AllowForwardNavigation = allow;
+				settings.Browser.MainWindow.AllowBackwardNavigation = allow;
+				settings.Browser.MainWindow.AllowForwardNavigation = allow;
 			}
 		}
 
@@ -69,8 +69,8 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.AdditionalWindowSettings.AllowBackwardNavigation = allow;
-				settings.Browser.AdditionalWindowSettings.AllowForwardNavigation = allow;
+				settings.Browser.AdditionalWindow.AllowBackwardNavigation = allow;
+				settings.Browser.AdditionalWindow.AllowForwardNavigation = allow;
 			}
 		}
 
@@ -94,7 +94,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.MainWindowSettings.AllowReloading = allow;
+				settings.Browser.MainWindow.AllowReloading = allow;
 			}
 		}
 
@@ -102,7 +102,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool allow)
 			{
-				settings.Browser.AdditionalWindowSettings.AllowReloading = allow;
+				settings.Browser.AdditionalWindow.AllowReloading = allow;
 			}
 		}
 
@@ -164,7 +164,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 
 			if (value is int mode)
 			{
-				settings.Browser.MainWindowSettings.FullScreenMode = mode == FULLSCREEN;
+				settings.Browser.MainWindow.FullScreenMode = mode == FULLSCREEN;
 			}
 		}
 
@@ -172,7 +172,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool show)
 			{
-				settings.Browser.MainWindowSettings.ShowReloadWarning = show;
+				settings.Browser.MainWindow.ShowReloadWarning = show;
 			}
 		}
 
@@ -180,7 +180,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 		{
 			if (value is bool show)
 			{
-				settings.Browser.AdditionalWindowSettings.ShowReloadWarning = show;
+				settings.Browser.AdditionalWindow.ShowReloadWarning = show;
 			}
 		}
 
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
index 33f0b875..202e8b10 100644
--- a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
@@ -115,20 +115,20 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
 			settings.Browser.AllowDownloads = true;
 			settings.Browser.AllowPageZoom = true;
 			settings.Browser.AllowPopups = true;
-			settings.Browser.AdditionalWindowSettings.AllowAddressBar = false;
-			settings.Browser.AdditionalWindowSettings.AllowBackwardNavigation = true;
-			settings.Browser.AdditionalWindowSettings.AllowDeveloperConsole = false;
-			settings.Browser.AdditionalWindowSettings.AllowForwardNavigation = true;
-			settings.Browser.AdditionalWindowSettings.AllowReloading = true;
-			settings.Browser.AdditionalWindowSettings.FullScreenMode = false;
-			settings.Browser.AdditionalWindowSettings.ShowReloadWarning = false;
-			settings.Browser.MainWindowSettings.AllowAddressBar = false;
-			settings.Browser.MainWindowSettings.AllowBackwardNavigation = false;
-			settings.Browser.MainWindowSettings.AllowDeveloperConsole = false;
-			settings.Browser.MainWindowSettings.AllowForwardNavigation = false;
-			settings.Browser.MainWindowSettings.AllowReloading = true;
-			settings.Browser.MainWindowSettings.FullScreenMode = false;
-			settings.Browser.MainWindowSettings.ShowReloadWarning = true;
+			settings.Browser.AdditionalWindow.AllowAddressBar = false;
+			settings.Browser.AdditionalWindow.AllowBackwardNavigation = true;
+			settings.Browser.AdditionalWindow.AllowDeveloperConsole = false;
+			settings.Browser.AdditionalWindow.AllowForwardNavigation = true;
+			settings.Browser.AdditionalWindow.AllowReloading = true;
+			settings.Browser.AdditionalWindow.FullScreenMode = false;
+			settings.Browser.AdditionalWindow.ShowReloadWarning = false;
+			settings.Browser.MainWindow.AllowAddressBar = false;
+			settings.Browser.MainWindow.AllowBackwardNavigation = false;
+			settings.Browser.MainWindow.AllowDeveloperConsole = false;
+			settings.Browser.MainWindow.AllowForwardNavigation = false;
+			settings.Browser.MainWindow.AllowReloading = true;
+			settings.Browser.MainWindow.FullScreenMode = false;
+			settings.Browser.MainWindow.ShowReloadWarning = true;
 
 			settings.Keyboard.AllowAltEsc = false;
 			settings.Keyboard.AllowAltF4 = false;
diff --git a/SafeExamBrowser.Settings/Browser/BrowserFilterSettings.cs b/SafeExamBrowser.Settings/Browser/BrowserFilterSettings.cs
index b6545759..698b5928 100644
--- a/SafeExamBrowser.Settings/Browser/BrowserFilterSettings.cs
+++ b/SafeExamBrowser.Settings/Browser/BrowserFilterSettings.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 namespace SafeExamBrowser.Settings.Browser
 {
 	/// <summary>
-	/// Defines all configuration options for the request filter of the browser.
+	/// Defines all settings for the request filter of the browser.
 	/// </summary>
 	[Serializable]
 	public class BrowserFilterSettings
diff --git a/SafeExamBrowser.Settings/Browser/BrowserSettings.cs b/SafeExamBrowser.Settings/Browser/BrowserSettings.cs
index b6e2db36..c90e0800 100644
--- a/SafeExamBrowser.Settings/Browser/BrowserSettings.cs
+++ b/SafeExamBrowser.Settings/Browser/BrowserSettings.cs
@@ -11,15 +11,15 @@ using System;
 namespace SafeExamBrowser.Settings.Browser
 {
 	/// <summary>
-	/// Defines all configuration options for the browser engine of the application.
+	/// Defines all settings for the browser engine of the application.
 	/// </summary>
 	[Serializable]
 	public class BrowserSettings
 	{
 		/// <summary>
-		/// The configuration to be used for additional browser windows.
+		/// The settings to be used for additional browser windows.
 		/// </summary>
-		public BrowserWindowSettings AdditionalWindowSettings { get; set; }
+		public BrowserWindowSettings AdditionalWindow { get; set; }
 
 		/// <summary>
 		/// Determines whether the user will be allowed to download configuration files.
@@ -52,9 +52,9 @@ namespace SafeExamBrowser.Settings.Browser
 		public BrowserFilterSettings Filter { get; set; }
 
 		/// <summary>
-		/// The configuration to be used for the main browser window.
+		/// The settings to be used for the main browser window.
 		/// </summary>
-		public BrowserWindowSettings MainWindowSettings { get; set; }
+		public BrowserWindowSettings MainWindow { get; set; }
 		
 		/// <summary>
 		/// The URL with which the main browser window will be loaded.
@@ -68,9 +68,9 @@ namespace SafeExamBrowser.Settings.Browser
 
 		public BrowserSettings()
 		{
-			AdditionalWindowSettings = new BrowserWindowSettings();
+			AdditionalWindow = new BrowserWindowSettings();
 			Filter = new BrowserFilterSettings();
-			MainWindowSettings = new BrowserWindowSettings();
+			MainWindow = new BrowserWindowSettings();
 		}
 	}
 }
diff --git a/SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs b/SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs
index 811473fa..62d327ed 100644
--- a/SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs
+++ b/SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs
@@ -11,7 +11,7 @@ using System;
 namespace SafeExamBrowser.Settings.Browser
 {
 	/// <summary>
-	/// Defines all configuration options for a window of the browser engine.
+	/// Defines all settings for a window of the browser engine.
 	/// </summary>
 	[Serializable]
 	public class BrowserWindowSettings
diff --git a/SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs b/SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs
index 9a19c243..496e9006 100644
--- a/SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs
+++ b/SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs
@@ -11,7 +11,7 @@ using System;
 namespace SafeExamBrowser.Settings.Monitoring
 {
 	/// <summary>
-	/// Defines all configuration options for monitoring keyboard input.
+	/// Defines all settings for monitoring keyboard input.
 	/// </summary>
 	[Serializable]
 	public class KeyboardSettings
diff --git a/SafeExamBrowser.Settings/Monitoring/MouseSettings.cs b/SafeExamBrowser.Settings/Monitoring/MouseSettings.cs
index 9883a76e..827f100e 100644
--- a/SafeExamBrowser.Settings/Monitoring/MouseSettings.cs
+++ b/SafeExamBrowser.Settings/Monitoring/MouseSettings.cs
@@ -11,7 +11,7 @@ using System;
 namespace SafeExamBrowser.Settings.Monitoring
 {
 	/// <summary>
-	/// Defines all configuration options for monitoring mouse input.
+	/// Defines all settings for monitoring mouse input.
 	/// </summary>
 	[Serializable]
 	public class MouseSettings
diff --git a/SafeExamBrowser.Settings/Service/ServiceSettings.cs b/SafeExamBrowser.Settings/Service/ServiceSettings.cs
index ff7d9463..16963200 100644
--- a/SafeExamBrowser.Settings/Service/ServiceSettings.cs
+++ b/SafeExamBrowser.Settings/Service/ServiceSettings.cs
@@ -9,7 +9,7 @@
 namespace SafeExamBrowser.Settings.Service
 {
 	/// <summary>
-	/// Defines all configuration options for the service application component.
+	/// Defines all settings for the service application component.
 	/// </summary>
 	public class ServiceSettings
 	{
diff --git a/SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs b/SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs
index 69f6f1ba..2d95ceb1 100644
--- a/SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs
+++ b/SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs
@@ -11,7 +11,7 @@ using System;
 namespace SafeExamBrowser.Settings.SystemComponents
 {
 	/// <summary>
-	/// Defines all configuration options for the audio device of the computer.
+	/// Defines all settings for the audio device of the computer.
 	/// </summary>
 	[Serializable]
 	public class AudioSettings
diff --git a/SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs b/SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs
index 74bf3496..6d22f96e 100644
--- a/SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs
+++ b/SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs
@@ -11,7 +11,7 @@ using System;
 namespace SafeExamBrowser.Settings.UserInterface
 {
 	/// <summary>
-	/// Defines all configuration options for the action center.
+	/// Defines all settings for the action center.
 	/// </summary>
 	[Serializable]
 	public class ActionCenterSettings
diff --git a/SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs b/SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs
index f450eac7..5395fdaa 100644
--- a/SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs
+++ b/SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs
@@ -11,7 +11,7 @@ using System;
 namespace SafeExamBrowser.Settings.UserInterface
 {
 	/// <summary>
-	/// Defines all configuration options for the taskbar.
+	/// Defines all settings for the taskbar.
 	/// </summary>
 	[Serializable]
 	public class TaskbarSettings
diff --git a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs
index bed06c1b..b1fd3b1a 100644
--- a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs
@@ -35,7 +35,7 @@ namespace SafeExamBrowser.UserInterface.Desktop
 
 		private BrowserWindowSettings WindowSettings
 		{
-			get { return isMainWindow ? settings.MainWindowSettings : settings.AdditionalWindowSettings; }
+			get { return isMainWindow ? settings.MainWindow : settings.AdditionalWindow; }
 		}
 
 		public bool CanNavigateBackwards { set => Dispatcher.Invoke(() => BackwardButton.IsEnabled = value); }
diff --git a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs
index dc9cfcf2..c61a6852 100644
--- a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs
@@ -35,7 +35,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 
 		private BrowserWindowSettings WindowSettings
 		{
-			get { return isMainWindow ? settings.MainWindowSettings : settings.AdditionalWindowSettings; }
+			get { return isMainWindow ? settings.MainWindow : settings.AdditionalWindow; }
 		}
 
 		public bool CanNavigateBackwards { set => Dispatcher.Invoke(() => BackwardButton.IsEnabled = value); }