diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 713fe962eca..38fed9a074f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-22  Brian Hackett  <bhackett1024@gmail.com>
+
+	* doc/plugins.texi: Rename pre-genericize event.
+
 2009-12-22  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR driver/42463
diff --git a/gcc/doc/plugins.texi b/gcc/doc/plugins.texi
index d446f9fd5c6..35f1b70824e 100644
--- a/gcc/doc/plugins.texi
+++ b/gcc/doc/plugins.texi
@@ -145,7 +145,7 @@ enum plugin_event
   PLUGIN_PASS_MANAGER_SETUP,    /* To hook into pass manager.  */
   PLUGIN_FINISH_TYPE,           /* After finishing parsing a type.  */
   PLUGIN_FINISH_UNIT,           /* Useful for summary processing.  */
-  PLUGIN_CXX_CP_PRE_GENERICIZE, /* Allows to see low level AST in C++ FE.  */
+  PLUGIN_PRE_GENERICIZE,        /* Allows to see low level AST in C and C++ frontends.  */
   PLUGIN_FINISH,                /* Called before GCC exits.  */
   PLUGIN_INFO,                  /* Information about the plugin. */
   PLUGIN_GGC_START,		/* Called at start of GCC Garbage Collection. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0245226d008..8d859a4e9c1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22  Brian Hackett  <bhackett1024@gmail.com>
+
+	* g++.dg/plugin/attribute_plugin.c: Rename pre-genericize event.
+	* g++.dg/plugin/dumb_plugin.c: Same.
+
 2009-12-21  Jason Merrill  <jason@redhat.com>
 
 	* g++.dg/abi/mangle14.C: Add expected mangling.
diff --git a/gcc/testsuite/g++.dg/plugin/attribute_plugin.c b/gcc/testsuite/g++.dg/plugin/attribute_plugin.c
index deaebf1b16d..d62ab90542c 100644
--- a/gcc/testsuite/g++.dg/plugin/attribute_plugin.c
+++ b/gcc/testsuite/g++.dg/plugin/attribute_plugin.c
@@ -60,7 +60,7 @@ plugin_init (struct plugin_name_args *plugin_info,
              struct plugin_gcc_version *version)
 {
   const char *plugin_name = plugin_info->base_name;
-  register_callback (plugin_name, PLUGIN_CXX_CP_PRE_GENERICIZE,
+  register_callback (plugin_name, PLUGIN_PRE_GENERICIZE,
                      handle_pre_generic, NULL);
 
   register_callback (plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
diff --git a/gcc/testsuite/g++.dg/plugin/dumb_plugin.c b/gcc/testsuite/g++.dg/plugin/dumb_plugin.c
index 8a160771b13..3aee8db840c 100644
--- a/gcc/testsuite/g++.dg/plugin/dumb_plugin.c
+++ b/gcc/testsuite/g++.dg/plugin/dumb_plugin.c
@@ -130,7 +130,7 @@ plugin_init (struct plugin_name_args *plugin_info,
 
   register_callback (plugin_name, PLUGIN_FINISH_TYPE, handle_struct, NULL);
 
-  register_callback (plugin_name, PLUGIN_CXX_CP_PRE_GENERICIZE,
+  register_callback (plugin_name, PLUGIN_PRE_GENERICIZE,
                      handle_pre_generic, NULL);
 
   register_callback (plugin_name, PLUGIN_FINISH_UNIT,