diff --git a/src/EditEvent.py b/src/EditEvent.py
index 490be1a3f..e7abfe75c 100644
--- a/src/EditEvent.py
+++ b/src/EditEvent.py
@@ -68,10 +68,10 @@ for event_type in Utils.family_events.keys():
 
 #-------------------------------------------------------------------------
 #
-# EventEditor class
+# EditEvent class
 #
 #-------------------------------------------------------------------------
-class EventEditor(EditPrimary.EditPrimary):
+class EditEvent(EditPrimary.EditPrimary):
 
     def __init__(self,event,dbstate,uistate,track=[],callback=None):
 
diff --git a/src/EventView.py b/src/EventView.py
index f556b94e7..0f357be60 100644
--- a/src/EventView.py
+++ b/src/EventView.py
@@ -34,7 +34,7 @@ import gtk.gdk
 #-------------------------------------------------------------------------
 import RelLib
 import PageView
-import EventEdit
+import EditEvent
 import DisplayModels
 import const
 import Utils
@@ -115,13 +115,13 @@ class EventView(PageView.ListView):
         handle = self.first_selected()
         the_event = self.dbstate.db.get_event_from_handle(handle)
         try:
-            EventEdit.EventEditor(the_event,self.dbstate, self.uistate, [])
+            EditEvent.EditEvent(the_event,self.dbstate, self.uistate, [])
         except Errors.WindowActiveError:
             pass
 
     def add(self,obj):
         try:
-            EventEdit.EventEditor(RelLib.Event(),self.dbstate, self.uistate, [])
+            EditEvent.EditEvent(RelLib.Event(),self.dbstate, self.uistate, [])
         except Errors.WindowActiveError:
             pass
 
@@ -137,7 +137,7 @@ class EventView(PageView.ListView):
             
             event = db.get_event_from_handle(event_handle)
 
-            ans = EventEdit.DelEventQuery(event,db,
+            ans = EditEvent.DelEventQuery(event,db,
                                           person_list,family_list)
 
             if len(person_list) + len(family_list) > 0:
@@ -162,7 +162,7 @@ class EventView(PageView.ListView):
         for handle in mlist:
             event = self.dbstate.db.get_event_from_handle(handle)
             try:
-                EventEdit.EventEditor(event, self.dbstate, self.uistate)
+                EditEvent.EditEvent(event, self.dbstate, self.uistate)
             except Errors.WindowActiveError:
                 pass