Index: utils/ofzip/OFZIP.h
==================================================================
--- utils/ofzip/OFZIP.h
+++ utils/ofzip/OFZIP.h
@@ -19,11 +19,11 @@
 
 #import "Archive.h"
 
 @interface OFZIP: OFObject
 {
-	int8_t _override;
+	int8_t _overwrite;
 @public
 	int8_t _outputLevel;
 	OFString *_archivePath;
 	int _exitStatus;
 }

Index: utils/ofzip/OFZIP.m
==================================================================
--- utils/ofzip/OFZIP.m
+++ utils/ofzip/OFZIP.m
@@ -47,14 +47,14 @@
 	    [OFApplication programName]];
 
 	if (full)
 		[stream writeString:
 		    @"\nOptions:\n"
-		    @"    -f  --force      Force / override files\n"
+		    @"    -f  --force      Force / overwrite files\n"
 		    @"    -h  --help       Show this help\n"
 		    @"    -l  --list       List all files in the archive\n"
-		    @"    -n  --no-clober  Never override files\n"
+		    @"    -n  --no-clober  Never overwrite files\n"
 		    @"    -q  --quiet      Quiet mode (no output, except "
 		    @"errors)\n"
 		    @"    -v  --verbose    Verbose output for file list\n"
 		    @"    -x  --extract    Extract files\n"];
 
@@ -91,22 +91,22 @@
 	id <Archive> archive;
 
 	while ((option = [optionsParser nextOption]) != '\0') {
 		switch (option) {
 		case 'f':
-			if (_override < 0)
+			if (_overwrite < 0)
 				mutuallyExclusiveError(
 				    'f', @"force", 'n', @"no-clobber");
 
-			_override = 1;
+			_overwrite = 1;
 			break;
 		case 'n':
-			if (_override > 0)
+			if (_overwrite > 0)
 				mutuallyExclusiveError(
 				    'f', @"force", 'n', @"no-clobber");
 
-			_override = -1;
+			_overwrite = -1;
 			break;
 		case 'v':
 			if (_outputLevel < 0)
 				mutuallyExclusiveError(
 				    'q', @"quiet", 'v', @"verbose");
@@ -233,23 +233,23 @@
 - (bool)shouldExtractFile: (OFString*)fileName
 	      outFileName: (OFString*)outFileName
 {
 	OFString *line;
 
-	if (_override == 1 ||
+	if (_overwrite == 1 ||
 	    ![[OFFileManager defaultManager] fileExistsAtPath: outFileName])
 		return true;
 
 
-	if (_override == -1) {
+	if (_overwrite == -1) {
 		if (_outputLevel >= 0)
 			[of_stdout writeLine: @" skipped"];
 		return false;
 	}
 
 	do {
-		[of_stderr writeFormat: @"\rOverride %@? [ynAN?] ", fileName];
+		[of_stderr writeFormat: @"\rOverwrite %@? [ynAN?] ", fileName];
 
 		line = [of_stdin readLine];
 
 		if ([line isEqual: @"?"])
 			[of_stderr writeString: @" y: yes\n"
@@ -258,13 +258,13 @@
 						@" N: never\n"];
 	} while (![line isEqual: @"y"] && ![line isEqual: @"n"] &&
 	    ![line isEqual: @"N"] && ![line isEqual: @"A"]);
 
 	if ([line isEqual: @"A"])
-		_override = 1;
+		_overwrite = 1;
 	else if ([line isEqual: @"N"])
-		_override = -1;
+		_overwrite = -1;
 
 	if ([line isEqual: @"n"] || [line isEqual: @"N"]) {
 		if (_outputLevel >= 0)
 			[of_stdout writeFormat: @"Skipping %@...\n", fileName];
 			return false;