diff --git a/ChangeLog b/ChangeLog
index 80449436f..4081ba3e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-07 Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/Plugins.py: Use doc lists from PluginMgr.
+	* src/Exporter.py: Use exports list from PluginMgr.
+	* src/plugins/BookReport.py: Import Plugins module.
+	* src/NameEdit.py (NameEditor.__init__): Typos.
+
 2005-01-07 Eero Tamminen <eerot@sf>
 	* src/Makefile.am: Added GrampsKeys.py and GrampsIniKeys.py so
 	  that Gramps starts up after installation
diff --git a/src/Exporter.py b/src/Exporter.py
index 048d0d82a..cda00a502 100644
--- a/src/Exporter.py
+++ b/src/Exporter.py
@@ -49,7 +49,7 @@ import gnome.ui
 #-------------------------------------------------------------------------
 import const
 import Utils
-import Plugins
+import PluginMgr
 import QuestionDialog
 import GrampsKeys
 
@@ -376,7 +376,7 @@ class Exporter:
     def build_exports(self):
         """
         This method builds its own list of available exports. 
-        The list is built from the Plugins._exports list 
+        The list is built from the PluginMgr.export_list list 
         and from the locally defined exports (i.e. native export defined here).
         """
         native_title = _('GRAMPS _GRDB database')
@@ -390,4 +390,4 @@ class Exporter:
 
         self.exports = [ (native_export,native_title,native_description,
                     native_config,native_ext) ]
-        self.exports = self.exports + [ item for item in Plugins._exports ]
+        self.exports = self.exports + [ item for item in PluginMgr.export_list ]
diff --git a/src/NameEdit.py b/src/NameEdit.py
index c03835e6b..bf4445c41 100644
--- a/src/NameEdit.py
+++ b/src/NameEdit.py
@@ -90,14 +90,14 @@ class NameEditor:
         types = const.NameTypesMap.get_values()
         types.sort()
         AutoComp.fill_combo(self.type_combo,types)
-	self.type_field = self.type_combo.get_child()
+        self.type_field = self.type_combo.get_child()
 
         if self.name:
             self.srcreflist = self.name.get_source_references()
         else:
             self.srcreflist = []
 
-        full_name = NameDisplay.displayer.display(parent)
+        full_name = NameDisplay.displayer.display_name(name)
 
         alt_title = self.top.get_widget("title")
 
diff --git a/src/Plugins.py b/src/Plugins.py
index 3f4eb2533..b236b3f30 100644
--- a/src/Plugins.py
+++ b/src/Plugins.py
@@ -511,9 +511,9 @@ class GrampsTextFormatComboBox(gtk.ComboBox):
 
         out_pref = GrampsKeys.get_output_preference()
         index = 0
-        _textdoc.sort()
+        PluginMgr.textdoc_list.sort()
         active_index = 0
-        for item in _textdoc:
+        for item in PluginMgr.textdoc_list:
             if tables and item[2] == 0:
                 continue
             name = item[0]
@@ -528,22 +528,22 @@ class GrampsTextFormatComboBox(gtk.ComboBox):
         self.set_active(active_index)
 
     def get_label(self):
-        return _textdoc[self.get_active()][0]
+        return PluginMgr.textdoc_list[self.get_active()][0]
 
     def get_reference(self):
-        return _textdoc[self.get_active()][1]
+        return PluginMgr.textdoc_list[self.get_active()][1]
 
     def get_paper(self):
-        return _textdoc[self.get_active()][3]
+        return PluginMgr.textdoc_list[self.get_active()][3]
 
     def get_styles(self):
-        return _textdoc[self.get_active()][4]
+        return PluginMgr.textdoc_list[self.get_active()][4]
 
     def get_ext(self):
-        return _textdoc[self.get_active()][5]
+        return PluginMgr.textdoc_list[self.get_active()][5]
 
     def get_printable(self):
-        return _textdoc[self.get_active()][6]
+        return PluginMgr.textdoc_list[self.get_active()][6]
 
 class GrampsDrawFormatComboBox(gtk.ComboBox):
 
@@ -556,9 +556,9 @@ class GrampsDrawFormatComboBox(gtk.ComboBox):
 
         out_pref = GrampsKeys.get_output_preference()
         index = 0
-        _drawdoc.sort()
+        PluginMgr.drawdoc_list.sort()
         active_index = 0
-        for item in _drawdoc:
+        for item in PluginMgr.drawdoc_list:
             if tables and item[2] == 0:
                 continue
             name = item[0]
@@ -573,22 +573,22 @@ class GrampsDrawFormatComboBox(gtk.ComboBox):
         self.set_active(active_index)
 
     def get_reference(self):
-        return _drawdoc[self.get_active()][1]
+        return PluginMgr.drawdoc_list[self.get_active()][1]
 
     def get_label(self):
-        return _drawdoc[self.get_active()][0]
+        return PluginMgr.drawdoc_list[self.get_active()][0]
 
     def get_paper(self):
-        return _drawdoc[self.get_active()][2]
+        return PluginMgr.drawdoc_list[self.get_active()][2]
 
     def get_styles(self):
-        return _drawdoc[self.get_active()][3]
+        return PluginMgr.drawdoc_list[self.get_active()][3]
 
     def get_ext(self):
-        return _drawdoc[self.get_active()][4]
+        return PluginMgr.drawdoc_list[self.get_active()][4]
 
     def get_printable(self):
-        return _drawdoc[self.get_active()][5]
+        return PluginMgr.drawdoc_list[self.get_active()][5]
 
 class GrampsBookFormatComboBox(gtk.ComboBox):
 
@@ -601,10 +601,10 @@ class GrampsBookFormatComboBox(gtk.ComboBox):
 
         out_pref = GrampsKeys.get_output_preference()
         index = 0
-        _drawdoc.sort()
+        PluginMgr.drawdoc_list.sort()
         active_index = 0
         self.data = []
-        for item in _bookdoc:
+        for item in PluginMgr.bookdoc_list:
             if tables and item[2] == 0:
                 continue
             self.data.append(item)
diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py
index 60d450893..5c0af41bc 100644
--- a/src/plugins/BookReport.py
+++ b/src/plugins/BookReport.py
@@ -63,6 +63,7 @@ import Report
 import BaseDoc
 from QuestionDialog import WarningDialog
 import ReportOptions
+import Plugins
 
 #------------------------------------------------------------------------
 #