@@ -15,18 +15,18 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFWindowsRegistryKey";
+static OFString *const module = @"OFWindowsRegistryKey";
 
 @implementation TestsAppDelegate (OFWindowsRegistryKeyTests)
 - (void)windowsRegistryKeyTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFData *data = [OFData dataWithItems: "abcdef" count: 6];
-	OFWindowsRegistryKey *softwareKey, *ObjFWKey;
+	OFWindowsRegistryKey *softwareKey, *objFWKey;
 	DWORD type;
 
 	TEST(@"+[OFWindowsRegistryKey classesRootKey]",
 	    [OFWindowsRegistryKey classesRootKey])
 
@@ -49,35 +49,35 @@
 	    [[OFWindowsRegistryKey currentUserKey]
 		   openSubkeyAtPath: @"nonexistent"
 	    securityAndAccessRights: KEY_ALL_ACCESS] == nil)
 
 	TEST(@"-[createSubkeyAtPath:securityAndAccessRights:]",
-	    (ObjFWKey = [softwareKey createSubkeyAtPath: @"ObjFW"
+	    (objFWKey = [softwareKey createSubkeyAtPath: @"ObjFW"
 				securityAndAccessRights: KEY_ALL_ACCESS]))
 
 	TEST(@"-[setData:forValueNamed:type:]",
-	    R([ObjFWKey setData: data forValueNamed: @"data" type: REG_BINARY]))
+	    R([objFWKey setData: data forValueNamed: @"data" type: REG_BINARY]))
 
 	TEST(@"-[dataForValueNamed:subkeyPath:flags:type:]",
-	    [[ObjFWKey dataForValueNamed: @"data" type: &type] isEqual: data] &&
+	    [[objFWKey dataForValueNamed: @"data" type: &type] isEqual: data] &&
 	    type == REG_BINARY)
 
 	TEST(@"-[setString:forValueNamed:type:]",
-	    R([ObjFWKey setString: @"foobar" forValueNamed: @"string"]) &&
-	    R([ObjFWKey setString: @"%PATH%;foo"
+	    R([objFWKey setString: @"foobar" forValueNamed: @"string"]) &&
+	    R([objFWKey setString: @"%PATH%;foo"
 		    forValueNamed: @"expand"
 			     type: REG_EXPAND_SZ]))
 
 	TEST(@"-[stringForValue:subkeyPath:]",
-	    [[ObjFWKey stringForValueNamed: @"string"] isEqual: @"foobar"] &&
-	    [[ObjFWKey stringForValueNamed: @"expand" type: &type]
+	    [[objFWKey stringForValueNamed: @"string"] isEqual: @"foobar"] &&
+	    [[objFWKey stringForValueNamed: @"expand" type: &type]
 	    isEqual: @"%PATH%;foo"] &&
 	    type == REG_EXPAND_SZ)
 
-	TEST(@"-[deleteValueNamed:]", R([ObjFWKey deleteValueNamed: @"data"]))
+	TEST(@"-[deleteValueNamed:]", R([objFWKey deleteValueNamed: @"data"]))
 
 	TEST(@"-[deleteSubkeyAtPath:]",
 	    R([softwareKey deleteSubkeyAtPath: @"ObjFW"]))
 
 	objc_autoreleasePoolPop(pool);
 }
 @end