diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.l b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.l
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL-Data.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.C
similarity index 98%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OL-Data.C
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.C
index bb6ba3236..99c0fb7de 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL-Data.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.C
@@ -20,7 +20,7 @@
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
-/* $XConsortium: OL-Data.C /main/4 1996/08/21 15:47:10 drk $
+/* $XConsortium: OL_Data.C /main/4 1996/08/21 15:47:10 drk $
  *
  * (c) Copyright 1996 Digital Equipment Corporation.
  * (c) Copyright 1996 Hewlett-Packard Company.
@@ -32,7 +32,7 @@
  */
 
 /* exported interfaces */
-#include "OL-Data.h"
+#include "OL_Data.h"
 
 /* imported interfaces */
 #include <stdlib.h>
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL-Data.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.h
similarity index 97%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OL-Data.h
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.h
index b5ae04718..0c71a6b70 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL-Data.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.h
@@ -20,7 +20,7 @@
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
-/* $XConsortium: OL-Data.h /main/2 1996/07/18 16:47:56 drk $ */
+/* $XConsortium: OL_Data.h /main/2 1996/07/18 16:47:56 drk $ */
 #ifndef OL_DATA_H
 #define OL_DATA_H
 
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.y b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.yy
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.y
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.yy
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.l b/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.l
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.l b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.l
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.l b/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.l
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.ll
similarity index 99%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l
rename to cde/programs/dtinfo/dtinfogen/infolib/etc/lex.ll
index 6e28bc68f..7962f1847 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.ll
@@ -14,7 +14,7 @@
 #include <sstream>
 #include <string.h>
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 #include "SGMLDefn.h"
 #include "Dispatch.h"