diff --git a/ChangeLog b/ChangeLog
index 861cadff6..02d1a8ee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-09  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/Makefile.am:
+	* clutter/clutter.h:
+	* clutter/clutter-list-model.[ch]: Complete the ClutterModelDefault
+	to ClutterListModel rename by renaming the source files
+
 2008-01-09  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-model-default.[ch]: Rename ClutterModelDefault
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 11c9f9cc5..1b0a30f27 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -62,10 +62,10 @@ source_h =					\
 	$(srcdir)/clutter-group.h 		\
 	$(srcdir)/clutter-keysyms.h 		\
 	$(srcdir)/clutter-label.h 		\
+	$(srcdir)/clutter-list-model.h		\
 	$(srcdir)/clutter-main.h		\
 	$(srcdir)/clutter-media.h		\
 	$(srcdir)/clutter-model.h		\
-	$(srcdir)/clutter-model-default.h	\
 	$(srcdir)/clutter-rectangle.h		\
 	$(srcdir)/clutter-score.h 		\
 	$(srcdir)/clutter-script.h		\
@@ -146,11 +146,11 @@ source_c = \
 	clutter-fixed.c			\
 	clutter-group.c 		\
 	clutter-label.c 		\
+	clutter-list-model.c		\
 	clutter-main.c 			\
 	clutter-marshal.c		\
 	clutter-media.c 		\
 	clutter-model.c			\
-	clutter-model-default.c		\
 	clutter-rectangle.c 		\
 	clutter-score.c 		\
 	clutter-script.c		\
diff --git a/clutter/clutter-model-default.c b/clutter/clutter-list-model.c
similarity index 99%
rename from clutter/clutter-model-default.c
rename to clutter/clutter-list-model.c
index 68737dd19..520e1568a 100644
--- a/clutter/clutter-model-default.c
+++ b/clutter/clutter-list-model.c
@@ -51,7 +51,7 @@
 
 #include "clutter-model.h"
 #include "clutter-model-private.h"
-#include "clutter-model-default.h"
+#include "clutter-list-model.h"
 #include "clutter-private.h"
 #include "clutter-debug.h"
 
diff --git a/clutter/clutter-model-default.h b/clutter/clutter-list-model.h
similarity index 100%
rename from clutter/clutter-model-default.h
rename to clutter/clutter-list-model.h
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 7009e7b73..fc3a76b36 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -49,10 +49,10 @@
 #include "clutter-group.h"
 #include "clutter-keysyms.h" 
 #include "clutter-label.h"
+#include "clutter-list-model.h"
 #include "clutter-main.h"
 #include "clutter-media.h"
 #include "clutter-model.h"
-#include "clutter-model-default.h"
 #include "clutter-stage.h"
 #include "clutter-texture.h"
 #include "clutter-timeout-pool.h"