diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index e636f2667..6743a8d70 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,8 @@
 2006-03-02  Don Allingham  <don@gramps-project.org>
+	* src/Makefile.am: adapt to module renames
+	* src/EditAttribute.py: renamed from AttrEdit.py
+	* src/EditAddress.py: renamed from AddrEdit.py
+	* src/DisplayTabs.py: adapt to module renames
 	* src/GrampsDb/_GedcomInfo.py: update to new data path
 	* src/const.py.in: new data, image path defintions
 	* src/gramps_main.py: update to new install paths
diff --git a/gramps2/src/DisplayTabs.py b/gramps2/src/DisplayTabs.py
index 6827d3355..75010188c 100644
--- a/gramps2/src/DisplayTabs.py
+++ b/gramps2/src/DisplayTabs.py
@@ -1033,11 +1033,11 @@ class AddrEmbedList(EmbeddedList):
         return ((1,0),(1,1),(1,2),(1,3),(1,4))
 
     def add_button_clicked(self,obj):
-        import EditAddr
+        import EditAddress
         addr = RelLib.Address()
         try:
-            EditAddr.EditAddress(self.dbstate, self.uistate, self.track,
-                                 addr, self.add_callback)
+            EditAddress.EditAddress(self.dbstate, self.uistate, self.track,
+                                    addr, self.add_callback)
         except Errors.WindowActiveError:
             pass
 
@@ -1048,10 +1048,10 @@ class AddrEmbedList(EmbeddedList):
     def edit_button_clicked(self,obj):
         addr = self.get_selected()
         if addr:
-            import EditAddr
+            import EditAddress
             try:
-                EditAddr.EditAddress(self.dbstate, self.uistate, self.track,
-                                     addr, self.edit_callback)
+                EditAddress.EditAddress(self.dbstate, self.uistate, self.track,
+                                        addr, self.edit_callback)
             except Errors.WindowActiveError:
                 pass
 
diff --git a/gramps2/src/EditAddr.py b/gramps2/src/EditAddress.py
similarity index 100%
rename from gramps2/src/EditAddr.py
rename to gramps2/src/EditAddress.py
diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/EditAttribute.py
similarity index 100%
rename from gramps2/src/AttrEdit.py
rename to gramps2/src/EditAttribute.py
diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am
index c236a0871..563499efb 100644
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@@ -24,11 +24,11 @@ docfiles = \
 
 gdir_PYTHON = \
 	AddMedia.py\
-	AddrEdit.py\
+	EditAddress.py\
 	ansel_utf8.py\
 	ArgHandler.py\
 	Assistant.py\
-	AttrEdit.py\
+	EditAttribute.py\
 	AutoComp.py\
 	BaseDoc.py\
 	Bookmarks.py\