diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py
index ff7141e79..6d06d8a7c 100644
--- a/gramps2/src/AttrEdit.py
+++ b/gramps2/src/AttrEdit.py
@@ -21,7 +21,7 @@
 # $Id$ 
 
 """
-The AttrEdit module provides the AttributeEditor class. This provides a
+The EditAttribute module provides the AttributeEditor class. This provides a
 mechanism for the user to edit attribute information.
 """
 
@@ -59,10 +59,10 @@ from GrampsWidgets import *
 
 #-------------------------------------------------------------------------
 #
-# AttributeEditor class
+# EditAttribute class
 #
 #-------------------------------------------------------------------------
-class AttributeEditor(EditSecondary.EditSecondary):
+class EditAttribute(EditSecondary.EditSecondary):
     """
     Displays a dialog that allows the user to edit an attribute.
     """
diff --git a/gramps2/src/DisplayTabs.py b/gramps2/src/DisplayTabs.py
index f4c684c2c..6827d3355 100644
--- a/gramps2/src/DisplayTabs.py
+++ b/gramps2/src/DisplayTabs.py
@@ -866,11 +866,11 @@ class AttrEmbedList(EmbeddedList):
         return ((1,0),(1,1))
 
     def add_button_clicked(self,obj):
-        import AttrEdit
+        import EditAttribute
         pname = ''
         attr_list = []
         try:
-            AttrEdit.AttributeEditor(
+            EditAttribute.EditAttribute(
                 self.dbstate, self.uistate, self.track, None,
                 pname, attr_list, self.add_callback)
         except Errors.WindowActiveError:
@@ -884,11 +884,11 @@ class AttrEmbedList(EmbeddedList):
     def edit_button_clicked(self,obj):
         attr = self.get_selected()
         if attr:
-            import AttrEdit
+            import EditAttribute
             pname = ''
             attr_list = []
             try:
-                AttrEdit.AttributeEditor(
+                EditAttribute.EditAttribute(
                     self.dbstate, self.uistate, self.track, attr,
                     pname, attr_list, self.edit_callback)
             except Errors.WindowActiveError:
@@ -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 AddrEdit
+        import EditAddr
         addr = RelLib.Address()
         try:
-            AddrEdit.AddressEditor(self.dbstate, self.uistate, self.track,
-                                   addr, self.add_callback)
+            EditAddr.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 AddrEdit
+            import EditAddr
             try:
-                AddrEdit.AddressEditor(self.dbstate, self.uistate, self.track,
-                                       addr, self.edit_callback)
+                EditAddr.EditAddress(self.dbstate, self.uistate, self.track,
+                                     addr, self.edit_callback)
             except Errors.WindowActiveError:
                 pass
 
diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/EditAddr.py
similarity index 97%
rename from gramps2/src/AddrEdit.py
rename to gramps2/src/EditAddr.py
index 6a26ba2fa..587662e5a 100644
--- a/gramps2/src/AddrEdit.py
+++ b/gramps2/src/EditAddr.py
@@ -21,7 +21,7 @@
 # $Id$
 
 """
-The AddrEdit module provides the AddressEditor class. This provides a
+The EditAddress module provides the EditAddress class. This provides a
 mechanism for the user to edit address information.
 """
 
@@ -52,10 +52,10 @@ from GrampsWidgets import *
 
 #-------------------------------------------------------------------------
 #
-# AddressEditor class
+# EditAddress class
 #
 #-------------------------------------------------------------------------
-class AddressEditor(EditSecondary.EditSecondary):
+class EditAddress(EditSecondary.EditSecondary):
     """
     Displays a dialog that allows the user to edit an address.
     """