diff --git a/gramps/plugins/gramplet/agestats.py b/gramps/plugins/gramplet/agestats.py
index 3db31bd99..4300f5462 100644
--- a/gramps/plugins/gramplet/agestats.py
+++ b/gramps/plugins/gramplet/agestats.py
@@ -19,11 +19,24 @@
 #
 
 """
+Age Stats Gramplet
+
 This Gramplet shows textual distributions of age breakdowns of various types.
 """
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
 
 from collections import defaultdict
 
+#------------------------------------------------------------------------
+#
+# Gramps modules
+#
+#------------------------------------------------------------------------
+
 from gramps.gen.plug import Gramplet
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
diff --git a/gramps/plugins/gramplet/ancestor.py b/gramps/plugins/gramplet/ancestor.py
index b21d8e8eb..9266093a6 100644
--- a/gramps/plugins/gramplet/ancestor.py
+++ b/gramps/plugins/gramplet/ancestor.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-"""Ancestor Gramplet"""
+"""Ancestors Gramplet"""
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps/plugins/gramplet/gramplet.gpr.py b/gramps/plugins/gramplet/gramplet.gpr.py
index 6e8052a6d..bcbf4817d 100644
--- a/gramps/plugins/gramplet/gramplet.gpr.py
+++ b/gramps/plugins/gramplet/gramplet.gpr.py
@@ -80,8 +80,8 @@ register(GRAMPLET,
          )
 
 register(GRAMPLET,
-         id = "Descendant",
-         name=_("Descendant"),
+         id = "Descendants",
+         name=_("Descendants"),
          description = _("Gramplet showing active person's descendants"),
          status = STABLE,
          fname="descendant.py",
@@ -98,7 +98,7 @@ register(GRAMPLET,
 
 register(GRAMPLET,
          id = "Ancestor",
-         name=_("Ancestor"),
+         name=_("Ancestors"),
          description = _("Gramplet showing active person's ancestors"),
          status = STABLE,
          fname="ancestor.py",
@@ -376,7 +376,7 @@ register(GRAMPLET,
          fname="mediapreview.py",
          height=200,
          gramplet = 'MediaPreview',
-         gramplet_title=_("Preview"),
+         gramplet_title=_("Media Preview"),
          navtypes=["Media"],
          )
 
@@ -393,8 +393,8 @@ except ImportError:
 
 if available:
     register(GRAMPLET,
-            id = "Metadata Viewer",
-            name = _("Metadata Viewer"),
+            id = "Image Metadata Viewer",
+            name = _("Image Metadata"),
             description = _("Gramplet showing metadata for a media object"),
             version = "1.0.0",
             gramps_target_version=MODULE_VERSION,
@@ -1096,7 +1096,7 @@ register(GRAMPLET,
 
 register(GRAMPLET,
          id='Records Gramplet',
-         name=_("Records Gramplet"),
+         name=_("Records"),
          description=_("Shows some interesting records about people and families"),
          version='1.0',
          gramps_target_version=MODULE_VERSION,
@@ -1250,7 +1250,7 @@ register(GRAMPLET,
 
 register(GRAMPLET,
          id="SoundEx Generator",
-         name=_("SoundEx Generator"),
+         name=_("SoundEx"),
          description = _("Gramplet to generate SoundEx codes"),
          version="1.0.0",
          gramps_target_version=MODULE_VERSION,
diff --git a/gramps/plugins/gramplet/metadataviewer.py b/gramps/plugins/gramplet/metadataviewer.py
index b0eeaf0d8..a861ba48c 100644
--- a/gramps/plugins/gramplet/metadataviewer.py
+++ b/gramps/plugins/gramplet/metadataviewer.py
@@ -20,6 +20,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+"""
+Image Metadata Gramplet
+"""
+#-------------------------------------------------------------------------
+#
+# Gramps modules
+#
+#-------------------------------------------------------------------------
 from gramps.plugins.lib.libmetadata import MetadataView
 from gramps.gen.plug import Gramplet
 from gramps.gen.utils.file import media_path_full
diff --git a/gramps/plugins/gramplet/sessionloggramplet.py b/gramps/plugins/gramplet/sessionloggramplet.py
index 98178ed5a..bd750da98 100644
--- a/gramps/plugins/gramplet/sessionloggramplet.py
+++ b/gramps/plugins/gramplet/sessionloggramplet.py
@@ -18,11 +18,17 @@
 
 #------------------------------------------------------------------------
 #
-# Gramps modules
+# Python modules
 #
 #------------------------------------------------------------------------
 import time
 
+#------------------------------------------------------------------------
+#
+# Gramps modules
+#
+#------------------------------------------------------------------------
+
 from gramps.gen.lib import Person, Family
 from gramps.gen.db import PERSON_KEY, FAMILY_KEY, TXNDEL
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/topsurnamesgramplet.py b/gramps/plugins/gramplet/topsurnamesgramplet.py
index c9dc3e34f..c06218537 100644
--- a/gramps/plugins/gramplet/topsurnamesgramplet.py
+++ b/gramps/plugins/gramplet/topsurnamesgramplet.py
@@ -16,6 +16,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+#------------------------------------------------------------------------
+#
+# Python modules
+#
+#------------------------------------------------------------------------
+
 from collections import defaultdict
 
 #------------------------------------------------------------------------