@@ -47,23 +47,23 @@
 }
 
 @implementation ScryptPWGen
 - (void)applicationDidFinishLaunching
 {
-	OFString *keyfilePath, *lengthString;
+	OFString *keyFilePath, *lengthString;
 	const of_options_parser_option_t options[] = {
 		{ 'h', @"help", 0, NULL, NULL },
-		{ 'k', @"keyfile", 1, NULL, &keyfilePath },
+		{ 'k', @"keyfile", 1, NULL, &keyFilePath },
 		{ 'l', @"length", 1, NULL, &lengthString },
 		{ 'L', @"legacy", 0, &_legacy, NULL },
 		{ 'r', @"repeat", 0, &_repeat, NULL },
 		{ '\0', nil, 0, NULL, NULL }
 	};
 	OFOptionsParser *optionsParser =
 	    [OFOptionsParser parserWithOptions: options];
 	of_unichar_t option;
-	OFMutableData *keyfile = nil;
+	OFMutableData *keyFile = nil;
 	OFString *prompt;
 	const char *promptCString;
 	char *passphrase;
 
 	while ((option = [optionsParser nextOption]) != '\0') {
@@ -138,12 +138,12 @@
 
 	prompt = [OFString stringWithFormat: @"Passphrase for site \"%@\": ",
 					     generator.site];
 	promptCString = [prompt cStringWithEncoding: [OFLocalization encoding]];
 
-	if (keyfilePath != nil)
-		keyfile = [OFMutableData dataWithContentsOfFile: keyfilePath];
+	if (keyFilePath != nil)
+		keyFile = [OFMutableData dataWithContentsOfFile: keyFilePath];
 
 	passphrase = getpass(promptCString);
 	@try {
 		if (_repeat) {
 			char *passphraseCopy = of_strdup(passphrase);
@@ -171,11 +171,11 @@
 				    strlen(passphraseCopy));
 				free(passphraseCopy);
 			}
 		}
 
-		generator.keyfile = keyfile;
+		generator.keyFile = keyFile;
 		generator.passphrase = passphrase;
 
 		[generator derivePassword];
 		@try {
 			[of_stdout writeBuffer: generator.output
@@ -187,12 +187,12 @@
 			    generator.length);
 		}
 	} @finally {
 		of_explicit_memset(passphrase, 0, strlen(passphrase));
 
-		if (keyfile != nil)
-			of_explicit_memset(keyfile.items, 0, keyfile.count);
+		if (keyFile != nil)
+			of_explicit_memset(keyFile.items, 0, keyFile.count);
 	}
 
 	[OFApplication terminate];
 }
 @end