diff --git a/ChangeLog b/ChangeLog
index bffbf115c..9fad1e041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2006-03-03  Don Allingham  <don@gramps-project.org>
+	* src/EditName.py: renamed from NameEdit.py
+	* src/EditEvent.py: renamed from EventEdit.py
 	* src/images/Makefile.am: restore
 	* src/plugins/Makefile.am: remove stock_link.png from dependency list
 
diff --git a/src/DisplayTabs.py b/src/DisplayTabs.py
index 4c0297a19..01b1c3d68 100644
--- a/src/DisplayTabs.py
+++ b/src/DisplayTabs.py
@@ -978,11 +978,11 @@ class NameEmbedList(EmbeddedList):
         return ((1,0),(1,1))
 
     def add_button_clicked(self,obj):
-        import NameEdit
+        import EditName
         name = RelLib.Name()
         try:
-            NameEdit.NameEditor(self.dbstate, self.uistate, self.track,
-                                name, self.add_callback)
+            EditName.EditName(self.dbstate, self.uistate, self.track,
+                              name, self.add_callback)
         except Errors.WindowActiveError:
             pass
 
@@ -993,10 +993,10 @@ class NameEmbedList(EmbeddedList):
     def edit_button_clicked(self,obj):
         name = self.get_selected()
         if name:
-            import NameEdit
+            import EditName
             try:
-                NameEdit.NameEditor(self.dbstate, self.uistate, self.track,
-                                    name, self.edit_callback)
+                EditName.EditName(self.dbstate, self.uistate, self.track,
+                                  name, self.edit_callback)
             except Errors.WindowActiveError:
                 pass
 
diff --git a/src/EventEdit.py b/src/EditEvent.py
similarity index 100%
rename from src/EventEdit.py
rename to src/EditEvent.py
diff --git a/src/EditName.py b/src/EditName.py
index 296c4f122..9cd35ae04 100644
--- a/src/EditName.py
+++ b/src/EditName.py
@@ -50,10 +50,10 @@ from GrampsWidgets import *
 
 #-------------------------------------------------------------------------
 #
-# NameEditor class
+# EditName class
 #
 #-------------------------------------------------------------------------
-class NameEditor(EditSecondary.EditSecondary):
+class EditName(EditSecondary.EditSecondary):
 
     def __init__(self, dbstate, uistate, track, name, callback):