diff --git a/oc2/CMakeLists.txt b/oc2/CMakeLists.txt
index 01b2e998ee..3ae1d76ac1 100644
--- a/oc2/CMakeLists.txt
+++ b/oc2/CMakeLists.txt
@@ -4,7 +4,7 @@
 # University Corporation for Atmospheric Research/Unidata.
 
 # See netcdf-c/COPYRIGHT file for more info.
-set(oc_SOURCES oc.c daplex.c dapparse.c dapy.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocread.c ocutil.c xxdr.c)
+set(oc_SOURCES oc.c daplex.c dapparse.c dap.tab.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocread.c ocutil.c xxdr.c)
 
 add_library(oc2 OBJECT ${oc_SOURCES})
 
diff --git a/oc2/Makefile.am b/oc2/Makefile.am
index cf74b3deac..703c6f136a 100644
--- a/oc2/Makefile.am
+++ b/oc2/Makefile.am
@@ -21,7 +21,7 @@ ocread.c ocutil.c \
 xxdr.c
 
 HDRS=oc.h ocx.h \
-dapparselex.h dapy.h \
+dapparselex.h dap.tab.h \
 occompile.h occonstraints.h occurlfunctions.h \
 ocdata.h ocdatatypes.h ocdebug.h ocdump.h \
 ocinternal.h ocnode.h \
@@ -40,8 +40,5 @@ liboc_la_CPPFLAGS = $(AM_CPPFLAGS)
 # autoconf will forcibly delete files of the name *.tab.*
 
 makeparser::
-	rm -f dap.tab.c dap.tab.h dapy.c dapy.h
-	bison --debug -d -p dap dap.y
-	sed -e 's/dap[.]tab[.]c/dapy.c/g' -e 's/dap[.]tab[.]h/dapy.h/g' <dap.tab.c >dapy.c
-	mv dap.tab.h dapy.h
-	rm -f dap.tab.c
+	rm -f dap.tab.c dap.tab.h
+	bison --debug --defines -p dap dap.y
diff --git a/oc2/dapy.h b/oc2/dab.tab.h
similarity index 100%
rename from oc2/dapy.h
rename to oc2/dab.tab.h
diff --git a/oc2/dapy.c b/oc2/dap.tab.c
similarity index 99%
rename from oc2/dapy.c
rename to oc2/dap.tab.c
index c9883f9802..6079f4b6cf 100644
--- a/oc2/dapy.c
+++ b/oc2/dap.tab.c
@@ -72,7 +72,7 @@
 
 #include "config.h"
 #include "dapparselex.h"
-#include "dapy.h"
+#include "dap.tab.h"
 int dapdebug = 0;
 
 #line 79 "dapy.c" /* yacc.c:339  */
@@ -94,7 +94,7 @@ int dapdebug = 0;
 #endif
 
 /* In a future release of Bison, this section will be replaced
-   by #include "dapy.h".  */
+   by #include "dap.tab.h".  */
 #ifndef YY_DAP_DAP_TAB_H_INCLUDED
 # define YY_DAP_DAP_TAB_H_INCLUDED
 /* Debug traces.  */
diff --git a/oc2/dap.y b/oc2/dap.y
index 0305015429..fa544743a7 100644
--- a/oc2/dap.y
+++ b/oc2/dap.y
@@ -11,7 +11,7 @@
 %{
 #include "config.h"
 #include "dapparselex.h"
-#include "dapy.h"
+#include "dap.tab.h"
 int dapdebug = 0;
 %}
 
diff --git a/oc2/daplex.c b/oc2/daplex.c
index 84ea4c967c..e6c6e36c3a 100644
--- a/oc2/daplex.c
+++ b/oc2/daplex.c
@@ -8,7 +8,7 @@
 
 #include "oc.h"
 #include "dapparselex.h"
-#include "dapy.h"
+#include "dap.tab.h"
 
 #undef URLCVT /* NEVER turn this on */
 
diff --git a/oc2/dapparse.c b/oc2/dapparse.c
index 84103c5661..b63a490e71 100644
--- a/oc2/dapparse.c
+++ b/oc2/dapparse.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 #include "dapparselex.h"
-#include "dapy.h"
+#include "dap.tab.h"
 #include <stddef.h>
 
 /* Forward */