diff --git a/configure.ac b/configure.ac
index 9addd8034..c9d39f1b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1193,9 +1193,9 @@ AC_CONFIG_FILES([
 	doc/Makefile
 	doc/reference/Makefile
 	doc/reference/clutter/Makefile
-	doc/reference/clutter/clutter-docs.xml
+	doc/reference/clutter/clutter2-docs.xml
 	doc/reference/cally/Makefile
-	doc/reference/cally/cally-docs.xml
+	doc/reference/cally/cally2-docs.xml
 	doc/common/Makefile
 	doc/cookbook/Makefile
 	doc/cookbook/clutter-cookbook.xml
diff --git a/doc/reference/cally/Makefile.am b/doc/reference/cally/Makefile.am
index 797d463e6..c7ea7cc82 100644
--- a/doc/reference/cally/Makefile.am
+++ b/doc/reference/cally/Makefile.am
@@ -1,15 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables to
 # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=cally
+DOC_MODULE=cally2
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
diff --git a/doc/reference/cally/cally-docs.xml.in b/doc/reference/cally/cally2-docs.xml.in
similarity index 100%
rename from doc/reference/cally/cally-docs.xml.in
rename to doc/reference/cally/cally2-docs.xml.in
diff --git a/doc/reference/cally/cally-sections.txt b/doc/reference/cally/cally2-sections.txt
similarity index 100%
rename from doc/reference/cally/cally-sections.txt
rename to doc/reference/cally/cally2-sections.txt
diff --git a/doc/reference/cally/cally.types b/doc/reference/cally/cally2.types
similarity index 64%
rename from doc/reference/cally/cally.types
rename to doc/reference/cally/cally2.types
index 085efc2bb..d5a1d677a 100644
--- a/doc/reference/cally/cally.types
+++ b/doc/reference/cally/cally2.types
@@ -1,9 +1,6 @@
 cally_actor_get_type
 cally_clone_get_type
-cally_group_get_type
-cally_rectangle_get_type
 cally_root_get_type
 cally_stage_get_type
 cally_text_get_type
-cally_texture_get_type
 cally_util_get_type
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 0fb073746..09080fc2f 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -1,4 +1,4 @@
-DOC_MODULE = clutter
+DOC_MODULE = clutter2
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
@@ -38,8 +38,6 @@ HFILE_GLOB = \
 	$(top_srcdir)/clutter/*.h \
 	$(top_builddir)/clutter/*.h \
 	$(top_srcdir)/clutter/x11/clutter-x11.h \
-	$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
-	$(top_srcdir)/clutter/x11/clutter-glx-texture-pixmap.h \
 	$(top_srcdir)/clutter/egl/clutter-egl.h \
 	$(top_srcdir)/clutter/cex100/clutter-cex100.h \
 	$(top_srcdir)/clutter/win32/clutter-win32.h \
@@ -79,7 +77,6 @@ IGNORE_HFILES = \
 	clutter-gesture-action-private.h	\
 	clutter-id-pool.h 		\
 	clutter-keysyms.h 		\
-	clutter-keysyms-compat.h	\
 	clutter-keysyms-table.h 	\
 	clutter-marshal.h 		\
 	clutter-master-clock.h 		\
@@ -107,8 +104,6 @@ IGNORE_HFILES = \
 
 EXTRA_HFILES = \
         $(top_srcdir)/clutter/x11/clutter-x11.h \
-	$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
-	$(top_srcdir)/clutter/x11/clutter-glx-texture-pixmap.h \
 	$(top_srcdir)/clutter/egl/clutter-egl.h \
 	$(top_srcdir)/clutter/cex100/clutter-cex100.h \
 	$(top_srcdir)/clutter/win32/clutter-win32.h \
@@ -143,11 +138,7 @@ content_files = \
 	glossary.xml \
 	clutter-overview.xml \
 	building-clutter.xml \
-	running-clutter.xml \
-	migrating-ClutterAnimation.xml \
-	migrating-ClutterBehaviour.xml \
-	migrating-ClutterEffect.xml \
-	migrating-ClutterPath.xml
+	running-clutter.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
@@ -156,11 +147,7 @@ expand_content_files = \
 	glossary.xml \
 	clutter-overview.xml \
 	building-clutter.xml \
-	running-clutter.xml \
-	migrating-ClutterAnimation.xml \
-	migrating-ClutterBehaviour.xml \
-	migrating-ClutterEffect.xml \
-	migrating-ClutterPath.xml
+	running-clutter.xml
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
diff --git a/doc/reference/clutter/clutter-docs.xml.in b/doc/reference/clutter/clutter2-docs.xml.in
similarity index 100%
rename from doc/reference/clutter/clutter-docs.xml.in
rename to doc/reference/clutter/clutter2-docs.xml.in
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter2-sections.txt
similarity index 100%
rename from doc/reference/clutter/clutter-sections.txt
rename to doc/reference/clutter/clutter2-sections.txt
diff --git a/doc/reference/clutter/clutter.types b/doc/reference/clutter/clutter2.types
similarity index 99%
rename from doc/reference/clutter/clutter.types
rename to doc/reference/clutter/clutter2.types
index 1fd1996de..094b9640f 100644
--- a/doc/reference/clutter/clutter.types
+++ b/doc/reference/clutter/clutter2.types
@@ -19,7 +19,6 @@ clutter_bind_constraint_get_type
 clutter_binding_pool_get_type
 clutter_bin_layout_get_type
 clutter_blur_effect_get_type
-clutter_box_get_type
 clutter_box_layout_get_type
 clutter_brightness_contrast_effect_get_type
 clutter_canvas_get_type