diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py
index 4f9c0856f..5d1ba3da4 100644
--- a/gramps2/src/DbPrompter.py
+++ b/gramps2/src/DbPrompter.py
@@ -37,7 +37,6 @@ import gnome
 import Utils
 import const
 import GrampsCfg
-import VersionControl
 from gettext import gettext as _
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am
index cd5c372ab..abcdd96b5 100644
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@@ -45,7 +45,6 @@ pkgpython_PYTHON = \
 	GrampsParser.py\
 	gramps.py\
 	GrampsXML.py\
-	GrampsZODB.py\
 	GraphLayout.py\
 	Gregorian.py\
 	Hebrew.py\
@@ -64,7 +63,7 @@ pkgpython_PYTHON = \
 	PaperMenu.py\
 	PedView.py\
 	PeopleView.py\
-	PeopleStore.py\
+	PeopleModel.py\
 	PlaceView.py\
 	Plugins.py\
 	QuestionDialog.py\
@@ -87,7 +86,6 @@ pkgpython_PYTHON = \
 	TransTable.py\
 	UrlEdit.py\
 	Utils.py\
-	VersionControl.py\
 	Witness.py\
 	WriteXML.py\
 	SelectPerson.py\
diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in
index 9a1980633..ef4775dac 100644
--- a/gramps2/src/Makefile.in
+++ b/gramps2/src/Makefile.in
@@ -156,7 +156,6 @@ pkgpython_PYTHON = \
 	GrampsParser.py\
 	gramps.py\
 	GrampsXML.py\
-	GrampsZODB.py\
 	GraphLayout.py\
 	Gregorian.py\
 	Hebrew.py\
@@ -175,7 +174,7 @@ pkgpython_PYTHON = \
 	PaperMenu.py\
 	PedView.py\
 	PeopleView.py\
-	PeopleStore.py\
+	PeopleModel.py\
 	PlaceView.py\
 	Plugins.py\
 	QuestionDialog.py\
@@ -198,7 +197,6 @@ pkgpython_PYTHON = \
 	TransTable.py\
 	UrlEdit.py\
 	Utils.py\
-	VersionControl.py\
 	Witness.py\
 	WriteXML.py\
 	SelectPerson.py\