diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs
index 052f6075..840eac27 100644
--- a/SafeExamBrowser.Client/ClientController.cs
+++ b/SafeExamBrowser.Client/ClientController.cs
@@ -359,7 +359,7 @@ namespace SafeExamBrowser.Client
 			timer.Interval = TEN_MINUTES + (new Random().NextDouble() * FIVE_MINUTES);
 			timer.Start();
 
-			registry.StartMonitoring(RegistryKey.MachineHive.EaseOfAccess_Key, RegistryKey.MachineHive.EaseOfAccess_Name);
+			registry.StartMonitoring(RegistryValue.MachineHive.EaseOfAccess_Key, RegistryValue.MachineHive.EaseOfAccess_Name);
 		}
 
 		private void VerifySessionIntegrity()
diff --git a/SafeExamBrowser.Runtime/Operations/SessionIntegrityOperation.cs b/SafeExamBrowser.Runtime/Operations/SessionIntegrityOperation.cs
index 455ce0d7..32fd9332 100644
--- a/SafeExamBrowser.Runtime/Operations/SessionIntegrityOperation.cs
+++ b/SafeExamBrowser.Runtime/Operations/SessionIntegrityOperation.cs
@@ -53,7 +53,7 @@ namespace SafeExamBrowser.Runtime.Operations
 
 			logger.Info($"Attempting to verify ease of access configuration...");
 
-			if (registry.TryRead(RegistryKey.MachineHive.EaseOfAccess_Key, RegistryKey.MachineHive.EaseOfAccess_Name, out var value))
+			if (registry.TryRead(RegistryValue.MachineHive.EaseOfAccess_Key, RegistryValue.MachineHive.EaseOfAccess_Name, out var value))
 			{
 				if (value == default || (value is string s && string.IsNullOrWhiteSpace(s)))
 				{
diff --git a/SafeExamBrowser.SystemComponents.Contracts/Registry/RegistryKey.cs b/SafeExamBrowser.SystemComponents.Contracts/Registry/RegistryValue.cs
similarity index 66%
rename from SafeExamBrowser.SystemComponents.Contracts/Registry/RegistryKey.cs
rename to SafeExamBrowser.SystemComponents.Contracts/Registry/RegistryValue.cs
index a52bb5f5..81d2f50e 100644
--- a/SafeExamBrowser.SystemComponents.Contracts/Registry/RegistryKey.cs
+++ b/SafeExamBrowser.SystemComponents.Contracts/Registry/RegistryValue.cs
@@ -9,13 +9,13 @@
 namespace SafeExamBrowser.SystemComponents.Contracts.Registry
 {
 	/// <summary>
-	/// Defines registry keys and names used in conjunction with <see cref="IRegistry"/>. Use the pattern "LogicalGroup_Key" resp. "LogicalGroup_Name"
-	/// to allow for a better overview over all keys, names and their usage (where applicable).
+	/// Defines registry values used in conjunction with <see cref="IRegistry"/>. Use the pattern "LogicalGroup_Key" resp. "LogicalGroup_Name" to
+	/// allow for a better overview over all values and their usage (where applicable).
 	/// </summary>
-	public static class RegistryKey
+	public static class RegistryValue
 	{
 		/// <summary>
-		/// All registry keys and names located in the machine hive.
+		/// All registry values located in the machine hive.
 		/// </summary>
 		public static class MachineHive
 		{
diff --git a/SafeExamBrowser.SystemComponents.Contracts/SafeExamBrowser.SystemComponents.Contracts.csproj b/SafeExamBrowser.SystemComponents.Contracts/SafeExamBrowser.SystemComponents.Contracts.csproj
index 59dfb14e..be96714b 100644
--- a/SafeExamBrowser.SystemComponents.Contracts/SafeExamBrowser.SystemComponents.Contracts.csproj
+++ b/SafeExamBrowser.SystemComponents.Contracts/SafeExamBrowser.SystemComponents.Contracts.csproj
@@ -78,7 +78,7 @@
     <Compile Include="PowerSupply\IPowerSupplyStatus.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Network\ConnectionStatus.cs" />
-    <Compile Include="Registry\RegistryKey.cs" />
+    <Compile Include="Registry\RegistryValue.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />