--- a/common/exf.c
+++ b/common/exf.c
@@ -542,7 +542,7 @@ file_spath(SCR *sp, FREF *frp, struct st
 
 	/*
 	 * If the name is NULL or an explicit reference (i.e., the first
-	 * component is . or ..) ignore the O_PATH option.
+	 * component is . or ..) ignore the NVI_O_PATH option.
 	 */
 	name = frp->name;
 	if (name == NULL) {
@@ -561,8 +561,8 @@ file_spath(SCR *sp, FREF *frp, struct st
 		return (0);
 	}
 
-	/* Try the O_PATH option values. */
-	for (found = 0, p = t = O_STR(sp, O_PATH);; ++p)
+	/* Try the NVI_O_PATH option values. */
+	for (found = 0, p = t = O_STR(sp, NVI_O_PATH);; ++p)
 		if (*p == ':' || *p == '\0') {
 			if (t < p - 1) {
 				savech = *p;
--- a/common/options.c
+++ b/common/options.c
@@ -147,7 +147,7 @@ OPTLIST const optlist[] = {
 	{L("optimize"),	NULL,		OPT_1BOOL,	0},
 /* O_PARAGRAPHS	    4BSD */
 	{L("paragraphs"),	f_paragraph,	OPT_STR,	0},
-/* O_PATH	  4.4BSD */
+/* NVI_O_PATH	  4.4BSD */
 	{L("path"),	NULL,		OPT_STR,	0},
 /* O_PRINT	  4.4BSD */
 	{L("print"),	f_print,	OPT_STR,	0},
@@ -364,7 +364,7 @@ opts_init(SCR *sp, int *oargs)
 	OI(O_REPORT, L("report=5"));
 	OI(O_PARAGRAPHS, L("paragraphs=IPLPPPQPP LIpplpipbp"));
 	(void)SPRINTF(b2, SIZE(b2), L("path=%s"), "");
-	OI(O_PATH, b2);
+	OI(NVI_O_PATH, b2);
 	(void)SPRINTF(b2, SIZE(b2), L("recdir=%s"), _PATH_PRESERVE);
 	OI(O_RECDIR, b2);
 	OI(O_SECTIONS, L("sections=NHSHH HUnhsh"));
--- a/common/options_def.h
+++ b/common/options_def.h
@@ -40,7 +40,7 @@
 #define O_OPEN 38
 #define O_OPTIMIZE 39
 #define O_PARAGRAPHS 40
-#define O_PATH 41
+#define NVI_O_PATH 41
 #define O_PRINT 42
 #define O_PROMPT 43
 #define O_READONLY 44
