--- unichrome-20060725/man/Makefile.am.driver_name	2006-07-25 13:31:28.000000000 -0400
+++ unichrome-20060725/man/Makefile.am	2006-09-12 13:30:22.000000000 -0400
@@ -59,4 +59,4 @@
 	sed $(MAN_SUBSTS) < $< > $@
 
 @DRIVER_NAME@.man:
-	ln -s -f ../unichrome/@DRIVER_NAME@.man .
+	ln -s -f ../unichrome/via.man @DRIVER_NAME@.man
--- unichrome-20060725/unichrome/via_xvmc.c.driver_name	2006-07-25 13:31:28.000000000 -0400
+++ unichrome-20060725/unichrome/via_xvmc.c	2006-09-12 13:30:22.000000000 -0400
@@ -380,12 +380,12 @@
 	if (pVia->ChipId != PCI_CHIP_VT3259) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		"[XvMC] Registering viaXvMC.\n");
-	    xf86XvMCRegisterDRInfo(pScreen, "viaXvMC", pDRIInfo->busIdString,
+	    xf86XvMCRegisterDRInfo(pScreen, "openchromeXvMC", pDRIInfo->busIdString,
 		VIAXVMC_MAJOR, VIAXVMC_MINOR, VIAXVMC_PL);
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		"[XvMC] Registering viaXvMCPro.\n");
-	    xf86XvMCRegisterDRInfo(pScreen, "viaXvMCPro",
+	    xf86XvMCRegisterDRInfo(pScreen, "openchromeXvMCPro",
 		pDRIInfo->busIdString, VIAXVMC_MAJOR, VIAXVMC_MINOR,
 		VIAXVMC_PL);
 	}
--- unichrome-20060725/unichrome/via_driver.c.driver_name	2006-07-25 13:31:28.000000000 -0400
+++ unichrome-20060725/unichrome/via_driver.c	2006-09-12 13:30:22.000000000 -0400
@@ -400,7 +400,7 @@
     {0, 0, 0, 0}
 };
 
-XF86ModuleData viaModuleData = {&VIAVersRec, VIASetup, NULL};
+XF86ModuleData openchromeModuleData = {&VIAVersRec, VIASetup, NULL};
 
 static pointer VIASetup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
--- unichrome-20060725/unichrome/Makefile.am.driver_name	2006-07-25 13:31:28.000000000 -0400
+++ unichrome-20060725/unichrome/Makefile.am	2006-09-12 13:30:22.000000000 -0400
@@ -26,11 +26,11 @@
 EXTRA_DIST = svnversion.h
 CONFIG_CLEAN_FILES= svnversion.h
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
-via_drv_la_LTLIBRARIES = via_drv.la
-via_drv_la_LDFLAGS = -module -avoid-version
-via_drv_ladir = @moduledir@/drivers
+@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+@DRIVER_NAME@_drv_ladir = @moduledir@/drivers
 
-via_drv_la_SOURCES = \
+@DRIVER_NAME@_drv_la_SOURCES = \
 	 via_3d_reg.h \
 	 via_3d.c \
 	 via_3d.h \
@@ -68,7 +68,7 @@
          via_xvpriv.h
 
 if DRI
-via_drv_la_SOURCES += \
+@DRIVER_NAME@_drv_la_SOURCES += \
          via_dri.c \
          via_dri.h \
          via_drmclient.h \
@@ -96,4 +96,4 @@
 	@(chmod 666 $@.tmp 2> /dev/null || /bin/true)
 	@cmp -s $@ $@.tmp || (mv $@.tmp $@ ; echo created $@)
 
-.PHONY: svnversion.h
\ No newline at end of file
+.PHONY: svnversion.h
--- unichrome-20060725/unichrome/via_driver.h.driver_name	2006-09-12 13:33:16.000000000 -0400
+++ unichrome-20060725/unichrome/via_driver.h	2006-09-12 13:33:23.000000000 -0400
@@ -91,7 +91,7 @@
 #define VIA_MIN_DOWNLOAD 400
 #endif
 
-#define DRIVER_NAME     "via"
+#define DRIVER_NAME     "openchrome"
 #define VERSION_MAJOR   0
 #define VERSION_MINOR   2
 #ifdef USE_NEW_XVABI
--- unichrome-20060725/unichrome/via.man.driver_name	2006-07-25 13:31:28.000000000 -0400
+++ unichrome-20060725/unichrome/via.man	2006-09-12 13:30:22.000000000 -0400
@@ -1,22 +1,22 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH VIA __drivermansuffix__ __vendorversion__
+.TH OPENCHROME __drivermansuffix__ __vendorversion__
 .SH NAME
-via \- VIA unichrome graphics driver
+openchrome \- VIA unichrome graphics driver from the openchrome project
 .SH SYNOPSIS
 .nf
 .B "Section \*qDevice\*q"
 .BI "  Identifier \*q"  devname \*q
-.B  "  Driver \*qvia\*q"
+.B  "  Driver \*qopenchrome\*q"
 \ \ ...
 .B EndSection
 .fi
 .SH DESCRIPTION
-.B via
+.B openchrome
 is an __xservername__ driver for VIA chipsets with onboard unichrome graphics.
 .PP
 The
-.B via
+.B openchrome
 driver supports the VIA CLE266, KM400/KN400, K8M/N800, PM/N800 and
 CN400 chipsets, including 2D acceleration and the Xv video overlay
 extensions. Flat panel, TV and VGA outputs are supported, depending on
--- unichrome-20060725/libxvmc/Makefile.am.driver_name	2006-07-25 13:31:24.000000000 -0400
+++ unichrome-20060725/libxvmc/Makefile.am	2006-09-12 13:30:22.000000000 -0400
@@ -1,7 +1,7 @@
 if XVMC
-lib_LTLIBRARIES=libviaXvMC.la libviaXvMCPro.la
+lib_LTLIBRARIES=lib@DRIVER_NAME@XvMC.la lib@DRIVER_NAME@XvMCPro.la
 
-libviaXvMC_la_SOURCES = \
+lib@DRIVER_NAME@XvMC_la_SOURCES = \
 	viaLowLevel.c \
 	driDrawable.c \
 	viaXvMC.c \
@@ -12,7 +12,7 @@
 	xf86dri.h \
 	xf86dristr.h \
 	vldXvMC.h
-libviaXvMCPro_la_SOURCES = \
+lib@DRIVER_NAME@XvMCPro_la_SOURCES = \
 	viaLowLevelPro.c \
 	driDrawable.c \
 	viaXvMC.c \
@@ -24,11 +24,11 @@
 	xf86dristr.h \
 	vldXvMC.h
 
-libviaXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/unichrome -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
-libviaXvMC_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0
+lib@DRIVER_NAME@XvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/unichrome -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
+lib@DRIVER_NAME@XvMC_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0
 
-libviaXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/unichrome -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
-libviaXvMCPro_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0
+lib@DRIVER_NAME@XvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/unichrome -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
+lib@DRIVER_NAME@XvMCPro_la_LDFLAGS = @DRI_LIBS@ -version-number 1:0:0
 else
 EXTRA_DIST = \
 	driDrawable.c \
--- unichrome-20060725/configure.ac.driver_name	2006-07-25 13:31:28.000000000 -0400
+++ unichrome-20060725/configure.ac	2006-09-12 13:30:22.000000000 -0400
@@ -148,7 +148,7 @@
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
-DRIVER_NAME=via
+DRIVER_NAME=openchrome
 AC_SUBST([DRIVER_NAME])
 
 AC_DEFINE(X_USE_LINEARFB,1,[Compatibility define for older Xen])