diff --git a/src/Editors/Makefile.am b/src/Editors/Makefile.am
index 8d4227306..56d645415 100644
--- a/src/Editors/Makefile.am
+++ b/src/Editors/Makefile.am
@@ -30,7 +30,8 @@ pkgdata_PYTHON = \
 	_EditSource.py \
 	_EditSourceRef.py \
 	_EditNote.py \
-	_EditUrl.py
+	_EditUrl.py \
+	ObjectEntries.py
 
 pkgpyexecdir = @pkgpyexecdir@/Editors
 pkgpythondir = @pkgpythondir@/Editors
diff --git a/src/objectentries.py b/src/Editors/ObjectEntries.py
similarity index 100%
rename from src/objectentries.py
rename to src/Editors/ObjectEntries.py
diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py
index ab0e04043..8cd57058f 100644
--- a/src/Editors/_EditEvent.py
+++ b/src/Editors/_EditEvent.py
@@ -43,8 +43,8 @@ import const
 import Config
 import gen.lib
 import GrampsDisplay
-from Editors import EditPrimary
-from objectentries import PlaceEntry
+from _EditPrimary import EditPrimary
+from ObjectEntries import PlaceEntry
 
 from QuestionDialog import ErrorDialog
 from DisplayTabs import (SourceEmbedList, NoteTab, GalleryTab, 
diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py
index c19731525..43280d69a 100644
--- a/src/Editors/_EditEventRef.py
+++ b/src/Editors/_EditEventRef.py
@@ -49,7 +49,7 @@ from widgets import (PrivacyButton, MonitoredEntry,
                      MonitoredDate, MonitoredDataType)
 from _EditReference import RefTab, EditReference
 
-from objectentries import PlaceEntry
+from ObjectEntries import PlaceEntry
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py
index ac9ace473..22f4beb1e 100644
--- a/src/Editors/_EditLdsOrd.py
+++ b/src/Editors/_EditLdsOrd.py
@@ -52,7 +52,7 @@ from BasicUtils import name_displayer
 import LdsUtils
 
 from _EditSecondary import EditSecondary
-from objectentries import PlaceEntry
+from ObjectEntries import PlaceEntry
 
 from DisplayTabs import SourceEmbedList,NoteTab
 from widgets import (PrivacyButton, MonitoredDate, 
diff --git a/src/Makefile.am b/src/Makefile.am
index e3a0763ff..aa6b9a2da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,8 +81,7 @@ gdir_PYTHON = \
 	ViewManager.py\
 	UndoHistory.py\
 	PlaceUtils.py\
-	ProgressDialog.py \
-	objectentries.py
+	ProgressDialog.py
 
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo