diff --git a/ChangeLog b/ChangeLog
index c2f700d01..ea7edba36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-01-29  Werner Lemberg  <wl@gnu.org>
+2006-02-01  Werner Lemberg  <wl@gnu.org>
+
+	* src/otvalid/module.mk: s/otvalid_module_class/otv_module_class/.
+	* src/gxvalid/module.mk: s/gxvalid_module_class/gxv_module_class/.
+
+2006-01-31  Werner Lemberg  <wl@gnu.org>
 
 	Implement new, simplified module selection.  With GNU make it is now
 	sufficient to modify a single file, `modules.cfg', to control the
diff --git a/src/gxvalid/module.mk b/src/gxvalid/module.mk
index 3e1d7d92c..44ef94add 100644
--- a/src/gxvalid/module.mk
+++ b/src/gxvalid/module.mk
@@ -16,8 +16,8 @@
 FTMODULE_H_COMMANDS += GXVALID_MODULE
 
 define GXVALID_MODULE
-$(OPEN_DRIVER)gxvalid_module_class$(CLOSE_DRIVER)
-$(ECHO_DRIVER)gxvalid     $(ECHO_DRIVER_DESC)TrueTypeGX/AAT validation module$(ECHO_DRIVER_DONE)
+$(OPEN_DRIVER)gxv_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)gxvalid   $(ECHO_DRIVER_DESC)TrueTypeGX/AAT validation module$(ECHO_DRIVER_DONE)
 endef
 
 # EOF
diff --git a/src/otvalid/module.mk b/src/otvalid/module.mk
index 4ef4387c4..aa4db047d 100644
--- a/src/otvalid/module.mk
+++ b/src/otvalid/module.mk
@@ -16,8 +16,8 @@
 FTMODULE_H_COMMANDS += OTVALID_MODULE
 
 define OTVALID_MODULE
-$(OPEN_DRIVER)otvalid_module_class$(CLOSE_DRIVER)
-$(ECHO_DRIVER)otvalid     $(ECHO_DRIVER_DESC)OpenType validation module$(ECHO_DRIVER_DONE)
+$(OPEN_DRIVER)otv_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)otvalid   $(ECHO_DRIVER_DESC)OpenType validation module$(ECHO_DRIVER_DONE)
 endef
 
 # EOF