diff --git a/gramps/cli/grampscli.py b/gramps/cli/grampscli.py
index a1073e312..23a538928 100644
--- a/gramps/cli/grampscli.py
+++ b/gramps/cli/grampscli.py
@@ -41,7 +41,7 @@ import logging
 LOG = logging.getLogger(".grampscli")
 #-------------------------------------------------------------------------
 #
-# GRAMPS  modules
+# Gramps  modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.display.name import displayer as name_displayer
diff --git a/gramps/gen/const.py b/gramps/gen/const.py
index c0c14f382..8595fd035 100644
--- a/gramps/gen/const.py
+++ b/gramps/gen/const.py
@@ -174,7 +174,7 @@ LICENSE_FILE = os.path.join(_resources.doc_dir, 'COPYING')
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS environment variables dictionary
+# Gramps environment variables dictionary
 #
 #-------------------------------------------------------------------------
 ENV = {
diff --git a/gramps/gen/datehandler/_date_ar.py b/gramps/gen/datehandler/_date_ar.py
index dc9a4db36..7e18dde4d 100644
--- a/gramps/gen/datehandler/_date_ar.py
+++ b/gramps/gen/datehandler/_date_ar.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_bg.py b/gramps/gen/datehandler/_date_bg.py
index 82e91d4fd..53f605eec 100644
--- a/gramps/gen/datehandler/_date_bg.py
+++ b/gramps/gen/datehandler/_date_bg.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_ca.py b/gramps/gen/datehandler/_date_ca.py
index f712547d7..8802d2199 100644
--- a/gramps/gen/datehandler/_date_ca.py
+++ b/gramps/gen/datehandler/_date_ca.py
@@ -34,7 +34,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_cs.py b/gramps/gen/datehandler/_date_cs.py
index 76493ea62..957ee098e 100644
--- a/gramps/gen/datehandler/_date_cs.py
+++ b/gramps/gen/datehandler/_date_cs.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_da.py b/gramps/gen/datehandler/_date_da.py
index 2ea663190..4eb4a44e1 100644
--- a/gramps/gen/datehandler/_date_da.py
+++ b/gramps/gen/datehandler/_date_da.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_de.py b/gramps/gen/datehandler/_date_de.py
index e5616966c..9df66902f 100644
--- a/gramps/gen/datehandler/_date_de.py
+++ b/gramps/gen/datehandler/_date_de.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_el.py b/gramps/gen/datehandler/_date_el.py
index 0b46ab16f..888924ade 100644
--- a/gramps/gen/datehandler/_date_el.py
+++ b/gramps/gen/datehandler/_date_el.py
@@ -33,7 +33,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_es.py b/gramps/gen/datehandler/_date_es.py
index 1c7c65827..13b0f40ca 100644
--- a/gramps/gen/datehandler/_date_es.py
+++ b/gramps/gen/datehandler/_date_es.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_fi.py b/gramps/gen/datehandler/_date_fi.py
index 3eb57a08d..0db04780b 100644
--- a/gramps/gen/datehandler/_date_fi.py
+++ b/gramps/gen/datehandler/_date_fi.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_fr.py b/gramps/gen/datehandler/_date_fr.py
index 02a363b38..5cf4ee599 100644
--- a/gramps/gen/datehandler/_date_fr.py
+++ b/gramps/gen/datehandler/_date_fr.py
@@ -34,7 +34,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/datehandler/_date_hr.py b/gramps/gen/datehandler/_date_hr.py
index dc4813fec..33a19e043 100644
--- a/gramps/gen/datehandler/_date_hr.py
+++ b/gramps/gen/datehandler/_date_hr.py
@@ -36,7 +36,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_it.py b/gramps/gen/datehandler/_date_it.py
index f0f9cd184..e501abf6a 100644
--- a/gramps/gen/datehandler/_date_it.py
+++ b/gramps/gen/datehandler/_date_it.py
@@ -34,7 +34,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_ja.py b/gramps/gen/datehandler/_date_ja.py
index b2ae0c5c4..3b6d125ff 100644
--- a/gramps/gen/datehandler/_date_ja.py
+++ b/gramps/gen/datehandler/_date_ja.py
@@ -34,7 +34,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/datehandler/_date_lt.py b/gramps/gen/datehandler/_date_lt.py
index d9a58d045..e688bc1e2 100644
--- a/gramps/gen/datehandler/_date_lt.py
+++ b/gramps/gen/datehandler/_date_lt.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_nb.py b/gramps/gen/datehandler/_date_nb.py
index 5e21139f1..a45e3b380 100644
--- a/gramps/gen/datehandler/_date_nb.py
+++ b/gramps/gen/datehandler/_date_nb.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_nl.py b/gramps/gen/datehandler/_date_nl.py
index 0dd441baa..b8870aef6 100644
--- a/gramps/gen/datehandler/_date_nl.py
+++ b/gramps/gen/datehandler/_date_nl.py
@@ -38,7 +38,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_pl.py b/gramps/gen/datehandler/_date_pl.py
index 7dc4afb01..9c2218955 100644
--- a/gramps/gen/datehandler/_date_pl.py
+++ b/gramps/gen/datehandler/_date_pl.py
@@ -35,7 +35,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_pt.py b/gramps/gen/datehandler/_date_pt.py
index 8bee5d0fe..48bd501d5 100644
--- a/gramps/gen/datehandler/_date_pt.py
+++ b/gramps/gen/datehandler/_date_pt.py
@@ -34,7 +34,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_ru.py b/gramps/gen/datehandler/_date_ru.py
index c5489a2cd..87d46cf54 100644
--- a/gramps/gen/datehandler/_date_ru.py
+++ b/gramps/gen/datehandler/_date_ru.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_sk.py b/gramps/gen/datehandler/_date_sk.py
index 0f628b1e4..1f17a9289 100644
--- a/gramps/gen/datehandler/_date_sk.py
+++ b/gramps/gen/datehandler/_date_sk.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_sl.py b/gramps/gen/datehandler/_date_sl.py
index 60976e039..3fc5dea88 100644
--- a/gramps/gen/datehandler/_date_sl.py
+++ b/gramps/gen/datehandler/_date_sl.py
@@ -34,7 +34,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_sr.py b/gramps/gen/datehandler/_date_sr.py
index c99cd3496..11cf16096 100644
--- a/gramps/gen/datehandler/_date_sr.py
+++ b/gramps/gen/datehandler/_date_sr.py
@@ -35,7 +35,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_sv.py b/gramps/gen/datehandler/_date_sv.py
index d3e38cd5a..0ff609604 100644
--- a/gramps/gen/datehandler/_date_sv.py
+++ b/gramps/gen/datehandler/_date_sv.py
@@ -32,7 +32,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_date_uk.py b/gramps/gen/datehandler/_date_uk.py
index 1699b8081..ad0b1dcba 100644
--- a/gramps/gen/datehandler/_date_uk.py
+++ b/gramps/gen/datehandler/_date_uk.py
@@ -33,7 +33,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/datehandler/_date_zh_CN.py b/gramps/gen/datehandler/_date_zh_CN.py
index 7159f90e0..248773910 100644
--- a/gramps/gen/datehandler/_date_zh_CN.py
+++ b/gramps/gen/datehandler/_date_zh_CN.py
@@ -33,7 +33,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/datehandler/_date_zh_TW.py b/gramps/gen/datehandler/_date_zh_TW.py
index cf1596fb4..b2aee334d 100644
--- a/gramps/gen/datehandler/_date_zh_TW.py
+++ b/gramps/gen/datehandler/_date_zh_TW.py
@@ -33,7 +33,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/datehandler/_datedisplay.py b/gramps/gen/datehandler/_datedisplay.py
index 636de3074..06eab6e4f 100644
--- a/gramps/gen/datehandler/_datedisplay.py
+++ b/gramps/gen/datehandler/_datedisplay.py
@@ -36,7 +36,7 @@ log = logging.getLogger(".DateDisplay")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_datehandler.py b/gramps/gen/datehandler/_datehandler.py
index 95dc3b1fc..558251e14 100644
--- a/gramps/gen/datehandler/_datehandler.py
+++ b/gramps/gen/datehandler/_datehandler.py
@@ -39,7 +39,7 @@ log = logging.getLogger(".gen.datehandler")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._dateparser import DateParser
diff --git a/gramps/gen/datehandler/_dateparser.py b/gramps/gen/datehandler/_dateparser.py
index 02670fb52..bf5e24622 100644
--- a/gramps/gen/datehandler/_dateparser.py
+++ b/gramps/gen/datehandler/_dateparser.py
@@ -42,7 +42,7 @@ log = logging.getLogger(".DateParser")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date, DateError, Today
diff --git a/gramps/gen/datehandler/_dateutils.py b/gramps/gen/datehandler/_dateutils.py
index 97f5f21a1..3208bf164 100644
--- a/gramps/gen/datehandler/_dateutils.py
+++ b/gramps/gen/datehandler/_dateutils.py
@@ -31,7 +31,7 @@ import time
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..lib.date import Date
diff --git a/gramps/gen/datehandler/_grampslocale.py b/gramps/gen/datehandler/_grampslocale.py
index 4af0c5c82..439a42ef4 100644
--- a/gramps/gen/datehandler/_grampslocale.py
+++ b/gramps/gen/datehandler/_grampslocale.py
@@ -99,7 +99,7 @@ try:
         )
 
     tformat = locale.nl_langinfo(locale.D_FMT).replace('%y','%Y')
-    # GRAMPS treats dates with '-' as ISO format, so replace separator on
+    # Gramps treats dates with '-' as ISO format, so replace separator on
     # locale dates that use '-' to prevent confict
     tformat = tformat.replace('-', '/')
 
@@ -178,7 +178,7 @@ except:
 
     timestr = time.strftime('%x',(2005,10,25,1,1,1,1,1,1))
 
-    # GRAMPS treats dates with '-' as ISO format, so replace separator on
+    # Gramps treats dates with '-' as ISO format, so replace separator on
     # locale dates that use '-' to prevent confict
     timestr = timestr.replace('-', '/')
     time2fmt_map = {
diff --git a/gramps/gen/datehandler/test/datehandler_test.py b/gramps/gen/datehandler/test/datehandler_test.py
index 424939f79..eb3eabd3d 100644
--- a/gramps/gen/datehandler/test/datehandler_test.py
+++ b/gramps/gen/datehandler/test/datehandler_test.py
@@ -43,7 +43,7 @@ if '-v' in sys.argv or '--verbose' in sys.argv:
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...lib import Date, DateError
diff --git a/gramps/gen/display/name.py b/gramps/gen/display/name.py
index 0cba3c958..aab2b1fad 100644
--- a/gramps/gen/display/name.py
+++ b/gramps/gen/display/name.py
@@ -63,7 +63,7 @@ LOG = logging.getLogger(".gramps.gen")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..const import ARABIC_COMMA, ARABIC_SEMICOLON, GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/filters/_filterlist.py b/gramps/gen/filters/_filterlist.py
index 4ec9f8f94..3c308c26c 100644
--- a/gramps/gen/filters/_filterlist.py
+++ b/gramps/gen/filters/_filterlist.py
@@ -31,7 +31,7 @@ import io
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._filterparser import FilterParser
diff --git a/gramps/gen/filters/_paramfilter.py b/gramps/gen/filters/_paramfilter.py
index d58d45662..1a50ecab9 100644
--- a/gramps/gen/filters/_paramfilter.py
+++ b/gramps/gen/filters/_paramfilter.py
@@ -24,7 +24,7 @@ Package providing filtering framework for GRAMPS.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._genericfilter import GenericFilter
diff --git a/gramps/gen/filters/rules/_changedsincebase.py b/gramps/gen/filters/rules/_changedsincebase.py
index c04d1330f..119b25097 100644
--- a/gramps/gen/filters/rules/_changedsincebase.py
+++ b/gramps/gen/filters/rules/_changedsincebase.py
@@ -32,7 +32,7 @@ import time
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_everything.py b/gramps/gen/filters/rules/_everything.py
index 36ac84bc2..7634b59ac 100644
--- a/gramps/gen/filters/rules/_everything.py
+++ b/gramps/gen/filters/rules/_everything.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hasattributebase.py b/gramps/gen/filters/rules/_hasattributebase.py
index e814428a5..5bb7090e2 100644
--- a/gramps/gen/filters/rules/_hasattributebase.py
+++ b/gramps/gen/filters/rules/_hasattributebase.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...lib.attrtype import AttributeType
diff --git a/gramps/gen/filters/rules/_hascitationbase.py b/gramps/gen/filters/rules/_hascitationbase.py
index 9a70f84ea..b86344851 100644
--- a/gramps/gen/filters/rules/_hascitationbase.py
+++ b/gramps/gen/filters/rules/_hascitationbase.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...datehandler import parser
diff --git a/gramps/gen/filters/rules/_haseventbase.py b/gramps/gen/filters/rules/_haseventbase.py
index 861860a65..71749dfc0 100644
--- a/gramps/gen/filters/rules/_haseventbase.py
+++ b/gramps/gen/filters/rules/_haseventbase.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...datehandler import parser
diff --git a/gramps/gen/filters/rules/_hasgallerybase.py b/gramps/gen/filters/rules/_hasgallerybase.py
index f9f6c2ffa..2a7623836 100644
--- a/gramps/gen/filters/rules/_hasgallerybase.py
+++ b/gramps/gen/filters/rules/_hasgallerybase.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hasgrampsid.py b/gramps/gen/filters/rules/_hasgrampsid.py
index 8e7ab7240..d4e9fab72 100644
--- a/gramps/gen/filters/rules/_hasgrampsid.py
+++ b/gramps/gen/filters/rules/_hasgrampsid.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hasldsbase.py b/gramps/gen/filters/rules/_hasldsbase.py
index 55773cb7c..ba1b57d66 100644
--- a/gramps/gen/filters/rules/_hasldsbase.py
+++ b/gramps/gen/filters/rules/_hasldsbase.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/filters/rules/_hasnotebase.py b/gramps/gen/filters/rules/_hasnotebase.py
index f8c634f78..ca14e19ba 100644
--- a/gramps/gen/filters/rules/_hasnotebase.py
+++ b/gramps/gen/filters/rules/_hasnotebase.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hasnoteregexbase.py b/gramps/gen/filters/rules/_hasnoteregexbase.py
index fd6e27e42..87cf43d60 100644
--- a/gramps/gen/filters/rules/_hasnoteregexbase.py
+++ b/gramps/gen/filters/rules/_hasnoteregexbase.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hasnotesubstrbase.py b/gramps/gen/filters/rules/_hasnotesubstrbase.py
index 2371debac..11e83da16 100644
--- a/gramps/gen/filters/rules/_hasnotesubstrbase.py
+++ b/gramps/gen/filters/rules/_hasnotesubstrbase.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hasreferencecountbase.py b/gramps/gen/filters/rules/_hasreferencecountbase.py
index 2591f0259..04205a3df 100644
--- a/gramps/gen/filters/rules/_hasreferencecountbase.py
+++ b/gramps/gen/filters/rules/_hasreferencecountbase.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hassourcebase.py b/gramps/gen/filters/rules/_hassourcebase.py
index 27290c368..ebd66a1fe 100644
--- a/gramps/gen/filters/rules/_hassourcebase.py
+++ b/gramps/gen/filters/rules/_hassourcebase.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hassourcecountbase.py b/gramps/gen/filters/rules/_hassourcecountbase.py
index bd05fd19b..be72f1aa1 100644
--- a/gramps/gen/filters/rules/_hassourcecountbase.py
+++ b/gramps/gen/filters/rules/_hassourcecountbase.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hassourceofbase.py b/gramps/gen/filters/rules/_hassourceofbase.py
index b79083a54..da23850e4 100644
--- a/gramps/gen/filters/rules/_hassourceofbase.py
+++ b/gramps/gen/filters/rules/_hassourceofbase.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hastagbase.py b/gramps/gen/filters/rules/_hastagbase.py
index f6240dfe2..ee3c3d578 100644
--- a/gramps/gen/filters/rules/_hastagbase.py
+++ b/gramps/gen/filters/rules/_hastagbase.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_hastextmatchingregexpof.py b/gramps/gen/filters/rules/_hastextmatchingregexpof.py
index e2a238392..8ac18ce44 100644
--- a/gramps/gen/filters/rules/_hastextmatchingregexpof.py
+++ b/gramps/gen/filters/rules/_hastextmatchingregexpof.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import HasTextMatchingSubstringOf
diff --git a/gramps/gen/filters/rules/_hastextmatchingsubstringof.py b/gramps/gen/filters/rules/_hastextmatchingsubstringof.py
index 65eda997c..1a74d41bf 100644
--- a/gramps/gen/filters/rules/_hastextmatchingsubstringof.py
+++ b/gramps/gen/filters/rules/_hastextmatchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_isprivate.py b/gramps/gen/filters/rules/_isprivate.py
index ba040c40e..c8c4c9d8a 100644
--- a/gramps/gen/filters/rules/_isprivate.py
+++ b/gramps/gen/filters/rules/_isprivate.py
@@ -26,7 +26,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_ispublic.py b/gramps/gen/filters/rules/_ispublic.py
index ba16dd8ea..e2afbec6b 100644
--- a/gramps/gen/filters/rules/_ispublic.py
+++ b/gramps/gen/filters/rules/_ispublic.py
@@ -21,7 +21,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/filters/rules/_matcheseventfilterbase.py b/gramps/gen/filters/rules/_matcheseventfilterbase.py
index c0c220a9b..7b0f34fff 100644
--- a/gramps/gen/filters/rules/_matcheseventfilterbase.py
+++ b/gramps/gen/filters/rules/_matcheseventfilterbase.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/_matchesfilterbase.py b/gramps/gen/filters/rules/_matchesfilterbase.py
index 1be70fc67..f5ba10de9 100644
--- a/gramps/gen/filters/rules/_matchesfilterbase.py
+++ b/gramps/gen/filters/rules/_matchesfilterbase.py
@@ -28,7 +28,7 @@ LOG = logging.getLogger(".filter")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 # we need global variableCustomFilters, so we need to query gramps.gen.filters
diff --git a/gramps/gen/filters/rules/_matchessourceconfidencebase.py b/gramps/gen/filters/rules/_matchessourceconfidencebase.py
index aeed20d5b..4207a0f30 100644
--- a/gramps/gen/filters/rules/_matchessourceconfidencebase.py
+++ b/gramps/gen/filters/rules/_matchessourceconfidencebase.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/_matchessourcefilterbase.py b/gramps/gen/filters/rules/_matchessourcefilterbase.py
index 2d0d42c59..94157396c 100644
--- a/gramps/gen/filters/rules/_matchessourcefilterbase.py
+++ b/gramps/gen/filters/rules/_matchessourcefilterbase.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/_regexpidbase.py b/gramps/gen/filters/rules/_regexpidbase.py
index b662f3c9a..1fb457313 100644
--- a/gramps/gen/filters/rules/_regexpidbase.py
+++ b/gramps/gen/filters/rules/_regexpidbase.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import Rule
diff --git a/gramps/gen/filters/rules/citation/_allcitations.py b/gramps/gen/filters/rules/citation/_allcitations.py
index c03796c4c..4fab04c89 100644
--- a/gramps/gen/filters/rules/citation/_allcitations.py
+++ b/gramps/gen/filters/rules/citation/_allcitations.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/citation/_changedsince.py b/gramps/gen/filters/rules/citation/_changedsince.py
index 5704e72d2..d863f88e0 100644
--- a/gramps/gen/filters/rules/citation/_changedsince.py
+++ b/gramps/gen/filters/rules/citation/_changedsince.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/citation/_citationprivate.py b/gramps/gen/filters/rules/citation/_citationprivate.py
index b55025559..8b3a69858 100644
--- a/gramps/gen/filters/rules/citation/_citationprivate.py
+++ b/gramps/gen/filters/rules/citation/_citationprivate.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/citation/_hascitation.py b/gramps/gen/filters/rules/citation/_hascitation.py
index 97f1084f3..e1397b812 100644
--- a/gramps/gen/filters/rules/citation/_hascitation.py
+++ b/gramps/gen/filters/rules/citation/_hascitation.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/citation/_hasgallery.py b/gramps/gen/filters/rules/citation/_hasgallery.py
index 9ff5c646c..322be2867 100644
--- a/gramps/gen/filters/rules/citation/_hasgallery.py
+++ b/gramps/gen/filters/rules/citation/_hasgallery.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgallerybase import HasGalleryBase
diff --git a/gramps/gen/filters/rules/citation/_hasidof.py b/gramps/gen/filters/rules/citation/_hasidof.py
index 6901ad2a3..e73b7d69c 100644
--- a/gramps/gen/filters/rules/citation/_hasidof.py
+++ b/gramps/gen/filters/rules/citation/_hasidof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/citation/_hasnote.py b/gramps/gen/filters/rules/citation/_hasnote.py
index e42578a78..0e7d3a779 100644
--- a/gramps/gen/filters/rules/citation/_hasnote.py
+++ b/gramps/gen/filters/rules/citation/_hasnote.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotebase import HasNoteBase
diff --git a/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py
index ba9690832..ee90044c2 100644
--- a/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/citation/_hasnoteregexp.py b/gramps/gen/filters/rules/citation/_hasnoteregexp.py
index 45cdc67ec..1a68b0123 100644
--- a/gramps/gen/filters/rules/citation/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/citation/_hasnoteregexp.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/citation/_hasreferencecountof.py b/gramps/gen/filters/rules/citation/_hasreferencecountof.py
index afc70f86a..0025ff739 100644
--- a/gramps/gen/filters/rules/citation/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/citation/_hasreferencecountof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/citation/_hassource.py b/gramps/gen/filters/rules/citation/_hassource.py
index e1570d2d6..3902848e5 100644
--- a/gramps/gen/filters/rules/citation/_hassource.py
+++ b/gramps/gen/filters/rules/citation/_hassource.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourcebase import HasSourceBase
diff --git a/gramps/gen/filters/rules/citation/_hassourceidof.py b/gramps/gen/filters/rules/citation/_hassourceidof.py
index ae5924fcf..ba5e26873 100644
--- a/gramps/gen/filters/rules/citation/_hassourceidof.py
+++ b/gramps/gen/filters/rules/citation/_hassourceidof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgrampsid import HasGrampsId
diff --git a/gramps/gen/filters/rules/citation/_hastag.py b/gramps/gen/filters/rules/citation/_hastag.py
index cf61b1d4c..385b83c01 100644
--- a/gramps/gen/filters/rules/citation/_hastag.py
+++ b/gramps/gen/filters/rules/citation/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/citation/_matchesfilter.py b/gramps/gen/filters/rules/citation/_matchesfilter.py
index 9e8a1171d..adf45cfb0 100644
--- a/gramps/gen/filters/rules/citation/_matchesfilter.py
+++ b/gramps/gen/filters/rules/citation/_matchesfilter.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchesfilterbase import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/citation/_matchespagesubstringof.py b/gramps/gen/filters/rules/citation/_matchespagesubstringof.py
index 7d500fd2a..ac88dfa48 100644
--- a/gramps/gen/filters/rules/citation/_matchespagesubstringof.py
+++ b/gramps/gen/filters/rules/citation/_matchespagesubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py b/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py
index f9905d3f6..3625bb20d 100644
--- a/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py
+++ b/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/citation/_matchessourcefilter.py b/gramps/gen/filters/rules/citation/_matchessourcefilter.py
index f82621d3e..d94070e9d 100644
--- a/gramps/gen/filters/rules/citation/_matchessourcefilter.py
+++ b/gramps/gen/filters/rules/citation/_matchessourcefilter.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/citation/_regexpidof.py b/gramps/gen/filters/rules/citation/_regexpidof.py
index 14f2914f3..f7e7c25a5 100644
--- a/gramps/gen/filters/rules/citation/_regexpidof.py
+++ b/gramps/gen/filters/rules/citation/_regexpidof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/citation/_regexpsourceidof.py b/gramps/gen/filters/rules/citation/_regexpsourceidof.py
index e4ba7a661..f9963eae8 100644
--- a/gramps/gen/filters/rules/citation/_regexpsourceidof.py
+++ b/gramps/gen/filters/rules/citation/_regexpsourceidof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/event/_allevents.py b/gramps/gen/filters/rules/event/_allevents.py
index a81427c1b..6d4cc237c 100644
--- a/gramps/gen/filters/rules/event/_allevents.py
+++ b/gramps/gen/filters/rules/event/_allevents.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/event/_changedsince.py b/gramps/gen/filters/rules/event/_changedsince.py
index e79a7115b..3ce96ec74 100644
--- a/gramps/gen/filters/rules/event/_changedsince.py
+++ b/gramps/gen/filters/rules/event/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/event/_eventprivate.py b/gramps/gen/filters/rules/event/_eventprivate.py
index 8b8bd3f78..17e9f55d1 100644
--- a/gramps/gen/filters/rules/event/_eventprivate.py
+++ b/gramps/gen/filters/rules/event/_eventprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/event/_hasattribute.py b/gramps/gen/filters/rules/event/_hasattribute.py
index 3d7e1e028..6790820b0 100644
--- a/gramps/gen/filters/rules/event/_hasattribute.py
+++ b/gramps/gen/filters/rules/event/_hasattribute.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasattributebase import HasAttributeBase
diff --git a/gramps/gen/filters/rules/event/_hascitation.py b/gramps/gen/filters/rules/event/_hascitation.py
index 2eb579de8..ffd53c1c4 100644
--- a/gramps/gen/filters/rules/event/_hascitation.py
+++ b/gramps/gen/filters/rules/event/_hascitation.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hascitationbase import HasCitationBase
diff --git a/gramps/gen/filters/rules/event/_hasdata.py b/gramps/gen/filters/rules/event/_hasdata.py
index 3a4f0d545..8f114bc4f 100644
--- a/gramps/gen/filters/rules/event/_hasdata.py
+++ b/gramps/gen/filters/rules/event/_hasdata.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....datehandler import parser
diff --git a/gramps/gen/filters/rules/event/_hasgallery.py b/gramps/gen/filters/rules/event/_hasgallery.py
index 3b97b47c6..608dbd0a9 100644
--- a/gramps/gen/filters/rules/event/_hasgallery.py
+++ b/gramps/gen/filters/rules/event/_hasgallery.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgallerybase import HasGalleryBase
diff --git a/gramps/gen/filters/rules/event/_hasidof.py b/gramps/gen/filters/rules/event/_hasidof.py
index 12661e0ed..aa2188d53 100644
--- a/gramps/gen/filters/rules/event/_hasidof.py
+++ b/gramps/gen/filters/rules/event/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/event/_hasnote.py b/gramps/gen/filters/rules/event/_hasnote.py
index 83cd48e1b..27bdaa142 100644
--- a/gramps/gen/filters/rules/event/_hasnote.py
+++ b/gramps/gen/filters/rules/event/_hasnote.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotebase import HasNoteBase
diff --git a/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py
index 40ed71fb8..982d392c9 100644
--- a/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/event/_hasnoteregexp.py b/gramps/gen/filters/rules/event/_hasnoteregexp.py
index 676ca6e8a..ee7ca5de0 100644
--- a/gramps/gen/filters/rules/event/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/event/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/event/_hasreferencecountof.py b/gramps/gen/filters/rules/event/_hasreferencecountof.py
index 3ade0fb04..591ef6426 100644
--- a/gramps/gen/filters/rules/event/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/event/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/event/_hassourcecount.py b/gramps/gen/filters/rules/event/_hassourcecount.py
index c7f5b290a..99c771888 100644
--- a/gramps/gen/filters/rules/event/_hassourcecount.py
+++ b/gramps/gen/filters/rules/event/_hassourcecount.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourcecountbase import HasSourceCountBase
diff --git a/gramps/gen/filters/rules/event/_hastag.py b/gramps/gen/filters/rules/event/_hastag.py
index b56234b2a..24615135a 100644
--- a/gramps/gen/filters/rules/event/_hastag.py
+++ b/gramps/gen/filters/rules/event/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/event/_hastype.py b/gramps/gen/filters/rules/event/_hastype.py
index e87b18e71..a7ae6ec77 100644
--- a/gramps/gen/filters/rules/event/_hastype.py
+++ b/gramps/gen/filters/rules/event/_hastype.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....lib.eventtype import EventType
diff --git a/gramps/gen/filters/rules/event/_matchesfilter.py b/gramps/gen/filters/rules/event/_matchesfilter.py
index 4f1befa1f..196d0034b 100644
--- a/gramps/gen/filters/rules/event/_matchesfilter.py
+++ b/gramps/gen/filters/rules/event/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/event/_matchespersonfilter.py b/gramps/gen/filters/rules/event/_matchespersonfilter.py
index 269d6a372..d0f70373d 100644
--- a/gramps/gen/filters/rules/event/_matchespersonfilter.py
+++ b/gramps/gen/filters/rules/event/_matchespersonfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/event/_matchessourceconfidence.py b/gramps/gen/filters/rules/event/_matchessourceconfidence.py
index fdec03e0e..db79d3219 100644
--- a/gramps/gen/filters/rules/event/_matchessourceconfidence.py
+++ b/gramps/gen/filters/rules/event/_matchessourceconfidence.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchessourceconfidencebase import MatchesSourceConfidenceBase
diff --git a/gramps/gen/filters/rules/event/_matchessourcefilter.py b/gramps/gen/filters/rules/event/_matchessourcefilter.py
index 80fffe795..8f2463ea6 100644
--- a/gramps/gen/filters/rules/event/_matchessourcefilter.py
+++ b/gramps/gen/filters/rules/event/_matchessourcefilter.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesSourceFilterBase
diff --git a/gramps/gen/filters/rules/event/_regexpidof.py b/gramps/gen/filters/rules/event/_regexpidof.py
index 4a9481500..cedb75bb8 100644
--- a/gramps/gen/filters/rules/event/_regexpidof.py
+++ b/gramps/gen/filters/rules/event/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/family/_allfamilies.py b/gramps/gen/filters/rules/family/_allfamilies.py
index e0bc2b579..0e1c6904c 100644
--- a/gramps/gen/filters/rules/family/_allfamilies.py
+++ b/gramps/gen/filters/rules/family/_allfamilies.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/family/_changedsince.py b/gramps/gen/filters/rules/family/_changedsince.py
index f9bf2b604..6dc2b24cd 100644
--- a/gramps/gen/filters/rules/family/_changedsince.py
+++ b/gramps/gen/filters/rules/family/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/family/_childhasidof.py b/gramps/gen/filters/rules/family/_childhasidof.py
index 3908db952..30bad39f8 100644
--- a/gramps/gen/filters/rules/family/_childhasidof.py
+++ b/gramps/gen/filters/rules/family/_childhasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import RegExpIdBase
diff --git a/gramps/gen/filters/rules/family/_childhasnameof.py b/gramps/gen/filters/rules/family/_childhasnameof.py
index ffed91f62..3a5423112 100644
--- a/gramps/gen/filters/rules/family/_childhasnameof.py
+++ b/gramps/gen/filters/rules/family/_childhasnameof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import HasNameOf
diff --git a/gramps/gen/filters/rules/family/_familyprivate.py b/gramps/gen/filters/rules/family/_familyprivate.py
index 6a79523c7..327b18771 100644
--- a/gramps/gen/filters/rules/family/_familyprivate.py
+++ b/gramps/gen/filters/rules/family/_familyprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/family/_fatherhasidof.py b/gramps/gen/filters/rules/family/_fatherhasidof.py
index bc20e4109..481f255bb 100644
--- a/gramps/gen/filters/rules/family/_fatherhasidof.py
+++ b/gramps/gen/filters/rules/family/_fatherhasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import RegExpIdBase
diff --git a/gramps/gen/filters/rules/family/_fatherhasnameof.py b/gramps/gen/filters/rules/family/_fatherhasnameof.py
index 17ef328a0..943deaa33 100644
--- a/gramps/gen/filters/rules/family/_fatherhasnameof.py
+++ b/gramps/gen/filters/rules/family/_fatherhasnameof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import HasNameOf
diff --git a/gramps/gen/filters/rules/family/_hasattribute.py b/gramps/gen/filters/rules/family/_hasattribute.py
index 03d60977f..5647dcec2 100644
--- a/gramps/gen/filters/rules/family/_hasattribute.py
+++ b/gramps/gen/filters/rules/family/_hasattribute.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasattributebase import HasAttributeBase
diff --git a/gramps/gen/filters/rules/family/_hascitation.py b/gramps/gen/filters/rules/family/_hascitation.py
index cc6911fb5..2d8cd50a4 100644
--- a/gramps/gen/filters/rules/family/_hascitation.py
+++ b/gramps/gen/filters/rules/family/_hascitation.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hascitationbase import HasCitationBase
diff --git a/gramps/gen/filters/rules/family/_hasevent.py b/gramps/gen/filters/rules/family/_hasevent.py
index aeb61d19c..a80ab1a81 100644
--- a/gramps/gen/filters/rules/family/_hasevent.py
+++ b/gramps/gen/filters/rules/family/_hasevent.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._haseventbase import HasEventBase
diff --git a/gramps/gen/filters/rules/family/_hasgallery.py b/gramps/gen/filters/rules/family/_hasgallery.py
index 53f567a62..7d1f7f38a 100644
--- a/gramps/gen/filters/rules/family/_hasgallery.py
+++ b/gramps/gen/filters/rules/family/_hasgallery.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgallerybase import HasGalleryBase
diff --git a/gramps/gen/filters/rules/family/_hasidof.py b/gramps/gen/filters/rules/family/_hasidof.py
index 3cdcd5781..147d2bab9 100644
--- a/gramps/gen/filters/rules/family/_hasidof.py
+++ b/gramps/gen/filters/rules/family/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/family/_haslds.py b/gramps/gen/filters/rules/family/_haslds.py
index 3f6cd11e3..b85dc415d 100644
--- a/gramps/gen/filters/rules/family/_haslds.py
+++ b/gramps/gen/filters/rules/family/_haslds.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/filters/rules/family/_hasnote.py b/gramps/gen/filters/rules/family/_hasnote.py
index 0e48f1fed..54a34b441 100644
--- a/gramps/gen/filters/rules/family/_hasnote.py
+++ b/gramps/gen/filters/rules/family/_hasnote.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotebase import HasNoteBase
diff --git a/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py
index c4290343d..5bfeb5526 100644
--- a/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/family/_hasnoteregexp.py b/gramps/gen/filters/rules/family/_hasnoteregexp.py
index b2a2d09dc..8ef1820d2 100644
--- a/gramps/gen/filters/rules/family/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/family/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/family/_hasreferencecountof.py b/gramps/gen/filters/rules/family/_hasreferencecountof.py
index 48e5b97e5..c6bce75b4 100644
--- a/gramps/gen/filters/rules/family/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/family/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/family/_hasreltype.py b/gramps/gen/filters/rules/family/_hasreltype.py
index d8e58be94..0905dff0e 100644
--- a/gramps/gen/filters/rules/family/_hasreltype.py
+++ b/gramps/gen/filters/rules/family/_hasreltype.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....lib.familyreltype import FamilyRelType
diff --git a/gramps/gen/filters/rules/family/_hassourcecount.py b/gramps/gen/filters/rules/family/_hassourcecount.py
index 570d551c3..b926d90b8 100644
--- a/gramps/gen/filters/rules/family/_hassourcecount.py
+++ b/gramps/gen/filters/rules/family/_hassourcecount.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourcecountbase import HasSourceCountBase
diff --git a/gramps/gen/filters/rules/family/_hassourceof.py b/gramps/gen/filters/rules/family/_hassourceof.py
index 4d9f7bcda..310b8fa26 100644
--- a/gramps/gen/filters/rules/family/_hassourceof.py
+++ b/gramps/gen/filters/rules/family/_hassourceof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourceofbase import HasSourceOfBase
diff --git a/gramps/gen/filters/rules/family/_hastag.py b/gramps/gen/filters/rules/family/_hastag.py
index c721024a0..996363470 100644
--- a/gramps/gen/filters/rules/family/_hastag.py
+++ b/gramps/gen/filters/rules/family/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/family/_hastwins.py b/gramps/gen/filters/rules/family/_hastwins.py
index c2e37d04b..5cc06db78 100644
--- a/gramps/gen/filters/rules/family/_hastwins.py
+++ b/gramps/gen/filters/rules/family/_hastwins.py
@@ -26,7 +26,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/family/_isbookmarked.py b/gramps/gen/filters/rules/family/_isbookmarked.py
index 400b4b609..bae80053f 100644
--- a/gramps/gen/filters/rules/family/_isbookmarked.py
+++ b/gramps/gen/filters/rules/family/_isbookmarked.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/family/_matchesfilter.py b/gramps/gen/filters/rules/family/_matchesfilter.py
index a00da5c66..d793594ed 100644
--- a/gramps/gen/filters/rules/family/_matchesfilter.py
+++ b/gramps/gen/filters/rules/family/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/family/_matchessourceconfidence.py b/gramps/gen/filters/rules/family/_matchessourceconfidence.py
index 743ef4261..e1954fc9c 100644
--- a/gramps/gen/filters/rules/family/_matchessourceconfidence.py
+++ b/gramps/gen/filters/rules/family/_matchessourceconfidence.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchessourceconfidencebase import MatchesSourceConfidenceBase
diff --git a/gramps/gen/filters/rules/family/_motherhasidof.py b/gramps/gen/filters/rules/family/_motherhasidof.py
index 895cea46a..aa5c6f7f1 100644
--- a/gramps/gen/filters/rules/family/_motherhasidof.py
+++ b/gramps/gen/filters/rules/family/_motherhasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import RegExpIdBase
diff --git a/gramps/gen/filters/rules/family/_motherhasnameof.py b/gramps/gen/filters/rules/family/_motherhasnameof.py
index 79c6a182d..b35419da6 100644
--- a/gramps/gen/filters/rules/family/_motherhasnameof.py
+++ b/gramps/gen/filters/rules/family/_motherhasnameof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import HasNameOf
diff --git a/gramps/gen/filters/rules/family/_regexpchildname.py b/gramps/gen/filters/rules/family/_regexpchildname.py
index 63d241751..b85ed75c2 100644
--- a/gramps/gen/filters/rules/family/_regexpchildname.py
+++ b/gramps/gen/filters/rules/family/_regexpchildname.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import RegExpName
diff --git a/gramps/gen/filters/rules/family/_regexpfathername.py b/gramps/gen/filters/rules/family/_regexpfathername.py
index b5e8aa2f1..b60968cf2 100644
--- a/gramps/gen/filters/rules/family/_regexpfathername.py
+++ b/gramps/gen/filters/rules/family/_regexpfathername.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import RegExpName
diff --git a/gramps/gen/filters/rules/family/_regexpidof.py b/gramps/gen/filters/rules/family/_regexpidof.py
index 9bcfa99c1..3c90f27f5 100644
--- a/gramps/gen/filters/rules/family/_regexpidof.py
+++ b/gramps/gen/filters/rules/family/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/family/_regexpmothername.py b/gramps/gen/filters/rules/family/_regexpmothername.py
index 576b7ba60..f370e81bc 100644
--- a/gramps/gen/filters/rules/family/_regexpmothername.py
+++ b/gramps/gen/filters/rules/family/_regexpmothername.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import RegExpName
diff --git a/gramps/gen/filters/rules/family/_searchchildname.py b/gramps/gen/filters/rules/family/_searchchildname.py
index c9de303a5..a4f73a083 100644
--- a/gramps/gen/filters/rules/family/_searchchildname.py
+++ b/gramps/gen/filters/rules/family/_searchchildname.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import SearchName
diff --git a/gramps/gen/filters/rules/family/_searchfathername.py b/gramps/gen/filters/rules/family/_searchfathername.py
index e1fa0ead6..cf0cb40d2 100644
--- a/gramps/gen/filters/rules/family/_searchfathername.py
+++ b/gramps/gen/filters/rules/family/_searchfathername.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import SearchName
diff --git a/gramps/gen/filters/rules/family/_searchmothername.py b/gramps/gen/filters/rules/family/_searchmothername.py
index 07320c120..6148417dc 100644
--- a/gramps/gen/filters/rules/family/_searchmothername.py
+++ b/gramps/gen/filters/rules/family/_searchmothername.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..person import SearchName
diff --git a/gramps/gen/filters/rules/media/_allmedia.py b/gramps/gen/filters/rules/media/_allmedia.py
index c2580d3bf..69ae63dd2 100644
--- a/gramps/gen/filters/rules/media/_allmedia.py
+++ b/gramps/gen/filters/rules/media/_allmedia.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/media/_changedsince.py b/gramps/gen/filters/rules/media/_changedsince.py
index 1cb265a55..33be2f754 100644
--- a/gramps/gen/filters/rules/media/_changedsince.py
+++ b/gramps/gen/filters/rules/media/_changedsince.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/media/_hasattribute.py b/gramps/gen/filters/rules/media/_hasattribute.py
index e7d9c8635..82e915d46 100644
--- a/gramps/gen/filters/rules/media/_hasattribute.py
+++ b/gramps/gen/filters/rules/media/_hasattribute.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasattributebase import HasAttributeBase
diff --git a/gramps/gen/filters/rules/media/_hascitation.py b/gramps/gen/filters/rules/media/_hascitation.py
index bf1d51781..079d95de2 100644
--- a/gramps/gen/filters/rules/media/_hascitation.py
+++ b/gramps/gen/filters/rules/media/_hascitation.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hascitationbase import HasCitationBase
diff --git a/gramps/gen/filters/rules/media/_hasidof.py b/gramps/gen/filters/rules/media/_hasidof.py
index ed6deb191..bfd40bf3f 100644
--- a/gramps/gen/filters/rules/media/_hasidof.py
+++ b/gramps/gen/filters/rules/media/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/media/_hasmedia.py b/gramps/gen/filters/rules/media/_hasmedia.py
index ab00433a7..0fdbad082 100644
--- a/gramps/gen/filters/rules/media/_hasmedia.py
+++ b/gramps/gen/filters/rules/media/_hasmedia.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....datehandler import parser
diff --git a/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py
index ac8d27c09..d9c1b1ff1 100644
--- a/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/media/_hasnoteregexp.py b/gramps/gen/filters/rules/media/_hasnoteregexp.py
index cea4ba71b..75fc0cd43 100644
--- a/gramps/gen/filters/rules/media/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/media/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/media/_hasreferencecountof.py b/gramps/gen/filters/rules/media/_hasreferencecountof.py
index e8817cf0b..1a99f3e83 100644
--- a/gramps/gen/filters/rules/media/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/media/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/media/_hassourcecount.py b/gramps/gen/filters/rules/media/_hassourcecount.py
index 38a83d986..cc54e2ce9 100644
--- a/gramps/gen/filters/rules/media/_hassourcecount.py
+++ b/gramps/gen/filters/rules/media/_hassourcecount.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourcecountbase import HasSourceCountBase
diff --git a/gramps/gen/filters/rules/media/_hassourceof.py b/gramps/gen/filters/rules/media/_hassourceof.py
index 3418a04b8..ee8f2f6af 100644
--- a/gramps/gen/filters/rules/media/_hassourceof.py
+++ b/gramps/gen/filters/rules/media/_hassourceof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourceofbase import HasSourceOfBase
diff --git a/gramps/gen/filters/rules/media/_hastag.py b/gramps/gen/filters/rules/media/_hastag.py
index 820588f7c..34944e1df 100644
--- a/gramps/gen/filters/rules/media/_hastag.py
+++ b/gramps/gen/filters/rules/media/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/media/_matchesfilter.py b/gramps/gen/filters/rules/media/_matchesfilter.py
index 5802cc5e0..66509e1f7 100644
--- a/gramps/gen/filters/rules/media/_matchesfilter.py
+++ b/gramps/gen/filters/rules/media/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/media/_matchessourceconfidence.py b/gramps/gen/filters/rules/media/_matchessourceconfidence.py
index 2add872c2..3c15fda08 100644
--- a/gramps/gen/filters/rules/media/_matchessourceconfidence.py
+++ b/gramps/gen/filters/rules/media/_matchessourceconfidence.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchessourceconfidencebase import MatchesSourceConfidenceBase
diff --git a/gramps/gen/filters/rules/media/_mediaprivate.py b/gramps/gen/filters/rules/media/_mediaprivate.py
index cece541ae..655696b22 100644
--- a/gramps/gen/filters/rules/media/_mediaprivate.py
+++ b/gramps/gen/filters/rules/media/_mediaprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/media/_regexpidof.py b/gramps/gen/filters/rules/media/_regexpidof.py
index f0a87f98b..baa39b28b 100644
--- a/gramps/gen/filters/rules/media/_regexpidof.py
+++ b/gramps/gen/filters/rules/media/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/note/_allnotes.py b/gramps/gen/filters/rules/note/_allnotes.py
index da3d6e2a7..6c0848008 100644
--- a/gramps/gen/filters/rules/note/_allnotes.py
+++ b/gramps/gen/filters/rules/note/_allnotes.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/note/_changedsince.py b/gramps/gen/filters/rules/note/_changedsince.py
index 4541b166e..4102dfb08 100644
--- a/gramps/gen/filters/rules/note/_changedsince.py
+++ b/gramps/gen/filters/rules/note/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/note/_hasidof.py b/gramps/gen/filters/rules/note/_hasidof.py
index f61b5bb62..ef769bcb9 100644
--- a/gramps/gen/filters/rules/note/_hasidof.py
+++ b/gramps/gen/filters/rules/note/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/note/_hasnote.py b/gramps/gen/filters/rules/note/_hasnote.py
index 4265b2504..aa8ae0938 100644
--- a/gramps/gen/filters/rules/note/_hasnote.py
+++ b/gramps/gen/filters/rules/note/_hasnote.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....lib.notetype import NoteType
diff --git a/gramps/gen/filters/rules/note/_hasreferencecountof.py b/gramps/gen/filters/rules/note/_hasreferencecountof.py
index af88556e6..35ed58a9a 100644
--- a/gramps/gen/filters/rules/note/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/note/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/note/_hastag.py b/gramps/gen/filters/rules/note/_hastag.py
index 3c1507d6e..817302296 100644
--- a/gramps/gen/filters/rules/note/_hastag.py
+++ b/gramps/gen/filters/rules/note/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/note/_matchesfilter.py b/gramps/gen/filters/rules/note/_matchesfilter.py
index 70417b3f5..3361b4b6b 100644
--- a/gramps/gen/filters/rules/note/_matchesfilter.py
+++ b/gramps/gen/filters/rules/note/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/note/_matchesregexpof.py b/gramps/gen/filters/rules/note/_matchesregexpof.py
index 00ed77b2a..71ff9fe10 100644
--- a/gramps/gen/filters/rules/note/_matchesregexpof.py
+++ b/gramps/gen/filters/rules/note/_matchesregexpof.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/note/_matchessubstringof.py b/gramps/gen/filters/rules/note/_matchessubstringof.py
index 2005568bb..7b13dbe10 100644
--- a/gramps/gen/filters/rules/note/_matchessubstringof.py
+++ b/gramps/gen/filters/rules/note/_matchessubstringof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/note/_noteprivate.py b/gramps/gen/filters/rules/note/_noteprivate.py
index 2a98058ac..471d0fc96 100644
--- a/gramps/gen/filters/rules/note/_noteprivate.py
+++ b/gramps/gen/filters/rules/note/_noteprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/note/_regexpidof.py b/gramps/gen/filters/rules/note/_regexpidof.py
index 7fb31700b..95ca0e3c0 100644
--- a/gramps/gen/filters/rules/note/_regexpidof.py
+++ b/gramps/gen/filters/rules/note/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/person/_changedsince.py b/gramps/gen/filters/rules/person/_changedsince.py
index bf5d9f75e..35cfc1632 100644
--- a/gramps/gen/filters/rules/person/_changedsince.py
+++ b/gramps/gen/filters/rules/person/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/person/_deeprelationshippathbetween.py b/gramps/gen/filters/rules/person/_deeprelationshippathbetween.py
index 647ce18ee..fcf48e799 100644
--- a/gramps/gen/filters/rules/person/_deeprelationshippathbetween.py
+++ b/gramps/gen/filters/rules/person/_deeprelationshippathbetween.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_disconnected.py b/gramps/gen/filters/rules/person/_disconnected.py
index c370fdc57..36bec0b4e 100644
--- a/gramps/gen/filters/rules/person/_disconnected.py
+++ b/gramps/gen/filters/rules/person/_disconnected.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_everyone.py b/gramps/gen/filters/rules/person/_everyone.py
index d55c8ac1c..68d5c6178 100644
--- a/gramps/gen/filters/rules/person/_everyone.py
+++ b/gramps/gen/filters/rules/person/_everyone.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_familywithincompleteevent.py b/gramps/gen/filters/rules/person/_familywithincompleteevent.py
index 62b065751..ae362d2cb 100644
--- a/gramps/gen/filters/rules/person/_familywithincompleteevent.py
+++ b/gramps/gen/filters/rules/person/_familywithincompleteevent.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasaddress.py b/gramps/gen/filters/rules/person/_hasaddress.py
index bdf8a0121..11b7db2fe 100644
--- a/gramps/gen/filters/rules/person/_hasaddress.py
+++ b/gramps/gen/filters/rules/person/_hasaddress.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/filters/rules/person/_hasalternatename.py b/gramps/gen/filters/rules/person/_hasalternatename.py
index 80eb694bd..35ce0c8be 100644
--- a/gramps/gen/filters/rules/person/_hasalternatename.py
+++ b/gramps/gen/filters/rules/person/_hasalternatename.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasassociation.py b/gramps/gen/filters/rules/person/_hasassociation.py
index 58b9a126a..55aa44559 100644
--- a/gramps/gen/filters/rules/person/_hasassociation.py
+++ b/gramps/gen/filters/rules/person/_hasassociation.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/filters/rules/person/_hasattribute.py b/gramps/gen/filters/rules/person/_hasattribute.py
index df2cfaaca..bd82b810b 100644
--- a/gramps/gen/filters/rules/person/_hasattribute.py
+++ b/gramps/gen/filters/rules/person/_hasattribute.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasattributebase import HasAttributeBase
diff --git a/gramps/gen/filters/rules/person/_hasbirth.py b/gramps/gen/filters/rules/person/_hasbirth.py
index bd3f5ae05..358d9711f 100644
--- a/gramps/gen/filters/rules/person/_hasbirth.py
+++ b/gramps/gen/filters/rules/person/_hasbirth.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....datehandler import parser
diff --git a/gramps/gen/filters/rules/person/_hascitation.py b/gramps/gen/filters/rules/person/_hascitation.py
index 7e4e9999a..cad459843 100644
--- a/gramps/gen/filters/rules/person/_hascitation.py
+++ b/gramps/gen/filters/rules/person/_hascitation.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hascitationbase import HasCitationBase
diff --git a/gramps/gen/filters/rules/person/_hascommonancestorwith.py b/gramps/gen/filters/rules/person/_hascommonancestorwith.py
index b63772081..51d631850 100644
--- a/gramps/gen/filters/rules/person/_hascommonancestorwith.py
+++ b/gramps/gen/filters/rules/person/_hascommonancestorwith.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....utils.db import for_each_ancestor
diff --git a/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py b/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
index 17b6be444..7993bc8a1 100644
--- a/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
+++ b/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....utils.db import for_each_ancestor
diff --git a/gramps/gen/filters/rules/person/_hasdeath.py b/gramps/gen/filters/rules/person/_hasdeath.py
index 9ec24e3dc..d6c5e9b41 100644
--- a/gramps/gen/filters/rules/person/_hasdeath.py
+++ b/gramps/gen/filters/rules/person/_hasdeath.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....datehandler import parser
diff --git a/gramps/gen/filters/rules/person/_hasevent.py b/gramps/gen/filters/rules/person/_hasevent.py
index 520e3c1c7..d3264fcef 100644
--- a/gramps/gen/filters/rules/person/_hasevent.py
+++ b/gramps/gen/filters/rules/person/_hasevent.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....lib.eventroletype import EventRoleType
diff --git a/gramps/gen/filters/rules/person/_hasfamilyattribute.py b/gramps/gen/filters/rules/person/_hasfamilyattribute.py
index 19fecf322..cdc655343 100644
--- a/gramps/gen/filters/rules/person/_hasfamilyattribute.py
+++ b/gramps/gen/filters/rules/person/_hasfamilyattribute.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasfamilyevent.py b/gramps/gen/filters/rules/person/_hasfamilyevent.py
index 2377b7e47..861531b2b 100644
--- a/gramps/gen/filters/rules/person/_hasfamilyevent.py
+++ b/gramps/gen/filters/rules/person/_hasfamilyevent.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....datehandler import parser
diff --git a/gramps/gen/filters/rules/person/_hasgallery.py b/gramps/gen/filters/rules/person/_hasgallery.py
index 3a52fd37d..0ac29452a 100644
--- a/gramps/gen/filters/rules/person/_hasgallery.py
+++ b/gramps/gen/filters/rules/person/_hasgallery.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgallerybase import HasGalleryBase
diff --git a/gramps/gen/filters/rules/person/_hasidof.py b/gramps/gen/filters/rules/person/_hasidof.py
index 2d34a6b1a..fbac9d63b 100644
--- a/gramps/gen/filters/rules/person/_hasidof.py
+++ b/gramps/gen/filters/rules/person/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/person/_haslds.py b/gramps/gen/filters/rules/person/_haslds.py
index 6567423e2..1919d5072 100644
--- a/gramps/gen/filters/rules/person/_haslds.py
+++ b/gramps/gen/filters/rules/person/_haslds.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/filters/rules/person/_hasnameof.py b/gramps/gen/filters/rules/person/_hasnameof.py
index dcf401d4b..f7f6952ed 100644
--- a/gramps/gen/filters/rules/person/_hasnameof.py
+++ b/gramps/gen/filters/rules/person/_hasnameof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasnameorigintype.py b/gramps/gen/filters/rules/person/_hasnameorigintype.py
index 536e0d2c6..88adda83c 100644
--- a/gramps/gen/filters/rules/person/_hasnameorigintype.py
+++ b/gramps/gen/filters/rules/person/_hasnameorigintype.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasnametype.py b/gramps/gen/filters/rules/person/_hasnametype.py
index 58cd6bef0..014e6e207 100644
--- a/gramps/gen/filters/rules/person/_hasnametype.py
+++ b/gramps/gen/filters/rules/person/_hasnametype.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasnickname.py b/gramps/gen/filters/rules/person/_hasnickname.py
index 645b757c1..a01f2a7f8 100644
--- a/gramps/gen/filters/rules/person/_hasnickname.py
+++ b/gramps/gen/filters/rules/person/_hasnickname.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hasnote.py b/gramps/gen/filters/rules/person/_hasnote.py
index cfa01500b..0f8e057a4 100644
--- a/gramps/gen/filters/rules/person/_hasnote.py
+++ b/gramps/gen/filters/rules/person/_hasnote.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotebase import HasNoteBase
diff --git a/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py
index 42176b10f..45cadce58 100644
--- a/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/person/_hasnoteregexp.py b/gramps/gen/filters/rules/person/_hasnoteregexp.py
index fbb7fa8c1..e382e821b 100644
--- a/gramps/gen/filters/rules/person/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/person/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/person/_hasrelationship.py b/gramps/gen/filters/rules/person/_hasrelationship.py
index 4aa289425..a8b5b2bdf 100644
--- a/gramps/gen/filters/rules/person/_hasrelationship.py
+++ b/gramps/gen/filters/rules/person/_hasrelationship.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_hassourcecount.py b/gramps/gen/filters/rules/person/_hassourcecount.py
index 0c23c670d..dfd86a39f 100644
--- a/gramps/gen/filters/rules/person/_hassourcecount.py
+++ b/gramps/gen/filters/rules/person/_hassourcecount.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourcecountbase import HasSourceCountBase
diff --git a/gramps/gen/filters/rules/person/_hassourceof.py b/gramps/gen/filters/rules/person/_hassourceof.py
index 353c7b09a..5d63de3f5 100644
--- a/gramps/gen/filters/rules/person/_hassourceof.py
+++ b/gramps/gen/filters/rules/person/_hassourceof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourceofbase import HasSourceOfBase
diff --git a/gramps/gen/filters/rules/person/_hastag.py b/gramps/gen/filters/rules/person/_hastag.py
index ff18f637c..4059c767e 100644
--- a/gramps/gen/filters/rules/person/_hastag.py
+++ b/gramps/gen/filters/rules/person/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/person/_hastextmatchingregexpof.py b/gramps/gen/filters/rules/person/_hastextmatchingregexpof.py
index a0315651b..64c7fe72e 100644
--- a/gramps/gen/filters/rules/person/_hastextmatchingregexpof.py
+++ b/gramps/gen/filters/rules/person/_hastextmatchingregexpof.py
@@ -26,7 +26,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._hastextmatchingsubstringof import HasTextMatchingSubstringOf
diff --git a/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py b/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py
index 7903c8023..4c8e9c84f 100644
--- a/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py
+++ b/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py
@@ -31,7 +31,7 @@ LOG = logging.getLogger(".citationfilter")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....utils.db import get_source_and_citation_referents
diff --git a/gramps/gen/filters/rules/person/_hasunknowngender.py b/gramps/gen/filters/rules/person/_hasunknowngender.py
index f360a0fc6..714f36bcb 100644
--- a/gramps/gen/filters/rules/person/_hasunknowngender.py
+++ b/gramps/gen/filters/rules/person/_hasunknowngender.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_havealtfamilies.py b/gramps/gen/filters/rules/person/_havealtfamilies.py
index c3f1066e0..141d65fc0 100644
--- a/gramps/gen/filters/rules/person/_havealtfamilies.py
+++ b/gramps/gen/filters/rules/person/_havealtfamilies.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_havechildren.py b/gramps/gen/filters/rules/person/_havechildren.py
index cefd34a85..56935fb7d 100644
--- a/gramps/gen/filters/rules/person/_havechildren.py
+++ b/gramps/gen/filters/rules/person/_havechildren.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_incompletenames.py b/gramps/gen/filters/rules/person/_incompletenames.py
index f4951870a..7b85f9273 100644
--- a/gramps/gen/filters/rules/person/_incompletenames.py
+++ b/gramps/gen/filters/rules/person/_incompletenames.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isancestorof.py b/gramps/gen/filters/rules/person/_isancestorof.py
index 30d8e5fde..0d23626ba 100644
--- a/gramps/gen/filters/rules/person/_isancestorof.py
+++ b/gramps/gen/filters/rules/person/_isancestorof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py b/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py
index c20911200..ac773e623 100644
--- a/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._isancestorof import IsAncestorOf
diff --git a/gramps/gen/filters/rules/person/_isbookmarked.py b/gramps/gen/filters/rules/person/_isbookmarked.py
index f64de73dc..2b1f56394 100644
--- a/gramps/gen/filters/rules/person/_isbookmarked.py
+++ b/gramps/gen/filters/rules/person/_isbookmarked.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_ischildoffiltermatch.py b/gramps/gen/filters/rules/person/_ischildoffiltermatch.py
index 574e89ba6..0f8194e28 100644
--- a/gramps/gen/filters/rules/person/_ischildoffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_ischildoffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isdefaultperson.py b/gramps/gen/filters/rules/person/_isdefaultperson.py
index 0a6bbcb61..6fffb2faa 100644
--- a/gramps/gen/filters/rules/person/_isdefaultperson.py
+++ b/gramps/gen/filters/rules/person/_isdefaultperson.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isdescendantfamilyof.py b/gramps/gen/filters/rules/person/_isdescendantfamilyof.py
index c354ba458..ad695174b 100644
--- a/gramps/gen/filters/rules/person/_isdescendantfamilyof.py
+++ b/gramps/gen/filters/rules/person/_isdescendantfamilyof.py
@@ -32,7 +32,7 @@ except NameError:
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py b/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
index 7969549f2..9b37a6b3a 100644
--- a/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._isdescendantfamilyof import IsDescendantFamilyOf
diff --git a/gramps/gen/filters/rules/person/_isdescendantof.py b/gramps/gen/filters/rules/person/_isdescendantof.py
index cb047fa93..cd0fa1a82 100644
--- a/gramps/gen/filters/rules/person/_isdescendantof.py
+++ b/gramps/gen/filters/rules/person/_isdescendantof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py b/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py
index d1281a28a..5e9c45c5d 100644
--- a/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._isdescendantof import IsDescendantOf
diff --git a/gramps/gen/filters/rules/person/_isduplicatedancestorof.py b/gramps/gen/filters/rules/person/_isduplicatedancestorof.py
index b3a635001..33f270d03 100644
--- a/gramps/gen/filters/rules/person/_isduplicatedancestorof.py
+++ b/gramps/gen/filters/rules/person/_isduplicatedancestorof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isfemale.py b/gramps/gen/filters/rules/person/_isfemale.py
index 45f84612c..356d41ea9 100644
--- a/gramps/gen/filters/rules/person/_isfemale.py
+++ b/gramps/gen/filters/rules/person/_isfemale.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py
index 8977888d9..ff1bfec9f 100644
--- a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py
+++ b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
index 141e11805..eb71a9f70 100644
--- a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
+++ b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
@@ -33,7 +33,7 @@ except:
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
index 6da490c87..84d17bf17 100644
--- a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
+++ b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py b/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
index c37700e7f..2edaa89d0 100644
--- a/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
+++ b/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_ismale.py b/gramps/gen/filters/rules/person/_ismale.py
index e28a101a0..78f1a2794 100644
--- a/gramps/gen/filters/rules/person/_ismale.py
+++ b/gramps/gen/filters/rules/person/_ismale.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py b/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
index 9d81d7e18..02a770032 100644
--- a/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
+++ b/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py b/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
index 5e084819d..a49da525e 100644
--- a/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
+++ b/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isparentoffiltermatch.py b/gramps/gen/filters/rules/person/_isparentoffiltermatch.py
index 35691b368..ca66b2a0c 100644
--- a/gramps/gen/filters/rules/person/_isparentoffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_isparentoffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isrelatedwith.py b/gramps/gen/filters/rules/person/_isrelatedwith.py
index b6e94c972..624ecac12 100644
--- a/gramps/gen/filters/rules/person/_isrelatedwith.py
+++ b/gramps/gen/filters/rules/person/_isrelatedwith.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py b/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py
index 2a766d6e9..93300e9dd 100644
--- a/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py b/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py
index fa8366332..37fc8392b 100644
--- a/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py
+++ b/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_iswitness.py b/gramps/gen/filters/rules/person/_iswitness.py
index 9b066a7dd..375d70d15 100644
--- a/gramps/gen/filters/rules/person/_iswitness.py
+++ b/gramps/gen/filters/rules/person/_iswitness.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_matcheseventfilter.py b/gramps/gen/filters/rules/person/_matcheseventfilter.py
index 77d44f834..a1b126840 100644
--- a/gramps/gen/filters/rules/person/_matcheseventfilter.py
+++ b/gramps/gen/filters/rules/person/_matcheseventfilter.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesEventFilterBase
diff --git a/gramps/gen/filters/rules/person/_matchesfilter.py b/gramps/gen/filters/rules/person/_matchesfilter.py
index 858851dc9..ab4d62a98 100644
--- a/gramps/gen/filters/rules/person/_matchesfilter.py
+++ b/gramps/gen/filters/rules/person/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/person/_matchessourceconfidence.py b/gramps/gen/filters/rules/person/_matchessourceconfidence.py
index 6ef4bacea..6cb704761 100644
--- a/gramps/gen/filters/rules/person/_matchessourceconfidence.py
+++ b/gramps/gen/filters/rules/person/_matchessourceconfidence.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchessourceconfidencebase import MatchesSourceConfidenceBase
diff --git a/gramps/gen/filters/rules/person/_matchidof.py b/gramps/gen/filters/rules/person/_matchidof.py
index 33bdda57c..8b95e3e52 100644
--- a/gramps/gen/filters/rules/person/_matchidof.py
+++ b/gramps/gen/filters/rules/person/_matchidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_missingparent.py b/gramps/gen/filters/rules/person/_missingparent.py
index 90f60685b..6064e2c1d 100644
--- a/gramps/gen/filters/rules/person/_missingparent.py
+++ b/gramps/gen/filters/rules/person/_missingparent.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_multiplemarriages.py b/gramps/gen/filters/rules/person/_multiplemarriages.py
index 71cad2021..88e04b4f6 100644
--- a/gramps/gen/filters/rules/person/_multiplemarriages.py
+++ b/gramps/gen/filters/rules/person/_multiplemarriages.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_nevermarried.py b/gramps/gen/filters/rules/person/_nevermarried.py
index 14a455826..2c631b0c0 100644
--- a/gramps/gen/filters/rules/person/_nevermarried.py
+++ b/gramps/gen/filters/rules/person/_nevermarried.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_nobirthdate.py b/gramps/gen/filters/rules/person/_nobirthdate.py
index 94535d18e..03bf085a8 100644
--- a/gramps/gen/filters/rules/person/_nobirthdate.py
+++ b/gramps/gen/filters/rules/person/_nobirthdate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_nodeathdate.py b/gramps/gen/filters/rules/person/_nodeathdate.py
index 541796b89..442a5e0ab 100644
--- a/gramps/gen/filters/rules/person/_nodeathdate.py
+++ b/gramps/gen/filters/rules/person/_nodeathdate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_peopleprivate.py b/gramps/gen/filters/rules/person/_peopleprivate.py
index 6864b17bb..3a5d37ec2 100644
--- a/gramps/gen/filters/rules/person/_peopleprivate.py
+++ b/gramps/gen/filters/rules/person/_peopleprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/person/_peoplepublic.py b/gramps/gen/filters/rules/person/_peoplepublic.py
index 246db2064..4884cdaf1 100644
--- a/gramps/gen/filters/rules/person/_peoplepublic.py
+++ b/gramps/gen/filters/rules/person/_peoplepublic.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._ispublic import IsPublic
diff --git a/gramps/gen/filters/rules/person/_personwithincompleteevent.py b/gramps/gen/filters/rules/person/_personwithincompleteevent.py
index 85973342d..675490cdd 100644
--- a/gramps/gen/filters/rules/person/_personwithincompleteevent.py
+++ b/gramps/gen/filters/rules/person/_personwithincompleteevent.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_probablyalive.py b/gramps/gen/filters/rules/person/_probablyalive.py
index 0e9ea4390..f7761d3b5 100644
--- a/gramps/gen/filters/rules/person/_probablyalive.py
+++ b/gramps/gen/filters/rules/person/_probablyalive.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....utils.alive import probably_alive
diff --git a/gramps/gen/filters/rules/person/_regexpidof.py b/gramps/gen/filters/rules/person/_regexpidof.py
index 3922e766c..dc2939fc6 100644
--- a/gramps/gen/filters/rules/person/_regexpidof.py
+++ b/gramps/gen/filters/rules/person/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/person/_regexpname.py b/gramps/gen/filters/rules/person/_regexpname.py
index dc609f507..d4a8a76c9 100644
--- a/gramps/gen/filters/rules/person/_regexpname.py
+++ b/gramps/gen/filters/rules/person/_regexpname.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_relationshippathbetween.py b/gramps/gen/filters/rules/person/_relationshippathbetween.py
index a567dd45c..182859eb0 100644
--- a/gramps/gen/filters/rules/person/_relationshippathbetween.py
+++ b/gramps/gen/filters/rules/person/_relationshippathbetween.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py b/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
index 44e04a96e..4079a6758 100644
--- a/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
+++ b/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
@@ -31,7 +31,7 @@ except NameError:
     from sets import Set as set
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/person/_searchname.py b/gramps/gen/filters/rules/person/_searchname.py
index ce88b0608..e19821d4b 100644
--- a/gramps/gen/filters/rules/person/_searchname.py
+++ b/gramps/gen/filters/rules/person/_searchname.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/place/_allplaces.py b/gramps/gen/filters/rules/place/_allplaces.py
index 0ff8751bd..8fe87e476 100644
--- a/gramps/gen/filters/rules/place/_allplaces.py
+++ b/gramps/gen/filters/rules/place/_allplaces.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/place/_changedsince.py b/gramps/gen/filters/rules/place/_changedsince.py
index ad29d1924..01c10e835 100644
--- a/gramps/gen/filters/rules/place/_changedsince.py
+++ b/gramps/gen/filters/rules/place/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/place/_hascitation.py b/gramps/gen/filters/rules/place/_hascitation.py
index a66376a74..732c739ac 100644
--- a/gramps/gen/filters/rules/place/_hascitation.py
+++ b/gramps/gen/filters/rules/place/_hascitation.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hascitationbase import HasCitationBase
diff --git a/gramps/gen/filters/rules/place/_hasdata.py b/gramps/gen/filters/rules/place/_hasdata.py
index 5d19e603f..67f886314 100644
--- a/gramps/gen/filters/rules/place/_hasdata.py
+++ b/gramps/gen/filters/rules/place/_hasdata.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/place/_hasgallery.py b/gramps/gen/filters/rules/place/_hasgallery.py
index db52bd2f0..e8ca9b5bb 100644
--- a/gramps/gen/filters/rules/place/_hasgallery.py
+++ b/gramps/gen/filters/rules/place/_hasgallery.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgallerybase import HasGalleryBase
diff --git a/gramps/gen/filters/rules/place/_hasidof.py b/gramps/gen/filters/rules/place/_hasidof.py
index 7bf6da05b..bbc571c61 100644
--- a/gramps/gen/filters/rules/place/_hasidof.py
+++ b/gramps/gen/filters/rules/place/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/place/_hasnolatorlon.py b/gramps/gen/filters/rules/place/_hasnolatorlon.py
index 3dde9dcb2..5e8e48531 100644
--- a/gramps/gen/filters/rules/place/_hasnolatorlon.py
+++ b/gramps/gen/filters/rules/place/_hasnolatorlon.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/place/_hasnote.py b/gramps/gen/filters/rules/place/_hasnote.py
index 44ab8ef35..f88bfc2c7 100644
--- a/gramps/gen/filters/rules/place/_hasnote.py
+++ b/gramps/gen/filters/rules/place/_hasnote.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotebase import HasNoteBase
diff --git a/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py
index d3afe83f2..984c0e25f 100644
--- a/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/place/_hasnoteregexp.py b/gramps/gen/filters/rules/place/_hasnoteregexp.py
index 83ce3f276..6c9d49a58 100644
--- a/gramps/gen/filters/rules/place/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/place/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/place/_hasplace.py b/gramps/gen/filters/rules/place/_hasplace.py
index b97f89316..6d7701692 100644
--- a/gramps/gen/filters/rules/place/_hasplace.py
+++ b/gramps/gen/filters/rules/place/_hasplace.py
@@ -30,7 +30,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/place/_hasreferencecountof.py b/gramps/gen/filters/rules/place/_hasreferencecountof.py
index aed4d83ff..848b38531 100644
--- a/gramps/gen/filters/rules/place/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/place/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/place/_hassourcecount.py b/gramps/gen/filters/rules/place/_hassourcecount.py
index 62c4f864b..be11864a1 100644
--- a/gramps/gen/filters/rules/place/_hassourcecount.py
+++ b/gramps/gen/filters/rules/place/_hassourcecount.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourcecountbase import HasSourceCountBase
diff --git a/gramps/gen/filters/rules/place/_hassourceof.py b/gramps/gen/filters/rules/place/_hassourceof.py
index 6c71ac776..09446f86a 100644
--- a/gramps/gen/filters/rules/place/_hassourceof.py
+++ b/gramps/gen/filters/rules/place/_hassourceof.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hassourceofbase import HasSourceOfBase
diff --git a/gramps/gen/filters/rules/place/_hastag.py b/gramps/gen/filters/rules/place/_hastag.py
index 36c480192..1f147783b 100644
--- a/gramps/gen/filters/rules/place/_hastag.py
+++ b/gramps/gen/filters/rules/place/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/place/_inlatlonneighborhood.py b/gramps/gen/filters/rules/place/_inlatlonneighborhood.py
index 65a02d022..70b7e5c81 100644
--- a/gramps/gen/filters/rules/place/_inlatlonneighborhood.py
+++ b/gramps/gen/filters/rules/place/_inlatlonneighborhood.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/place/_matcheseventfilter.py b/gramps/gen/filters/rules/place/_matcheseventfilter.py
index 4a61ccaf0..ebcbb8302 100644
--- a/gramps/gen/filters/rules/place/_matcheseventfilter.py
+++ b/gramps/gen/filters/rules/place/_matcheseventfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchesfilterbase import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/place/_matchesfilter.py b/gramps/gen/filters/rules/place/_matchesfilter.py
index c17ef50e1..c2cee64bf 100644
--- a/gramps/gen/filters/rules/place/_matchesfilter.py
+++ b/gramps/gen/filters/rules/place/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchesfilterbase import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/place/_matchessourceconfidence.py b/gramps/gen/filters/rules/place/_matchessourceconfidence.py
index af6f81ad3..a914eb278 100644
--- a/gramps/gen/filters/rules/place/_matchessourceconfidence.py
+++ b/gramps/gen/filters/rules/place/_matchessourceconfidence.py
@@ -29,7 +29,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchessourceconfidencebase import MatchesSourceConfidenceBase
diff --git a/gramps/gen/filters/rules/place/_placeprivate.py b/gramps/gen/filters/rules/place/_placeprivate.py
index 60541b217..7ed59fb38 100644
--- a/gramps/gen/filters/rules/place/_placeprivate.py
+++ b/gramps/gen/filters/rules/place/_placeprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/place/_regexpidof.py b/gramps/gen/filters/rules/place/_regexpidof.py
index 4736751ad..d13c9144d 100644
--- a/gramps/gen/filters/rules/place/_regexpidof.py
+++ b/gramps/gen/filters/rules/place/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/repository/_allrepos.py b/gramps/gen/filters/rules/repository/_allrepos.py
index b855a4dae..91b6f8bc0 100644
--- a/gramps/gen/filters/rules/repository/_allrepos.py
+++ b/gramps/gen/filters/rules/repository/_allrepos.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/repository/_changedsince.py b/gramps/gen/filters/rules/repository/_changedsince.py
index e158fb821..7db91d485 100644
--- a/gramps/gen/filters/rules/repository/_changedsince.py
+++ b/gramps/gen/filters/rules/repository/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/repository/_hasidof.py b/gramps/gen/filters/rules/repository/_hasidof.py
index 71023eb69..501784854 100644
--- a/gramps/gen/filters/rules/repository/_hasidof.py
+++ b/gramps/gen/filters/rules/repository/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py
index 08a3d9197..630506303 100644
--- a/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/repository/_hasnoteregexp.py b/gramps/gen/filters/rules/repository/_hasnoteregexp.py
index 2f5611926..747c6b723 100644
--- a/gramps/gen/filters/rules/repository/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/repository/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/repository/_hasreferencecountof.py b/gramps/gen/filters/rules/repository/_hasreferencecountof.py
index 5a24c7114..82fbb0ba1 100644
--- a/gramps/gen/filters/rules/repository/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/repository/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/repository/_hasrepo.py b/gramps/gen/filters/rules/repository/_hasrepo.py
index 0ee74ef4a..1239b8970 100644
--- a/gramps/gen/filters/rules/repository/_hasrepo.py
+++ b/gramps/gen/filters/rules/repository/_hasrepo.py
@@ -28,7 +28,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ....lib.repotype import RepositoryType
diff --git a/gramps/gen/filters/rules/repository/_hastag.py b/gramps/gen/filters/rules/repository/_hastag.py
index ac29bcf89..22bb0f2b9 100644
--- a/gramps/gen/filters/rules/repository/_hastag.py
+++ b/gramps/gen/filters/rules/repository/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/repository/_matchesfilter.py b/gramps/gen/filters/rules/repository/_matchesfilter.py
index 01a4e2cb5..9d750d0cd 100644
--- a/gramps/gen/filters/rules/repository/_matchesfilter.py
+++ b/gramps/gen/filters/rules/repository/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchesfilterbase import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py b/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py
index 81fe69bf6..1229c5a96 100644
--- a/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py
+++ b/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/repository/_regexpidof.py b/gramps/gen/filters/rules/repository/_regexpidof.py
index a02afec59..9f1d0a73b 100644
--- a/gramps/gen/filters/rules/repository/_regexpidof.py
+++ b/gramps/gen/filters/rules/repository/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/repository/_repoprivate.py b/gramps/gen/filters/rules/repository/_repoprivate.py
index 2b199ea74..901ef8d16 100644
--- a/gramps/gen/filters/rules/repository/_repoprivate.py
+++ b/gramps/gen/filters/rules/repository/_repoprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/filters/rules/source/_allsources.py b/gramps/gen/filters/rules/source/_allsources.py
index 29b57789c..b61deda84 100644
--- a/gramps/gen/filters/rules/source/_allsources.py
+++ b/gramps/gen/filters/rules/source/_allsources.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._everything import Everything
diff --git a/gramps/gen/filters/rules/source/_changedsince.py b/gramps/gen/filters/rules/source/_changedsince.py
index 094cfaa9a..50aa09355 100644
--- a/gramps/gen/filters/rules/source/_changedsince.py
+++ b/gramps/gen/filters/rules/source/_changedsince.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._changedsincebase import ChangedSinceBase
diff --git a/gramps/gen/filters/rules/source/_hasgallery.py b/gramps/gen/filters/rules/source/_hasgallery.py
index aee027feb..d34f37845 100644
--- a/gramps/gen/filters/rules/source/_hasgallery.py
+++ b/gramps/gen/filters/rules/source/_hasgallery.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasgallerybase import HasGalleryBase
diff --git a/gramps/gen/filters/rules/source/_hasidof.py b/gramps/gen/filters/rules/source/_hasidof.py
index 8acf7fdd7..679fafbe1 100644
--- a/gramps/gen/filters/rules/source/_hasidof.py
+++ b/gramps/gen/filters/rules/source/_hasidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import HasGrampsId
diff --git a/gramps/gen/filters/rules/source/_hasnote.py b/gramps/gen/filters/rules/source/_hasnote.py
index 59ea6b696..a7314a62c 100644
--- a/gramps/gen/filters/rules/source/_hasnote.py
+++ b/gramps/gen/filters/rules/source/_hasnote.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotebase import HasNoteBase
diff --git a/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py
index 0e2663ad6..6f9eed185 100644
--- a/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py
+++ b/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnotesubstrbase import HasNoteSubstrBase
diff --git a/gramps/gen/filters/rules/source/_hasnoteregexp.py b/gramps/gen/filters/rules/source/_hasnoteregexp.py
index d952e1a05..12e919b51 100644
--- a/gramps/gen/filters/rules/source/_hasnoteregexp.py
+++ b/gramps/gen/filters/rules/source/_hasnoteregexp.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasnoteregexbase import HasNoteRegexBase
diff --git a/gramps/gen/filters/rules/source/_hasreferencecountof.py b/gramps/gen/filters/rules/source/_hasreferencecountof.py
index bcc76b79b..26341bb10 100644
--- a/gramps/gen/filters/rules/source/_hasreferencecountof.py
+++ b/gramps/gen/filters/rules/source/_hasreferencecountof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hasreferencecountbase import HasReferenceCountBase
diff --git a/gramps/gen/filters/rules/source/_hasrepository.py b/gramps/gen/filters/rules/source/_hasrepository.py
index 451e64300..263eaa2d2 100644
--- a/gramps/gen/filters/rules/source/_hasrepository.py
+++ b/gramps/gen/filters/rules/source/_hasrepository.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py b/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py
index 125d252b8..c669434b6 100644
--- a/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py
+++ b/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/source/_hastag.py b/gramps/gen/filters/rules/source/_hastag.py
index 9d5849d12..6ee0a236d 100644
--- a/gramps/gen/filters/rules/source/_hastag.py
+++ b/gramps/gen/filters/rules/source/_hastag.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._hastagbase import HasTagBase
diff --git a/gramps/gen/filters/rules/source/_matchesfilter.py b/gramps/gen/filters/rules/source/_matchesfilter.py
index f8497227d..32d63b634 100644
--- a/gramps/gen/filters/rules/source/_matchesfilter.py
+++ b/gramps/gen/filters/rules/source/_matchesfilter.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._matchesfilterbase import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py b/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py
index 94bc82926..3829e8db1 100644
--- a/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py
+++ b/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py
@@ -29,7 +29,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import MatchesFilterBase
diff --git a/gramps/gen/filters/rules/source/_matchestitlesubstringof.py b/gramps/gen/filters/rules/source/_matchestitlesubstringof.py
index 5c6719f89..40a606d53 100644
--- a/gramps/gen/filters/rules/source/_matchestitlesubstringof.py
+++ b/gramps/gen/filters/rules/source/_matchestitlesubstringof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .. import Rule
diff --git a/gramps/gen/filters/rules/source/_regexpidof.py b/gramps/gen/filters/rules/source/_regexpidof.py
index 2a12fff6e..f77dd2099 100644
--- a/gramps/gen/filters/rules/source/_regexpidof.py
+++ b/gramps/gen/filters/rules/source/_regexpidof.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._regexpidbase import RegExpIdBase
diff --git a/gramps/gen/filters/rules/source/_sourceprivate.py b/gramps/gen/filters/rules/source/_sourceprivate.py
index 019200a7b..4cd9dbb90 100644
--- a/gramps/gen/filters/rules/source/_sourceprivate.py
+++ b/gramps/gen/filters/rules/source/_sourceprivate.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .._isprivate import IsPrivate
diff --git a/gramps/gen/lib/address.py b/gramps/gen/lib/address.py
index c0f1a05a3..f896e47ba 100644
--- a/gramps/gen/lib/address.py
+++ b/gramps/gen/lib/address.py
@@ -27,7 +27,7 @@ Address class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/addressbase.py b/gramps/gen/lib/addressbase.py
index 3bd804adb..b9819425f 100644
--- a/gramps/gen/lib/addressbase.py
+++ b/gramps/gen/lib/addressbase.py
@@ -25,7 +25,7 @@ AddressBase class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .address import Address
diff --git a/gramps/gen/lib/attrbase.py b/gramps/gen/lib/attrbase.py
index 21850f57b..5581acb7b 100644
--- a/gramps/gen/lib/attrbase.py
+++ b/gramps/gen/lib/attrbase.py
@@ -25,7 +25,7 @@ AttributeRootBase class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .attribute import Attribute
diff --git a/gramps/gen/lib/attribute.py b/gramps/gen/lib/attribute.py
index ab6920c81..f23594f9d 100644
--- a/gramps/gen/lib/attribute.py
+++ b/gramps/gen/lib/attribute.py
@@ -26,7 +26,7 @@ Attribute class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/attrtype.py b/gramps/gen/lib/attrtype.py
index e60d418ff..6f098693f 100644
--- a/gramps/gen/lib/attrtype.py
+++ b/gramps/gen/lib/attrtype.py
@@ -31,7 +31,7 @@ from ..const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/childref.py b/gramps/gen/lib/childref.py
index 8530556ac..35261474b 100644
--- a/gramps/gen/lib/childref.py
+++ b/gramps/gen/lib/childref.py
@@ -26,7 +26,7 @@ Child Reference class for Gramps.
 """
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/childreftype.py b/gramps/gen/lib/childreftype.py
index 70c3a3590..91eb91d2d 100644
--- a/gramps/gen/lib/childreftype.py
+++ b/gramps/gen/lib/childreftype.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/citation.py b/gramps/gen/lib/citation.py
index 728513989..6e98216c1 100644
--- a/gramps/gen/lib/citation.py
+++ b/gramps/gen/lib/citation.py
@@ -34,7 +34,7 @@ LOG = logging.getLogger(".citation")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/datebase.py b/gramps/gen/lib/datebase.py
index 48adde48f..c065fa7bb 100644
--- a/gramps/gen/lib/datebase.py
+++ b/gramps/gen/lib/datebase.py
@@ -24,7 +24,7 @@ DateBase class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .date import Date
diff --git a/gramps/gen/lib/event.py b/gramps/gen/lib/event.py
index 9df0986f9..99e66c829 100644
--- a/gramps/gen/lib/event.py
+++ b/gramps/gen/lib/event.py
@@ -34,7 +34,7 @@ LOG = logging.getLogger(".citation")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/eventref.py b/gramps/gen/lib/eventref.py
index 3830c8a89..00cf9ff18 100644
--- a/gramps/gen/lib/eventref.py
+++ b/gramps/gen/lib/eventref.py
@@ -27,7 +27,7 @@ Event Reference class for Gramps
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/eventroletype.py b/gramps/gen/lib/eventroletype.py
index 8ee91d287..a173971b1 100644
--- a/gramps/gen/lib/eventroletype.py
+++ b/gramps/gen/lib/eventroletype.py
@@ -32,7 +32,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/eventtype.py b/gramps/gen/lib/eventtype.py
index 036af7626..230a176aa 100644
--- a/gramps/gen/lib/eventtype.py
+++ b/gramps/gen/lib/eventtype.py
@@ -33,7 +33,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/family.py b/gramps/gen/lib/family.py
index 956d03b89..b017a7663 100644
--- a/gramps/gen/lib/family.py
+++ b/gramps/gen/lib/family.py
@@ -36,7 +36,7 @@ LOG = logging.getLogger(".citation")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/familyreltype.py b/gramps/gen/lib/familyreltype.py
index ee59abd4e..982f49b37 100644
--- a/gramps/gen/lib/familyreltype.py
+++ b/gramps/gen/lib/familyreltype.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/genderstats.py b/gramps/gen/lib/genderstats.py
index 12f62fc0a..1474c4fc6 100644
--- a/gramps/gen/lib/genderstats.py
+++ b/gramps/gen/lib/genderstats.py
@@ -25,7 +25,7 @@ Gender statistics kept in Gramps database.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .person import Person
diff --git a/gramps/gen/lib/grampstype.py b/gramps/gen/lib/grampstype.py
index acb95fc47..762a77bf2 100644
--- a/gramps/gen/lib/grampstype.py
+++ b/gramps/gen/lib/grampstype.py
@@ -25,7 +25,7 @@ Base type for all gramps types.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/lib/ldsord.py b/gramps/gen/lib/ldsord.py
index e82f43a4a..83197f227 100644
--- a/gramps/gen/lib/ldsord.py
+++ b/gramps/gen/lib/ldsord.py
@@ -36,7 +36,7 @@ from warnings import warn
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/ldsordbase.py b/gramps/gen/lib/ldsordbase.py
index 8e2a9b4c5..3b1d1cc52 100644
--- a/gramps/gen/lib/ldsordbase.py
+++ b/gramps/gen/lib/ldsordbase.py
@@ -25,7 +25,7 @@ LdsOrdBase class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .ldsord import LdsOrd
diff --git a/gramps/gen/lib/location.py b/gramps/gen/lib/location.py
index 747c39814..15b9d10a9 100644
--- a/gramps/gen/lib/location.py
+++ b/gramps/gen/lib/location.py
@@ -26,7 +26,7 @@ Location class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/markertype.py b/gramps/gen/lib/markertype.py
index 022f8f406..5798a5253 100644
--- a/gramps/gen/lib/markertype.py
+++ b/gramps/gen/lib/markertype.py
@@ -35,7 +35,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/mediabase.py b/gramps/gen/lib/mediabase.py
index eebd3fdc3..a04e5f910 100644
--- a/gramps/gen/lib/mediabase.py
+++ b/gramps/gen/lib/mediabase.py
@@ -25,7 +25,7 @@ MediaBase class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .mediaref import MediaRef
diff --git a/gramps/gen/lib/mediaobj.py b/gramps/gen/lib/mediaobj.py
index 6d4c0cab7..3808f0f15 100644
--- a/gramps/gen/lib/mediaobj.py
+++ b/gramps/gen/lib/mediaobj.py
@@ -37,7 +37,7 @@ LOG = logging.getLogger(".citation")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/mediaref.py b/gramps/gen/lib/mediaref.py
index 6a40a27fb..b0aba4e82 100644
--- a/gramps/gen/lib/mediaref.py
+++ b/gramps/gen/lib/mediaref.py
@@ -27,7 +27,7 @@ Media Reference class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/name.py b/gramps/gen/lib/name.py
index 4bc1ef5ea..2d6ff41ed 100644
--- a/gramps/gen/lib/name.py
+++ b/gramps/gen/lib/name.py
@@ -27,7 +27,7 @@ Name class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/nameorigintype.py b/gramps/gen/lib/nameorigintype.py
index 969ca6a3a..7e908338c 100644
--- a/gramps/gen/lib/nameorigintype.py
+++ b/gramps/gen/lib/nameorigintype.py
@@ -32,7 +32,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/nametype.py b/gramps/gen/lib/nametype.py
index 224f09d53..d26638bc3 100644
--- a/gramps/gen/lib/nametype.py
+++ b/gramps/gen/lib/nametype.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/note.py b/gramps/gen/lib/note.py
index 89e7e0dd9..1ed2e724f 100644
--- a/gramps/gen/lib/note.py
+++ b/gramps/gen/lib/note.py
@@ -26,7 +26,7 @@ Note class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import BasicPrimaryObject
diff --git a/gramps/gen/lib/notetype.py b/gramps/gen/lib/notetype.py
index e8b391e12..f618150c6 100644
--- a/gramps/gen/lib/notetype.py
+++ b/gramps/gen/lib/notetype.py
@@ -24,7 +24,7 @@ Note types.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
@@ -32,7 +32,7 @@ _ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/person.py b/gramps/gen/lib/person.py
index 787659f08..d029f5d57 100644
--- a/gramps/gen/lib/person.py
+++ b/gramps/gen/lib/person.py
@@ -27,7 +27,7 @@ Person object for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/personref.py b/gramps/gen/lib/personref.py
index 7f9fdc839..aa12c2b42 100644
--- a/gramps/gen/lib/personref.py
+++ b/gramps/gen/lib/personref.py
@@ -27,7 +27,7 @@ Person Reference class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/place.py b/gramps/gen/lib/place.py
index 5f609e8bc..cda6c2041 100644
--- a/gramps/gen/lib/place.py
+++ b/gramps/gen/lib/place.py
@@ -27,7 +27,7 @@ Place object for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/placename.py b/gramps/gen/lib/placename.py
index 6be44ca11..c67ccc144 100644
--- a/gramps/gen/lib/placename.py
+++ b/gramps/gen/lib/placename.py
@@ -25,7 +25,7 @@ Place name class for Gramps
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/placeref.py b/gramps/gen/lib/placeref.py
index 690c326b4..75ed7a3d7 100644
--- a/gramps/gen/lib/placeref.py
+++ b/gramps/gen/lib/placeref.py
@@ -25,7 +25,7 @@ Place Reference class for Gramps
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/placetype.py b/gramps/gen/lib/placetype.py
index f2ad7d842..b4c3e3f58 100644
--- a/gramps/gen/lib/placetype.py
+++ b/gramps/gen/lib/placetype.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/primaryobj.py b/gramps/gen/lib/primaryobj.py
index 86235b506..63ab20157 100644
--- a/gramps/gen/lib/primaryobj.py
+++ b/gramps/gen/lib/primaryobj.py
@@ -25,7 +25,7 @@ Basic Primary Object class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .tableobj import TableObject
diff --git a/gramps/gen/lib/repo.py b/gramps/gen/lib/repo.py
index 13f52601b..b129731c6 100644
--- a/gramps/gen/lib/repo.py
+++ b/gramps/gen/lib/repo.py
@@ -26,7 +26,7 @@ Repository object for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/reporef.py b/gramps/gen/lib/reporef.py
index 65317a58c..53e79603c 100644
--- a/gramps/gen/lib/reporef.py
+++ b/gramps/gen/lib/reporef.py
@@ -26,7 +26,7 @@ Repository Reference class for Gramps
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/repotype.py b/gramps/gen/lib/repotype.py
index 743aa6cc7..734430af4 100644
--- a/gramps/gen/lib/repotype.py
+++ b/gramps/gen/lib/repotype.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/researcher.py b/gramps/gen/lib/researcher.py
index 8baed2bb1..cef646151 100644
--- a/gramps/gen/lib/researcher.py
+++ b/gramps/gen/lib/researcher.py
@@ -25,7 +25,7 @@ Researcher information for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .locationbase import LocationBase
diff --git a/gramps/gen/lib/secondaryobj.py b/gramps/gen/lib/secondaryobj.py
index 821bb8702..ab0581275 100644
--- a/gramps/gen/lib/secondaryobj.py
+++ b/gramps/gen/lib/secondaryobj.py
@@ -24,7 +24,7 @@ Secondary Object class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .baseobj import BaseObject
diff --git a/gramps/gen/lib/src.py b/gramps/gen/lib/src.py
index 6f69cc247..5ac2d363d 100644
--- a/gramps/gen/lib/src.py
+++ b/gramps/gen/lib/src.py
@@ -27,7 +27,7 @@ Source object for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .primaryobj import PrimaryObject
diff --git a/gramps/gen/lib/srcattribute.py b/gramps/gen/lib/srcattribute.py
index 2a8af131c..eae1c58a2 100644
--- a/gramps/gen/lib/srcattribute.py
+++ b/gramps/gen/lib/srcattribute.py
@@ -24,7 +24,7 @@ Source Attribute class for GRAMPS.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/srcmediatype.py b/gramps/gen/lib/srcmediatype.py
index 117c921e7..457ccf080 100644
--- a/gramps/gen/lib/srcmediatype.py
+++ b/gramps/gen/lib/srcmediatype.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/styledtext.py b/gramps/gen/lib/styledtext.py
index 30a3c03dc..f9bc4583e 100644
--- a/gramps/gen/lib/styledtext.py
+++ b/gramps/gen/lib/styledtext.py
@@ -23,7 +23,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .styledtexttag import StyledTextTag
diff --git a/gramps/gen/lib/styledtexttag.py b/gramps/gen/lib/styledtexttag.py
index 4e2ed04df..f9daf4f67 100644
--- a/gramps/gen/lib/styledtexttag.py
+++ b/gramps/gen/lib/styledtexttag.py
@@ -23,7 +23,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .styledtexttagtype import StyledTextTagType
diff --git a/gramps/gen/lib/styledtexttagtype.py b/gramps/gen/lib/styledtexttagtype.py
index 669e87ed3..751d5a7eb 100644
--- a/gramps/gen/lib/styledtexttagtype.py
+++ b/gramps/gen/lib/styledtexttagtype.py
@@ -30,7 +30,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/lib/surname.py b/gramps/gen/lib/surname.py
index f3d30959b..64ca13d0a 100644
--- a/gramps/gen/lib/surname.py
+++ b/gramps/gen/lib/surname.py
@@ -25,7 +25,7 @@ Surname class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/surnamebase.py b/gramps/gen/lib/surnamebase.py
index 38f4b25e2..7b469df87 100644
--- a/gramps/gen/lib/surnamebase.py
+++ b/gramps/gen/lib/surnamebase.py
@@ -27,7 +27,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .surname import Surname
diff --git a/gramps/gen/lib/tableobj.py b/gramps/gen/lib/tableobj.py
index 70b3ca91d..a3a4f01ac 100644
--- a/gramps/gen/lib/tableobj.py
+++ b/gramps/gen/lib/tableobj.py
@@ -32,7 +32,7 @@ import time
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .baseobj import BaseObject
diff --git a/gramps/gen/lib/url.py b/gramps/gen/lib/url.py
index 34017f727..0ccff8725 100644
--- a/gramps/gen/lib/url.py
+++ b/gramps/gen/lib/url.py
@@ -33,7 +33,7 @@ from urllib.parse import urlparse
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .secondaryobj import SecondaryObject
diff --git a/gramps/gen/lib/urlbase.py b/gramps/gen/lib/urlbase.py
index f4caded90..e231510a0 100644
--- a/gramps/gen/lib/urlbase.py
+++ b/gramps/gen/lib/urlbase.py
@@ -24,7 +24,7 @@ UrlBase class for Gramps.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .url import Url
diff --git a/gramps/gen/lib/urltype.py b/gramps/gen/lib/urltype.py
index f04f26cf2..13eb94cac 100644
--- a/gramps/gen/lib/urltype.py
+++ b/gramps/gen/lib/urltype.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .grampstype import GrampsType
diff --git a/gramps/gen/plug/_gramplet.py b/gramps/gen/plug/_gramplet.py
index 5afcc23ff..55ed92845 100644
--- a/gramps/gen/plug/_gramplet.py
+++ b/gramps/gen/plug/_gramplet.py
@@ -30,7 +30,7 @@ LOG = logging.getLogger(".Gramplets")
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/plug/_manager.py b/gramps/gen/plug/_manager.py
index 988613a19..4f1e45157 100644
--- a/gramps/gen/plug/_manager.py
+++ b/gramps/gen/plug/_manager.py
@@ -46,7 +46,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..config import config
diff --git a/gramps/gen/plug/_pluginreg.py b/gramps/gen/plug/_pluginreg.py
index c846f23d2..368a90f8f 100644
--- a/gramps/gen/plug/_pluginreg.py
+++ b/gramps/gen/plug/_pluginreg.py
@@ -37,7 +37,7 @@ import io
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.version import VERSION as GRAMPSVERSION, VERSION_TUPLE
diff --git a/gramps/gen/plug/docgen/basedoc.py b/gramps/gen/plug/docgen/basedoc.py
index a3349a730..4ea418996 100644
--- a/gramps/gen/plug/docgen/basedoc.py
+++ b/gramps/gen/plug/docgen/basedoc.py
@@ -35,7 +35,7 @@ interfaces should be derived from the core classes.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .stylesheet import StyleSheet
diff --git a/gramps/gen/plug/docgen/drawdoc.py b/gramps/gen/plug/docgen/drawdoc.py
index 6202830c9..50fffa4e5 100644
--- a/gramps/gen/plug/docgen/drawdoc.py
+++ b/gramps/gen/plug/docgen/drawdoc.py
@@ -32,7 +32,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from . import fontscale
diff --git a/gramps/gen/plug/docgen/fontstyle.py b/gramps/gen/plug/docgen/fontstyle.py
index ebd7c7f02..10b7258f0 100644
--- a/gramps/gen/plug/docgen/fontstyle.py
+++ b/gramps/gen/plug/docgen/fontstyle.py
@@ -31,7 +31,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/plug/docgen/graphdoc.py b/gramps/gen/plug/docgen/graphdoc.py
index 97c4b846c..3e4cd8fd3 100644
--- a/gramps/gen/plug/docgen/graphdoc.py
+++ b/gramps/gen/plug/docgen/graphdoc.py
@@ -37,7 +37,7 @@ import sys
 
 #-------------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/plug/docgen/graphicstyle.py b/gramps/gen/plug/docgen/graphicstyle.py
index 5dc35dfba..33cdd92b4 100644
--- a/gramps/gen/plug/docgen/graphicstyle.py
+++ b/gramps/gen/plug/docgen/graphicstyle.py
@@ -33,7 +33,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/plug/docgen/paperstyle.py b/gramps/gen/plug/docgen/paperstyle.py
index 23c162e29..0e8de87e9 100644
--- a/gramps/gen/plug/docgen/paperstyle.py
+++ b/gramps/gen/plug/docgen/paperstyle.py
@@ -31,7 +31,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/plug/docgen/paragraphstyle.py b/gramps/gen/plug/docgen/paragraphstyle.py
index 7e767777e..aea4b6acf 100644
--- a/gramps/gen/plug/docgen/paragraphstyle.py
+++ b/gramps/gen/plug/docgen/paragraphstyle.py
@@ -30,7 +30,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .fontstyle import FontStyle
diff --git a/gramps/gen/plug/docgen/stylesheet.py b/gramps/gen/plug/docgen/stylesheet.py
index 754a7b8af..90de0d6d2 100644
--- a/gramps/gen/plug/docgen/stylesheet.py
+++ b/gramps/gen/plug/docgen/stylesheet.py
@@ -39,7 +39,7 @@ def escxml(string):
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .paragraphstyle import ParagraphStyle
diff --git a/gramps/gen/plug/docgen/tablestyle.py b/gramps/gen/plug/docgen/tablestyle.py
index 1d836b061..2bf15165a 100644
--- a/gramps/gen/plug/docgen/tablestyle.py
+++ b/gramps/gen/plug/docgen/tablestyle.py
@@ -30,7 +30,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/plug/docgen/textdoc.py b/gramps/gen/plug/docgen/textdoc.py
index cd8ade456..4ce182eba 100644
--- a/gramps/gen/plug/docgen/textdoc.py
+++ b/gramps/gen/plug/docgen/textdoc.py
@@ -34,7 +34,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/plug/report/_paper.py b/gramps/gen/plug/report/_paper.py
index a46c99bb8..277d8a354 100644
--- a/gramps/gen/plug/report/_paper.py
+++ b/gramps/gen/plug/report/_paper.py
@@ -27,7 +27,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/plug/report/_reportbase.py b/gramps/gen/plug/report/_reportbase.py
index ba2c7d5b3..0ce0fd045 100644
--- a/gramps/gen/plug/report/_reportbase.py
+++ b/gramps/gen/plug/report/_reportbase.py
@@ -23,7 +23,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.grampslocale import GrampsLocale
diff --git a/gramps/gen/plug/report/utils.py b/gramps/gen/plug/report/utils.py
index 8c057daef..8b28b833e 100644
--- a/gramps/gen/plug/report/utils.py
+++ b/gramps/gen/plug/report/utils.py
@@ -35,7 +35,7 @@ import os
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gen/proxy/filter.py b/gramps/gen/proxy/filter.py
index aee05d6f9..5c9070b51 100644
--- a/gramps/gen/proxy/filter.py
+++ b/gramps/gen/proxy/filter.py
@@ -27,7 +27,7 @@ Proxy class for the Gramps databases. Apply filter
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS libraries
+# Gramps libraries
 #
 #-------------------------------------------------------------------------
 from .proxybase import ProxyDbBase
diff --git a/gramps/gen/proxy/living.py b/gramps/gen/proxy/living.py
index e02fccd2c..d82915284 100644
--- a/gramps/gen/proxy/living.py
+++ b/gramps/gen/proxy/living.py
@@ -24,7 +24,7 @@ Proxy class for the Gramps databases. Filter out all living people.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS libraries
+# Gramps libraries
 #
 #-------------------------------------------------------------------------
 from .proxybase import ProxyDbBase
diff --git a/gramps/gen/proxy/private.py b/gramps/gen/proxy/private.py
index 05938c5f5..d486b428a 100644
--- a/gramps/gen/proxy/private.py
+++ b/gramps/gen/proxy/private.py
@@ -36,7 +36,7 @@ LOG = logging.getLogger(".citation")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS libraries
+# Gramps libraries
 #
 #-------------------------------------------------------------------------
 from ..lib import (MediaRef, Attribute, Address, EventRef,
diff --git a/gramps/gen/proxy/proxybase.py b/gramps/gen/proxy/proxybase.py
index 03a9bde3c..af6fc5d3c 100644
--- a/gramps/gen/proxy/proxybase.py
+++ b/gramps/gen/proxy/proxybase.py
@@ -32,7 +32,7 @@ import types
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS libraries
+# Gramps libraries
 #
 #-------------------------------------------------------------------------
 from ..db.base import DbReadBase, DbWriteBase
diff --git a/gramps/gen/proxy/referencedbyselection.py b/gramps/gen/proxy/referencedbyselection.py
index 316824e2b..23953efa2 100644
--- a/gramps/gen/proxy/referencedbyselection.py
+++ b/gramps/gen/proxy/referencedbyselection.py
@@ -27,7 +27,7 @@ a person.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS libraries
+# Gramps libraries
 #
 #-------------------------------------------------------------------------
 from .proxybase import ProxyDbBase
diff --git a/gramps/gen/relationship.py b/gramps/gen/relationship.py
index 78b35ff25..6e2ce8c11 100644
--- a/gramps/gen/relationship.py
+++ b/gramps/gen/relationship.py
@@ -32,7 +32,7 @@ LOG.addHandler(logging.StreamHandler())
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gen/sort.py b/gramps/gen/sort.py
index 861199192..3cc217118 100644
--- a/gramps/gen/sort.py
+++ b/gramps/gen/sort.py
@@ -33,7 +33,7 @@ to make sure these remain in sync with the rest of the design.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS Modules
+# Gramps Modules
 #
 #-------------------------------------------------------------------------
 from .lib import Date
diff --git a/gramps/gen/utils/place.py b/gramps/gen/utils/place.py
index 3ebf87d98..de585c9de 100644
--- a/gramps/gen/utils/place.py
+++ b/gramps/gen/utils/place.py
@@ -33,7 +33,7 @@ import math
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gui/aboutdialog.py b/gramps/gui/aboutdialog.py
index e663d92c8..ceeccd4ef 100644
--- a/gramps/gui/aboutdialog.py
+++ b/gramps/gui/aboutdialog.py
@@ -48,7 +48,7 @@ from gi.repository import GdkPixbuf
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import (AUTHORS, AUTHORS_FILE, COMMENTS, COPYRIGHT_MSG,
diff --git a/gramps/gui/columnorder.py b/gramps/gui/columnorder.py
index d7b374d16..1f85b2ac9 100644
--- a/gramps/gui/columnorder.py
+++ b/gramps/gui/columnorder.py
@@ -44,7 +44,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .managedwindow import ManagedWindow
diff --git a/gramps/gui/dbguielement.py b/gramps/gui/dbguielement.py
index bc264eba9..0fdd3901e 100644
--- a/gramps/gui/dbguielement.py
+++ b/gramps/gui/dbguielement.py
@@ -28,7 +28,7 @@ Group common stuff Gramps GUI elements must be able to do when tracking a DB:
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.callman import CallbackManager
diff --git a/gramps/gui/dbloader.py b/gramps/gui/dbloader.py
index a2c807af7..d1d6e1679 100644
--- a/gramps/gui/dbloader.py
+++ b/gramps/gui/dbloader.py
@@ -48,7 +48,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/display.py b/gramps/gui/display.py
index 702618a32..bea1a09d4 100644
--- a/gramps/gui/display.py
+++ b/gramps/gui/display.py
@@ -28,7 +28,7 @@ import webbrowser
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/displaystate.py b/gramps/gui/displaystate.py
index e9de4c64a..f22b4ba31 100644
--- a/gramps/gui/displaystate.py
+++ b/gramps/gui/displaystate.py
@@ -51,7 +51,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.callback import Callback
diff --git a/gramps/gui/editors/displaytabs/addrembedlist.py b/gramps/gui/editors/displaytabs/addrembedlist.py
index d1c18e5c5..9c2319188 100644
--- a/gramps/gui/editors/displaytabs/addrembedlist.py
+++ b/gramps/gui/editors/displaytabs/addrembedlist.py
@@ -33,7 +33,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Address
diff --git a/gramps/gui/editors/displaytabs/addressmodel.py b/gramps/gui/editors/displaytabs/addressmodel.py
index d778ba7c2..3f3c6eec3 100644
--- a/gramps/gui/editors/displaytabs/addressmodel.py
+++ b/gramps/gui/editors/displaytabs/addressmodel.py
@@ -31,7 +31,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import get_date
diff --git a/gramps/gui/editors/displaytabs/attrembedlist.py b/gramps/gui/editors/displaytabs/attrembedlist.py
index 856f4cd75..b6a456c0e 100644
--- a/gramps/gui/editors/displaytabs/attrembedlist.py
+++ b/gramps/gui/editors/displaytabs/attrembedlist.py
@@ -29,7 +29,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Attribute
diff --git a/gramps/gui/editors/displaytabs/attrmodel.py b/gramps/gui/editors/displaytabs/attrmodel.py
index e1b25638d..d44980e88 100644
--- a/gramps/gui/editors/displaytabs/attrmodel.py
+++ b/gramps/gui/editors/displaytabs/attrmodel.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gui/editors/displaytabs/backreflist.py b/gramps/gui/editors/displaytabs/backreflist.py
index 5b5e30041..715fa7568 100644
--- a/gramps/gui/editors/displaytabs/backreflist.py
+++ b/gramps/gui/editors/displaytabs/backreflist.py
@@ -37,7 +37,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...widgets import SimpleButton
diff --git a/gramps/gui/editors/displaytabs/backrefmodel.py b/gramps/gui/editors/displaytabs/backrefmodel.py
index 7d34ef463..254019f59 100644
--- a/gramps/gui/editors/displaytabs/backrefmodel.py
+++ b/gramps/gui/editors/displaytabs/backrefmodel.py
@@ -33,7 +33,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.display.name import displayer as name_displayer
diff --git a/gramps/gui/editors/displaytabs/buttontab.py b/gramps/gui/editors/displaytabs/buttontab.py
index 8acdb290f..b459f75b2 100644
--- a/gramps/gui/editors/displaytabs/buttontab.py
+++ b/gramps/gui/editors/displaytabs/buttontab.py
@@ -37,7 +37,7 @@ from gi.repository import Gdk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...widgets import SimpleButton
diff --git a/gramps/gui/editors/displaytabs/childmodel.py b/gramps/gui/editors/displaytabs/childmodel.py
index 6654a3f95..0c2040218 100644
--- a/gramps/gui/editors/displaytabs/childmodel.py
+++ b/gramps/gui/editors/displaytabs/childmodel.py
@@ -28,7 +28,7 @@ from html import escape
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import get_date
diff --git a/gramps/gui/editors/displaytabs/citationbackreflist.py b/gramps/gui/editors/displaytabs/citationbackreflist.py
index 55d795088..da3a22378 100644
--- a/gramps/gui/editors/displaytabs/citationbackreflist.py
+++ b/gramps/gui/editors/displaytabs/citationbackreflist.py
@@ -21,7 +21,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .backrefmodel import BackRefModel
diff --git a/gramps/gui/editors/displaytabs/citationembedlist.py b/gramps/gui/editors/displaytabs/citationembedlist.py
index 7823a15bb..47b377889 100644
--- a/gramps/gui/editors/displaytabs/citationembedlist.py
+++ b/gramps/gui/editors/displaytabs/citationembedlist.py
@@ -38,7 +38,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.errors import WindowActiveError
diff --git a/gramps/gui/editors/displaytabs/embeddedlist.py b/gramps/gui/editors/displaytabs/embeddedlist.py
index 91e2ab5d0..83ba21c22 100644
--- a/gramps/gui/editors/displaytabs/embeddedlist.py
+++ b/gramps/gui/editors/displaytabs/embeddedlist.py
@@ -41,7 +41,7 @@ from gi.repository import Pango
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...utils import is_right_click
diff --git a/gramps/gui/editors/displaytabs/eventbackreflist.py b/gramps/gui/editors/displaytabs/eventbackreflist.py
index ee01683be..d88959f89 100644
--- a/gramps/gui/editors/displaytabs/eventbackreflist.py
+++ b/gramps/gui/editors/displaytabs/eventbackreflist.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .backrefmodel import BackRefModel
diff --git a/gramps/gui/editors/displaytabs/eventembedlist.py b/gramps/gui/editors/displaytabs/eventembedlist.py
index 0cf4396db..9a7dc90f3 100644
--- a/gramps/gui/editors/displaytabs/eventembedlist.py
+++ b/gramps/gui/editors/displaytabs/eventembedlist.py
@@ -32,7 +32,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Event, EventRef, EventRoleType, EventType
diff --git a/gramps/gui/editors/displaytabs/eventrefmodel.py b/gramps/gui/editors/displaytabs/eventrefmodel.py
index 5ceb23017..cff8655e0 100644
--- a/gramps/gui/editors/displaytabs/eventrefmodel.py
+++ b/gramps/gui/editors/displaytabs/eventrefmodel.py
@@ -42,7 +42,7 @@ from html import escape
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...widgets.undoablebuffer import UndoableBuffer
diff --git a/gramps/gui/editors/displaytabs/familyattrembedlist.py b/gramps/gui/editors/displaytabs/familyattrembedlist.py
index 86a5d8c5b..17f02f5de 100644
--- a/gramps/gui/editors/displaytabs/familyattrembedlist.py
+++ b/gramps/gui/editors/displaytabs/familyattrembedlist.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .attrembedlist import AttrEmbedList
diff --git a/gramps/gui/editors/displaytabs/familyldsembedlist.py b/gramps/gui/editors/displaytabs/familyldsembedlist.py
index 397282dc0..df1b089d3 100644
--- a/gramps/gui/editors/displaytabs/familyldsembedlist.py
+++ b/gramps/gui/editors/displaytabs/familyldsembedlist.py
@@ -28,7 +28,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .embeddedlist import TEXT_COL, MARKUP_COL, ICON_COL
diff --git a/gramps/gui/editors/displaytabs/gallerytab.py b/gramps/gui/editors/displaytabs/gallerytab.py
index 269a12605..38caa9c19 100644
--- a/gramps/gui/editors/displaytabs/gallerytab.py
+++ b/gramps/gui/editors/displaytabs/gallerytab.py
@@ -43,7 +43,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...utils import is_right_click, open_file_with_default_application
diff --git a/gramps/gui/editors/displaytabs/groupembeddedlist.py b/gramps/gui/editors/displaytabs/groupembeddedlist.py
index 245531dd0..a619c4134 100644
--- a/gramps/gui/editors/displaytabs/groupembeddedlist.py
+++ b/gramps/gui/editors/displaytabs/groupembeddedlist.py
@@ -38,7 +38,7 @@ from gi.repository import GObject
 from gi.repository import GLib
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...utils import is_right_click
diff --git a/gramps/gui/editors/displaytabs/ldsembedlist.py b/gramps/gui/editors/displaytabs/ldsembedlist.py
index 02bd6e306..74324c514 100644
--- a/gramps/gui/editors/displaytabs/ldsembedlist.py
+++ b/gramps/gui/editors/displaytabs/ldsembedlist.py
@@ -29,7 +29,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import LdsOrd
diff --git a/gramps/gui/editors/displaytabs/ldsmodel.py b/gramps/gui/editors/displaytabs/ldsmodel.py
index a3923febb..e65b8bd96 100644
--- a/gramps/gui/editors/displaytabs/ldsmodel.py
+++ b/gramps/gui/editors/displaytabs/ldsmodel.py
@@ -33,7 +33,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import get_date
diff --git a/gramps/gui/editors/displaytabs/locationembedlist.py b/gramps/gui/editors/displaytabs/locationembedlist.py
index 6095b9c9f..4a8490f61 100644
--- a/gramps/gui/editors/displaytabs/locationembedlist.py
+++ b/gramps/gui/editors/displaytabs/locationembedlist.py
@@ -29,7 +29,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Location
diff --git a/gramps/gui/editors/displaytabs/locationmodel.py b/gramps/gui/editors/displaytabs/locationmodel.py
index 0d37f5c07..22d79d1aa 100644
--- a/gramps/gui/editors/displaytabs/locationmodel.py
+++ b/gramps/gui/editors/displaytabs/locationmodel.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gui/editors/displaytabs/mediabackreflist.py b/gramps/gui/editors/displaytabs/mediabackreflist.py
index 47c7f5601..f8f3178f6 100644
--- a/gramps/gui/editors/displaytabs/mediabackreflist.py
+++ b/gramps/gui/editors/displaytabs/mediabackreflist.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .backrefmodel import BackRefModel
diff --git a/gramps/gui/editors/displaytabs/nameembedlist.py b/gramps/gui/editors/displaytabs/nameembedlist.py
index 32af04112..d919ea22b 100644
--- a/gramps/gui/editors/displaytabs/nameembedlist.py
+++ b/gramps/gui/editors/displaytabs/nameembedlist.py
@@ -38,7 +38,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Name, Surname
diff --git a/gramps/gui/editors/displaytabs/namemodel.py b/gramps/gui/editors/displaytabs/namemodel.py
index ee3d66170..c23015707 100644
--- a/gramps/gui/editors/displaytabs/namemodel.py
+++ b/gramps/gui/editors/displaytabs/namemodel.py
@@ -41,7 +41,7 @@ WEIGHT_BOLD = Pango.Weight.BOLD
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from ...widgets.undoablebuffer import UndoableBuffer
diff --git a/gramps/gui/editors/displaytabs/notebackreflist.py b/gramps/gui/editors/displaytabs/notebackreflist.py
index f0897c0aa..5679f1a34 100644
--- a/gramps/gui/editors/displaytabs/notebackreflist.py
+++ b/gramps/gui/editors/displaytabs/notebackreflist.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gui/editors/displaytabs/notetab.py b/gramps/gui/editors/displaytabs/notetab.py
index d171fc6cc..4c3dcbafa 100644
--- a/gramps/gui/editors/displaytabs/notetab.py
+++ b/gramps/gui/editors/displaytabs/notetab.py
@@ -36,7 +36,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.errors import WindowActiveError
diff --git a/gramps/gui/editors/displaytabs/personbackreflist.py b/gramps/gui/editors/displaytabs/personbackreflist.py
index 7db31d184..94e678e09 100644
--- a/gramps/gui/editors/displaytabs/personbackreflist.py
+++ b/gramps/gui/editors/displaytabs/personbackreflist.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .backrefmodel import BackRefModel
diff --git a/gramps/gui/editors/displaytabs/personeventembedlist.py b/gramps/gui/editors/displaytabs/personeventembedlist.py
index 798c3a248..af8a15c2e 100644
--- a/gramps/gui/editors/displaytabs/personeventembedlist.py
+++ b/gramps/gui/editors/displaytabs/personeventembedlist.py
@@ -31,7 +31,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import EventRoleType, EventType
diff --git a/gramps/gui/editors/displaytabs/personrefembedlist.py b/gramps/gui/editors/displaytabs/personrefembedlist.py
index abec0a020..cf74fc292 100644
--- a/gramps/gui/editors/displaytabs/personrefembedlist.py
+++ b/gramps/gui/editors/displaytabs/personrefembedlist.py
@@ -30,7 +30,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import PersonRef
diff --git a/gramps/gui/editors/displaytabs/personrefmodel.py b/gramps/gui/editors/displaytabs/personrefmodel.py
index 07a7ec4c4..2ce168890 100644
--- a/gramps/gui/editors/displaytabs/personrefmodel.py
+++ b/gramps/gui/editors/displaytabs/personrefmodel.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.display.name import displayer as name_displayer
diff --git a/gramps/gui/editors/displaytabs/placebackreflist.py b/gramps/gui/editors/displaytabs/placebackreflist.py
index 3d8c30283..bea03dbed 100644
--- a/gramps/gui/editors/displaytabs/placebackreflist.py
+++ b/gramps/gui/editors/displaytabs/placebackreflist.py
@@ -20,7 +20,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .backrefmodel import BackRefModel
diff --git a/gramps/gui/editors/displaytabs/placerefembedlist.py b/gramps/gui/editors/displaytabs/placerefembedlist.py
index a8d65b50c..b105e48f8 100644
--- a/gramps/gui/editors/displaytabs/placerefembedlist.py
+++ b/gramps/gui/editors/displaytabs/placerefembedlist.py
@@ -30,7 +30,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Place, PlaceRef
diff --git a/gramps/gui/editors/displaytabs/repoembedlist.py b/gramps/gui/editors/displaytabs/repoembedlist.py
index 89e8b340e..6528112fc 100644
--- a/gramps/gui/editors/displaytabs/repoembedlist.py
+++ b/gramps/gui/editors/displaytabs/repoembedlist.py
@@ -29,7 +29,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import RepoRef, Repository
diff --git a/gramps/gui/editors/displaytabs/reporefmodel.py b/gramps/gui/editors/displaytabs/reporefmodel.py
index a469504ac..37c400b28 100644
--- a/gramps/gui/editors/displaytabs/reporefmodel.py
+++ b/gramps/gui/editors/displaytabs/reporefmodel.py
@@ -27,7 +27,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gui/editors/displaytabs/sourcebackreflist.py b/gramps/gui/editors/displaytabs/sourcebackreflist.py
index a1102f40f..87208d14f 100644
--- a/gramps/gui/editors/displaytabs/sourcebackreflist.py
+++ b/gramps/gui/editors/displaytabs/sourcebackreflist.py
@@ -21,7 +21,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .backrefmodel import BackRefModel
diff --git a/gramps/gui/editors/displaytabs/srcattrembedlist.py b/gramps/gui/editors/displaytabs/srcattrembedlist.py
index fc5c59714..d6f5414bf 100644
--- a/gramps/gui/editors/displaytabs/srcattrembedlist.py
+++ b/gramps/gui/editors/displaytabs/srcattrembedlist.py
@@ -29,7 +29,7 @@ from gi.repository import GObject, GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import SrcAttribute
diff --git a/gramps/gui/editors/displaytabs/surnamemodel.py b/gramps/gui/editors/displaytabs/surnamemodel.py
index cac5e52c1..c80255198 100644
--- a/gramps/gui/editors/displaytabs/surnamemodel.py
+++ b/gramps/gui/editors/displaytabs/surnamemodel.py
@@ -28,7 +28,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/gui/editors/displaytabs/surnametab.py b/gramps/gui/editors/displaytabs/surnametab.py
index 50ab46e1a..0820dc33c 100644
--- a/gramps/gui/editors/displaytabs/surnametab.py
+++ b/gramps/gui/editors/displaytabs/surnametab.py
@@ -41,7 +41,7 @@ _ENTER = Gdk.keyval_from_name("Enter")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from .surnamemodel import SurnameModel
diff --git a/gramps/gui/editors/displaytabs/webembedlist.py b/gramps/gui/editors/displaytabs/webembedlist.py
index f797ab7ad..8b8703603 100644
--- a/gramps/gui/editors/displaytabs/webembedlist.py
+++ b/gramps/gui/editors/displaytabs/webembedlist.py
@@ -31,7 +31,7 @@ from gi.repository import GLib
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Url
diff --git a/gramps/gui/editors/editnote.py b/gramps/gui/editors/editnote.py
index 29025ff52..ed6920b5e 100644
--- a/gramps/gui/editors/editnote.py
+++ b/gramps/gui/editors/editnote.py
@@ -43,7 +43,7 @@ from gi.repository import Pango
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/gui/editors/editprimary.py b/gramps/gui/editors/editprimary.py
index 3748fcffd..e2c2d26f5 100644
--- a/gramps/gui/editors/editprimary.py
+++ b/gramps/gui/editors/editprimary.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ..managedwindow import ManagedWindow
diff --git a/gramps/gui/editors/filtereditor.py b/gramps/gui/editors/filtereditor.py
index 1c058efdc..2bdc4b594 100644
--- a/gramps/gui/editors/filtereditor.py
+++ b/gramps/gui/editors/filtereditor.py
@@ -48,7 +48,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/filters/_filtercombobox.py b/gramps/gui/filters/_filtercombobox.py
index 0ce9609a0..de8743ea2 100644
--- a/gramps/gui/filters/_filtercombobox.py
+++ b/gramps/gui/filters/_filtercombobox.py
@@ -32,7 +32,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.filters import CustomFilters
diff --git a/gramps/gui/filters/_filterstore.py b/gramps/gui/filters/_filterstore.py
index 7c9cbe66c..af0679e8c 100644
--- a/gramps/gui/filters/_filterstore.py
+++ b/gramps/gui/filters/_filterstore.py
@@ -33,7 +33,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.filters import CustomFilters
diff --git a/gramps/gui/filters/sidebar/_citationsidebarfilter.py b/gramps/gui/filters/sidebar/_citationsidebarfilter.py
index 7b5025b78..000e50315 100644
--- a/gramps/gui/filters/sidebar/_citationsidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_citationsidebarfilter.py
@@ -28,7 +28,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/filters/sidebar/_eventsidebarfilter.py b/gramps/gui/filters/sidebar/_eventsidebarfilter.py
index a3540ca37..8326ef548 100644
--- a/gramps/gui/filters/sidebar/_eventsidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_eventsidebarfilter.py
@@ -35,7 +35,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/filters/sidebar/_familysidebarfilter.py b/gramps/gui/filters/sidebar/_familysidebarfilter.py
index dd53f3457..6a82ca3a6 100644
--- a/gramps/gui/filters/sidebar/_familysidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_familysidebarfilter.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/filters/sidebar/_mediasidebarfilter.py b/gramps/gui/filters/sidebar/_mediasidebarfilter.py
index f2a2279c9..871bf9dab 100644
--- a/gramps/gui/filters/sidebar/_mediasidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_mediasidebarfilter.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/filters/sidebar/_notesidebarfilter.py b/gramps/gui/filters/sidebar/_notesidebarfilter.py
index 9baeaf7b8..59791d82c 100644
--- a/gramps/gui/filters/sidebar/_notesidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_notesidebarfilter.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/filters/sidebar/_personsidebarfilter.py b/gramps/gui/filters/sidebar/_personsidebarfilter.py
index 40434e324..fc362b329 100644
--- a/gramps/gui/filters/sidebar/_personsidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_personsidebarfilter.py
@@ -34,7 +34,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/filters/sidebar/_placesidebarfilter.py b/gramps/gui/filters/sidebar/_placesidebarfilter.py
index faf1743db..399b24c54 100644
--- a/gramps/gui/filters/sidebar/_placesidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_placesidebarfilter.py
@@ -37,7 +37,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/filters/sidebar/_reposidebarfilter.py b/gramps/gui/filters/sidebar/_reposidebarfilter.py
index fcefd12f8..4d678734f 100644
--- a/gramps/gui/filters/sidebar/_reposidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_reposidebarfilter.py
@@ -35,7 +35,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/filters/sidebar/_sourcesidebarfilter.py b/gramps/gui/filters/sidebar/_sourcesidebarfilter.py
index 0c5f99f33..944dae4e4 100644
--- a/gramps/gui/filters/sidebar/_sourcesidebarfilter.py
+++ b/gramps/gui/filters/sidebar/_sourcesidebarfilter.py
@@ -35,7 +35,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ... import widgets
diff --git a/gramps/gui/plug/_dialogs.py b/gramps/gui/plug/_dialogs.py
index b26a47480..cf83f3f76 100644
--- a/gramps/gui/plug/_dialogs.py
+++ b/gramps/gui/plug/_dialogs.py
@@ -38,7 +38,7 @@ from collections import defaultdict
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import PLUGINS_GLADE
diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py
index 8025b7cf1..e1039153a 100644
--- a/gramps/gui/plug/_windows.py
+++ b/gramps/gui/plug/_windows.py
@@ -49,7 +49,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/plug/export/_exportoptions.py b/gramps/gui/plug/export/_exportoptions.py
index 76a054876..3bfa9973d 100644
--- a/gramps/gui/plug/export/_exportoptions.py
+++ b/gramps/gui/plug/export/_exportoptions.py
@@ -30,7 +30,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/plug/quick/_quickreports.py b/gramps/gui/plug/quick/_quickreports.py
index 1a66c16e5..09456a228 100644
--- a/gramps/gui/plug/quick/_quickreports.py
+++ b/gramps/gui/plug/quick/_quickreports.py
@@ -51,7 +51,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...pluginmanager import GuiPluginManager
diff --git a/gramps/gui/plug/report/_docreportdialog.py b/gramps/gui/plug/report/_docreportdialog.py
index 3a517cead..7b49d4b67 100644
--- a/gramps/gui/plug/report/_docreportdialog.py
+++ b/gramps/gui/plug/report/_docreportdialog.py
@@ -38,7 +38,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/gui/plug/report/_drawreportdialog.py b/gramps/gui/plug/report/_drawreportdialog.py
index 743e7b5aa..098a034d6 100644
--- a/gramps/gui/plug/report/_drawreportdialog.py
+++ b/gramps/gui/plug/report/_drawreportdialog.py
@@ -29,7 +29,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.plug.report._constants import CATEGORY_DRAW
diff --git a/gramps/gui/plug/report/_graphvizreportdialog.py b/gramps/gui/plug/report/_graphvizreportdialog.py
index 43ab16a12..62197d6e3 100644
--- a/gramps/gui/plug/report/_graphvizreportdialog.py
+++ b/gramps/gui/plug/report/_graphvizreportdialog.py
@@ -42,7 +42,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/gui/plug/report/_papermenu.py b/gramps/gui/plug/report/_papermenu.py
index 46308f1a8..4f43fcfd5 100644
--- a/gramps/gui/plug/report/_papermenu.py
+++ b/gramps/gui/plug/report/_papermenu.py
@@ -37,7 +37,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.plug.docgen import PaperStyle, PAPER_PORTRAIT, PAPER_LANDSCAPE
diff --git a/gramps/gui/plug/report/_reportdialog.py b/gramps/gui/plug/report/_reportdialog.py
index 7c549dd16..6e00d7d06 100644
--- a/gramps/gui/plug/report/_reportdialog.py
+++ b/gramps/gui/plug/report/_reportdialog.py
@@ -42,7 +42,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale,  URL_MANUAL_PAGE
diff --git a/gramps/gui/plug/report/_styleeditor.py b/gramps/gui/plug/report/_styleeditor.py
index 6baf3d8f6..d8f3ac281 100644
--- a/gramps/gui/plug/report/_styleeditor.py
+++ b/gramps/gui/plug/report/_styleeditor.py
@@ -47,7 +47,7 @@ from gi.repository import Gtk, Gdk
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug.docgen import (StyleSheet, FONT_SERIF, FONT_SANS_SERIF,
diff --git a/gramps/gui/plug/report/_textreportdialog.py b/gramps/gui/plug/report/_textreportdialog.py
index 8f3b428fe..2d43010ad 100644
--- a/gramps/gui/plug/report/_textreportdialog.py
+++ b/gramps/gui/plug/report/_textreportdialog.py
@@ -30,7 +30,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ...pluginmanager import GuiPluginManager
diff --git a/gramps/gui/plug/report/_webreportdialog.py b/gramps/gui/plug/report/_webreportdialog.py
index 020fc0482..f08f004f7 100644
--- a/gramps/gui/plug/report/_webreportdialog.py
+++ b/gramps/gui/plug/report/_webreportdialog.py
@@ -21,7 +21,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from ._reportdialog import ReportDialog
diff --git a/gramps/gui/plug/tool.py b/gramps/gui/plug/tool.py
index 88610d235..146b341f3 100644
--- a/gramps/gui/plug/tool.py
+++ b/gramps/gui/plug/tool.py
@@ -34,7 +34,7 @@ log = logging.getLogger(".")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import TOOL_OPTIONS
diff --git a/gramps/gui/pluginmanager.py b/gramps/gui/pluginmanager.py
index ec6cf3c42..7098d9aa0 100644
--- a/gramps/gui/pluginmanager.py
+++ b/gramps/gui/pluginmanager.py
@@ -38,7 +38,7 @@ from gi.repository import Gtk, GdkPixbuf, Gdk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.callback import Callback
diff --git a/gramps/gui/selectors/selectnote.py b/gramps/gui/selectors/selectnote.py
index 9296ee29d..818348439 100644
--- a/gramps/gui/selectors/selectnote.py
+++ b/gramps/gui/selectors/selectnote.py
@@ -32,7 +32,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS Modules
+# Gramps Modules
 #
 #-------------------------------------------------------------------------
 from ..views.treemodels import NoteModel
diff --git a/gramps/gui/spell.py b/gramps/gui/spell.py
index ec8acfe25..e9293d71f 100644
--- a/gramps/gui/spell.py
+++ b/gramps/gui/spell.py
@@ -71,7 +71,7 @@ elif repository.enumerate_versions("Gtkspell"):
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS classes
+# Gramps classes
 #
 #-------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/gui/tipofday.py b/gramps/gui/tipofday.py
index ac8f28593..698536bdc 100644
--- a/gramps/gui/tipofday.py
+++ b/gramps/gui/tipofday.py
@@ -41,7 +41,7 @@ import os
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import IMAGE_DIR, TIP_DATA
diff --git a/gramps/gui/undohistory.py b/gramps/gui/undohistory.py
index af2509ed2..598f8de14 100644
--- a/gramps/gui/undohistory.py
+++ b/gramps/gui/undohistory.py
@@ -40,7 +40,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .dialog import QuestionDialog
diff --git a/gramps/gui/viewmanager.py b/gramps/gui/viewmanager.py
index 235947ad0..074f85649 100644
--- a/gramps/gui/viewmanager.py
+++ b/gramps/gui/viewmanager.py
@@ -57,7 +57,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/views/listview.py b/gramps/gui/views/listview.py
index aa59ccdba..fe226378f 100644
--- a/gramps/gui/views/listview.py
+++ b/gramps/gui/views/listview.py
@@ -46,7 +46,7 @@ from gi.repository import Pango
 
 #----------------------------------------------------------------
 #
-# GRAMPS
+# Gramps
 #
 #----------------------------------------------------------------
 from .pageview import PageView
diff --git a/gramps/gui/views/navigationview.py b/gramps/gui/views/navigationview.py
index 639eae2a7..1c6ff5080 100644
--- a/gramps/gui/views/navigationview.py
+++ b/gramps/gui/views/navigationview.py
@@ -42,7 +42,7 @@ from gi.repository import Gtk
 
 #----------------------------------------------------------------
 #
-# GRAMPS
+# Gramps
 #
 #----------------------------------------------------------------
 from .pageview import PageView
diff --git a/gramps/gui/views/pageview.py b/gramps/gui/views/pageview.py
index ec675a2d4..f2b7ee9bb 100644
--- a/gramps/gui/views/pageview.py
+++ b/gramps/gui/views/pageview.py
@@ -42,7 +42,7 @@ _ = glocale.translation.gettext
 
 #----------------------------------------------------------------
 #
-# GRAMPS
+# Gramps
 #
 #----------------------------------------------------------------
 from gramps.gen.errors import WindowActiveError
diff --git a/gramps/gui/views/treemodels/basemodel.py b/gramps/gui/views/treemodels/basemodel.py
index 01d27ca11..46dc3713a 100644
--- a/gramps/gui/views/treemodels/basemodel.py
+++ b/gramps/gui/views/treemodels/basemodel.py
@@ -22,7 +22,7 @@
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .lru import LRU
diff --git a/gramps/gui/views/treemodels/citationbasemodel.py b/gramps/gui/views/treemodels/citationbasemodel.py
index 59bc29493..1c06b6b96 100644
--- a/gramps/gui/views/treemodels/citationbasemodel.py
+++ b/gramps/gui/views/treemodels/citationbasemodel.py
@@ -35,7 +35,7 @@ LOG = logging.getLogger(".citation")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/views/treemodels/citationlistmodel.py b/gramps/gui/views/treemodels/citationlistmodel.py
index 1c91e1fcb..992f00acd 100644
--- a/gramps/gui/views/treemodels/citationlistmodel.py
+++ b/gramps/gui/views/treemodels/citationlistmodel.py
@@ -41,7 +41,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .flatbasemodel import FlatBaseModel
diff --git a/gramps/gui/views/treemodels/citationtreemodel.py b/gramps/gui/views/treemodels/citationtreemodel.py
index 7d623736e..822e734ad 100644
--- a/gramps/gui/views/treemodels/citationtreemodel.py
+++ b/gramps/gui/views/treemodels/citationtreemodel.py
@@ -49,7 +49,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.db import get_source_referents
diff --git a/gramps/gui/views/treemodels/eventmodel.py b/gramps/gui/views/treemodels/eventmodel.py
index 2e1f6e344..7724dc7cc 100644
--- a/gramps/gui/views/treemodels/eventmodel.py
+++ b/gramps/gui/views/treemodels/eventmodel.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import format_time, get_date, get_date_valid
diff --git a/gramps/gui/views/treemodels/familymodel.py b/gramps/gui/views/treemodels/familymodel.py
index d3e22ed78..119822c1b 100644
--- a/gramps/gui/views/treemodels/familymodel.py
+++ b/gramps/gui/views/treemodels/familymodel.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import displayer, format_time, get_date_valid
diff --git a/gramps/gui/views/treemodels/flatbasemodel.py b/gramps/gui/views/treemodels/flatbasemodel.py
index 0f0111c93..1324e2e66 100644
--- a/gramps/gui/views/treemodels/flatbasemodel.py
+++ b/gramps/gui/views/treemodels/flatbasemodel.py
@@ -67,7 +67,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.filters import SearchFilter, ExactSearchFilter
diff --git a/gramps/gui/views/treemodels/mediamodel.py b/gramps/gui/views/treemodels/mediamodel.py
index 17af42f21..0e7e981d3 100644
--- a/gramps/gui/views/treemodels/mediamodel.py
+++ b/gramps/gui/views/treemodels/mediamodel.py
@@ -38,7 +38,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import displayer, format_time
diff --git a/gramps/gui/views/treemodels/notemodel.py b/gramps/gui/views/treemodels/notemodel.py
index 12d3e72fc..d15b955e1 100644
--- a/gramps/gui/views/treemodels/notemodel.py
+++ b/gramps/gui/views/treemodels/notemodel.py
@@ -36,7 +36,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import format_time
diff --git a/gramps/gui/views/treemodels/peoplemodel.py b/gramps/gui/views/treemodels/peoplemodel.py
index 3b79c8529..a3ef892d8 100644
--- a/gramps/gui/views/treemodels/peoplemodel.py
+++ b/gramps/gui/views/treemodels/peoplemodel.py
@@ -50,7 +50,7 @@ _LOG = logging.getLogger(".")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/views/treemodels/placemodel.py b/gramps/gui/views/treemodels/placemodel.py
index c38347c7a..fe60c6d28 100644
--- a/gramps/gui/views/treemodels/placemodel.py
+++ b/gramps/gui/views/treemodels/placemodel.py
@@ -41,7 +41,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Place, PlaceType
diff --git a/gramps/gui/views/treemodels/repomodel.py b/gramps/gui/views/treemodels/repomodel.py
index b33fb64c8..eb8d0a2df 100644
--- a/gramps/gui/views/treemodels/repomodel.py
+++ b/gramps/gui/views/treemodels/repomodel.py
@@ -35,7 +35,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Address, RepositoryType, Url, UrlType
diff --git a/gramps/gui/views/treemodels/sourcemodel.py b/gramps/gui/views/treemodels/sourcemodel.py
index 1e506f76f..aa5f9ceba 100644
--- a/gramps/gui/views/treemodels/sourcemodel.py
+++ b/gramps/gui/views/treemodels/sourcemodel.py
@@ -35,7 +35,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.datehandler import format_time
diff --git a/gramps/gui/views/treemodels/treebasemodel.py b/gramps/gui/views/treemodels/treebasemodel.py
index 3c31674c4..a03fddebe 100644
--- a/gramps/gui/views/treemodels/treebasemodel.py
+++ b/gramps/gui/views/treemodels/treebasemodel.py
@@ -47,7 +47,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/gui/widgets/fanchart.py b/gramps/gui/widgets/fanchart.py
index 61497059d..45cc2a47c 100644
--- a/gramps/gui/widgets/fanchart.py
+++ b/gramps/gui/widgets/fanchart.py
@@ -47,7 +47,7 @@ from html import escape
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.db import DbTxn
diff --git a/gramps/gui/widgets/fanchartdesc.py b/gramps/gui/widgets/fanchartdesc.py
index c2d7a6b61..b875ab4ac 100644
--- a/gramps/gui/widgets/fanchartdesc.py
+++ b/gramps/gui/widgets/fanchartdesc.py
@@ -46,7 +46,7 @@ from html import escape
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.display.name import displayer as name_displayer
diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py
index af913e90a..bfe5ca4c9 100644
--- a/gramps/gui/widgets/grampletpane.py
+++ b/gramps/gui/widgets/grampletpane.py
@@ -42,7 +42,7 @@ LOG = logging.getLogger(".")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.errors import WindowActiveError
diff --git a/gramps/gui/widgets/shortlistcomboentry.py b/gramps/gui/widgets/shortlistcomboentry.py
index ad1085ce9..48411e0cb 100644
--- a/gramps/gui/widgets/shortlistcomboentry.py
+++ b/gramps/gui/widgets/shortlistcomboentry.py
@@ -40,7 +40,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .validatedcomboentry import ValidatedComboEntry
diff --git a/gramps/gui/widgets/styledtextbuffer.py b/gramps/gui/widgets/styledtextbuffer.py
index fcc1747dc..342f86f9e 100644
--- a/gramps/gui/widgets/styledtextbuffer.py
+++ b/gramps/gui/widgets/styledtextbuffer.py
@@ -50,7 +50,7 @@ UNDERLINE_SINGLE = Pango.Underline.SINGLE
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import (StyledText, StyledTextTag, StyledTextTagType)
diff --git a/gramps/gui/widgets/styledtexteditor.py b/gramps/gui/widgets/styledtexteditor.py
index 13dfb92ae..875a5b37c 100644
--- a/gramps/gui/widgets/styledtexteditor.py
+++ b/gramps/gui/widgets/styledtexteditor.py
@@ -46,7 +46,7 @@ from gi.repository import Pango
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import StyledTextTagType
diff --git a/gramps/gui/widgets/toolcomboentry.py b/gramps/gui/widgets/toolcomboentry.py
index a881866cf..c060a0df1 100644
--- a/gramps/gui/widgets/toolcomboentry.py
+++ b/gramps/gui/widgets/toolcomboentry.py
@@ -40,7 +40,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .valuetoolitem import ValueToolItem
diff --git a/gramps/gui/widgets/valueaction.py b/gramps/gui/widgets/valueaction.py
index de5f78265..68e629252 100644
--- a/gramps/gui/widgets/valueaction.py
+++ b/gramps/gui/widgets/valueaction.py
@@ -40,7 +40,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from .valuetoolitem import ValueToolItem
diff --git a/gramps/guiQML/grampsqml.py b/gramps/guiQML/grampsqml.py
index 8781be600..89909b4cd 100644
--- a/gramps/guiQML/grampsqml.py
+++ b/gramps/guiQML/grampsqml.py
@@ -38,7 +38,7 @@ LOG = logging.getLogger(".grampsqml")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/guiQML/viewmanager.py b/gramps/guiQML/viewmanager.py
index 34a19688e..98a78d0c3 100644
--- a/gramps/guiQML/viewmanager.py
+++ b/gramps/guiQML/viewmanager.py
@@ -56,7 +56,7 @@ from PySide import QtOpenGL
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import ROOT_DIR
diff --git a/gramps/guiQML/views/centralview.py b/gramps/guiQML/views/centralview.py
index 1eca1438f..5cd985e58 100644
--- a/gramps/guiQML/views/centralview.py
+++ b/gramps/guiQML/views/centralview.py
@@ -56,7 +56,7 @@ from PySide import QtOpenGL
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import ROOT_DIR
diff --git a/gramps/guiQML/views/dbman.py b/gramps/guiQML/views/dbman.py
index 4dacc4420..8aea6f269 100644
--- a/gramps/guiQML/views/dbman.py
+++ b/gramps/guiQML/views/dbman.py
@@ -48,7 +48,7 @@ from PySide import QtOpenGL
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import IMAGE_DIR, ROOT_DIR
diff --git a/gramps/guiQML/views/personview.py b/gramps/guiQML/views/personview.py
index d0101d8f0..99a0adc16 100644
--- a/gramps/guiQML/views/personview.py
+++ b/gramps/guiQML/views/personview.py
@@ -49,7 +49,7 @@ from PySide import QtOpenGL
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import ROOT_DIR
diff --git a/gramps/plugins/database/bsddb_support/read.py b/gramps/plugins/database/bsddb_support/read.py
index 9d01d77d1..0cc03e6ef 100644
--- a/gramps/plugins/database/bsddb_support/read.py
+++ b/gramps/plugins/database/bsddb_support/read.py
@@ -50,7 +50,7 @@ import logging
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS libraries
+# Gramps libraries
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib.mediaobj import MediaObject
diff --git a/gramps/plugins/docgen/htmldoc.py b/gramps/plugins/docgen/htmldoc.py
index 663ec2358..5eb28466a 100644
--- a/gramps/plugins/docgen/htmldoc.py
+++ b/gramps/plugins/docgen/htmldoc.py
@@ -40,7 +40,7 @@ import time
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -144,7 +144,7 @@ class HtmlDoc(BaseDoc, TextDoc):
         self.build_style_declaration()
 
 
-        # GRAMPS favicon en css
+        # Gramps favicon en css
         fname1 = '/'.join([self._backend.datadir(), 'favicon.ico'])
         fname2 = '/'.join([self._backend.datadir(), _TEXTDOCSCREEN])
         fname3 = '/'.join([self._backend.datadir(), _HTMLSCREEN])
diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py
index 9a06dfc58..81a4ddbcd 100644
--- a/gramps/plugins/drawreport/ancestortree.py
+++ b/gramps/plugins/drawreport/ancestortree.py
@@ -32,7 +32,7 @@ from __future__ import division
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/drawreport/calendarreport.py b/gramps/plugins/drawreport/calendarreport.py
index 94d8c7245..bf5b58db8 100644
--- a/gramps/plugins/drawreport/calendarreport.py
+++ b/gramps/plugins/drawreport/calendarreport.py
@@ -30,7 +30,7 @@ import time
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -391,7 +391,7 @@ class Calendar(Report):
                                 spouse_name = self.get_name(spouse)
                                 short_name = self.get_name(person)
                                 # TEMP: this will handle ordered events
-                                # GRAMPS 3.0 will have a new mechanism for start/stop events
+                                # Gramps 3.0 will have a new mechanism for start/stop events
                                 are_married = None
                                 for event_ref in fam.get_event_ref_list():
                                     event = db.get_event_from_handle(event_ref.ref)
diff --git a/gramps/plugins/drawreport/descendtree.py b/gramps/plugins/drawreport/descendtree.py
index 0f7463c5a..c10fd48c8 100644
--- a/gramps/plugins/drawreport/descendtree.py
+++ b/gramps/plugins/drawreport/descendtree.py
@@ -29,7 +29,7 @@ Reports/Graphical Reports/Personal Tree
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/drawreport/statisticschart.py b/gramps/plugins/drawreport/statisticschart.py
index ab965484c..1c2309bf5 100644
--- a/gramps/plugins/drawreport/statisticschart.py
+++ b/gramps/plugins/drawreport/statisticschart.py
@@ -36,7 +36,7 @@ from functools import partial
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/drawreport/timeline.py b/gramps/plugins/drawreport/timeline.py
index 2b8a54676..cb0f297f6 100644
--- a/gramps/plugins/drawreport/timeline.py
+++ b/gramps/plugins/drawreport/timeline.py
@@ -27,7 +27,7 @@ Timeline Chart
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/export/export.gpr.py b/gramps/plugins/export/export.gpr.py
index 668f52fb3..7178fb496 100644
--- a/gramps/plugins/export/export.gpr.py
+++ b/gramps/plugins/export/export.gpr.py
@@ -107,7 +107,7 @@ plg.extension = "gw"
 
 #------------------------------------------------------------------------
 #
-# GRAMPS package (portable XML)
+# Gramps package (portable XML)
 #
 #------------------------------------------------------------------------
 
@@ -129,7 +129,7 @@ plg.extension = "gpkg"
 
 #------------------------------------------------------------------------
 #
-# GRAMPS XML database
+# Gramps XML database
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/export/exportcsv.py b/gramps/plugins/export/exportcsv.py
index 4aa09641e..857281482 100644
--- a/gramps/plugins/export/exportcsv.py
+++ b/gramps/plugins/export/exportcsv.py
@@ -48,7 +48,7 @@ LOG = logging.getLogger(".ExportCSV")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import EventType, Person
diff --git a/gramps/plugins/export/exportftree.py b/gramps/plugins/export/exportftree.py
index 66939bf8a..d4c9377c2 100644
--- a/gramps/plugins/export/exportftree.py
+++ b/gramps/plugins/export/exportftree.py
@@ -42,7 +42,7 @@ log = logging.getLogger(".WriteFtree")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.alive import probably_alive
diff --git a/gramps/plugins/export/exportgedcom.py b/gramps/plugins/export/exportgedcom.py
index e02793ffa..72a0e5c3f 100644
--- a/gramps/plugins/export/exportgedcom.py
+++ b/gramps/plugins/export/exportgedcom.py
@@ -38,7 +38,7 @@ import io
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/export/exportgeneweb.py b/gramps/plugins/export/exportgeneweb.py
index aace7dde4..c77113eb0 100644
--- a/gramps/plugins/export/exportgeneweb.py
+++ b/gramps/plugins/export/exportgeneweb.py
@@ -42,7 +42,7 @@ log = logging.getLogger(".WriteGeneWeb")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/export/exportpkg.py b/gramps/plugins/export/exportpkg.py
index 28d65c423..97763959c 100644
--- a/gramps/plugins/export/exportpkg.py
+++ b/gramps/plugins/export/exportpkg.py
@@ -54,7 +54,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gui.plug.export import WriterOptionBox
diff --git a/gramps/plugins/export/exportvcalendar.py b/gramps/plugins/export/exportvcalendar.py
index 2b78523ec..74d474be8 100644
--- a/gramps/plugins/export/exportvcalendar.py
+++ b/gramps/plugins/export/exportvcalendar.py
@@ -43,7 +43,7 @@ log = logging.getLogger(".ExportVCal")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/export/exportvcard.py b/gramps/plugins/export/exportvcard.py
index 6a248dd15..0c37199ea 100644
--- a/gramps/plugins/export/exportvcard.py
+++ b/gramps/plugins/export/exportvcard.py
@@ -43,7 +43,7 @@ log = logging.getLogger(".ExportVCard")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/gramplet/ageondategramplet.py b/gramps/plugins/gramplet/ageondategramplet.py
index f4196fbe8..f6af14fe2 100644
--- a/gramps/plugins/gramplet/ageondategramplet.py
+++ b/gramps/plugins/gramplet/ageondategramplet.py
@@ -29,7 +29,7 @@ on a particular date.
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/calendargramplet.py b/gramps/plugins/gramplet/calendargramplet.py
index 917f2effb..c0e0ea6cf 100644
--- a/gramps/plugins/gramplet/calendargramplet.py
+++ b/gramps/plugins/gramplet/calendargramplet.py
@@ -18,7 +18,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/fanchartdescgramplet.py b/gramps/plugins/gramplet/fanchartdescgramplet.py
index b5b0c003d..62bcc8e06 100644
--- a/gramps/plugins/gramplet/fanchartdescgramplet.py
+++ b/gramps/plugins/gramplet/fanchartdescgramplet.py
@@ -37,7 +37,7 @@ except ImportError:
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/gramplet/fanchartgramplet.py b/gramps/plugins/gramplet/fanchartgramplet.py
index 1c82dcabb..aa34a9fbe 100644
--- a/gramps/plugins/gramplet/fanchartgramplet.py
+++ b/gramps/plugins/gramplet/fanchartgramplet.py
@@ -43,7 +43,7 @@ except ImportError:
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/gramplet/faqgramplet.py b/gramps/plugins/gramplet/faqgramplet.py
index 2305591cb..dd6386a95 100644
--- a/gramps/plugins/gramplet/faqgramplet.py
+++ b/gramps/plugins/gramplet/faqgramplet.py
@@ -24,7 +24,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/gramplet.gpr.py b/gramps/plugins/gramplet/gramplet.gpr.py
index 4f10e3d24..6e8052a6d 100644
--- a/gramps/plugins/gramplet/gramplet.gpr.py
+++ b/gramps/plugins/gramplet/gramplet.gpr.py
@@ -25,7 +25,7 @@ MODULE_VERSION="5.0"
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/gramplet/pedigreegramplet.py b/gramps/plugins/gramplet/pedigreegramplet.py
index f380d0984..36aa89536 100644
--- a/gramps/plugins/gramplet/pedigreegramplet.py
+++ b/gramps/plugins/gramplet/pedigreegramplet.py
@@ -26,7 +26,7 @@ from html import escape
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/gramplet/quickviewgramplet.py b/gramps/plugins/gramplet/quickviewgramplet.py
index 779c46394..f93c5e89a 100644
--- a/gramps/plugins/gramplet/quickviewgramplet.py
+++ b/gramps/plugins/gramplet/quickviewgramplet.py
@@ -26,7 +26,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/recordsgramplet.py b/gramps/plugins/gramplet/recordsgramplet.py
index d8229e577..c9283c8d4 100644
--- a/gramps/plugins/gramplet/recordsgramplet.py
+++ b/gramps/plugins/gramplet/recordsgramplet.py
@@ -30,7 +30,7 @@ _ = glocale.translation.sgettext
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.plugins.lib.librecords import find_records, CALLNAME_DONTUSE
diff --git a/gramps/plugins/gramplet/relativegramplet.py b/gramps/plugins/gramplet/relativegramplet.py
index 065087758..1204188c4 100644
--- a/gramps/plugins/gramplet/relativegramplet.py
+++ b/gramps/plugins/gramplet/relativegramplet.py
@@ -18,7 +18,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/sessionloggramplet.py b/gramps/plugins/gramplet/sessionloggramplet.py
index 58f9510c4..98178ed5a 100644
--- a/gramps/plugins/gramplet/sessionloggramplet.py
+++ b/gramps/plugins/gramplet/sessionloggramplet.py
@@ -18,7 +18,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 import time
diff --git a/gramps/plugins/gramplet/statsgramplet.py b/gramps/plugins/gramplet/statsgramplet.py
index b39044ef0..8c7a493bb 100644
--- a/gramps/plugins/gramplet/statsgramplet.py
+++ b/gramps/plugins/gramplet/statsgramplet.py
@@ -25,7 +25,7 @@ import posixpath
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/surnamecloudgramplet.py b/gramps/plugins/gramplet/surnamecloudgramplet.py
index 6a56c13d0..572e831fb 100644
--- a/gramps/plugins/gramplet/surnamecloudgramplet.py
+++ b/gramps/plugins/gramplet/surnamecloudgramplet.py
@@ -20,7 +20,7 @@ from collections import defaultdict
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/topsurnamesgramplet.py b/gramps/plugins/gramplet/topsurnamesgramplet.py
index c4610a290..c9dc3e34f 100644
--- a/gramps/plugins/gramplet/topsurnamesgramplet.py
+++ b/gramps/plugins/gramplet/topsurnamesgramplet.py
@@ -20,7 +20,7 @@ from collections import defaultdict
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.plug import Gramplet
diff --git a/gramps/plugins/gramplet/welcomegramplet.py b/gramps/plugins/gramplet/welcomegramplet.py
index ba7e586a8..24424a3ba 100644
--- a/gramps/plugins/gramplet/welcomegramplet.py
+++ b/gramps/plugins/gramplet/welcomegramplet.py
@@ -26,7 +26,7 @@ from gi.repository import Gtk
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import URL_WIKISTRING, URL_MANUAL_PAGE, URL_HOMEPAGE
diff --git a/gramps/plugins/gramplet/whatsnext.py b/gramps/plugins/gramplet/whatsnext.py
index f6e80d9ff..cc783cc8d 100644
--- a/gramps/plugins/gramplet/whatsnext.py
+++ b/gramps/plugins/gramplet/whatsnext.py
@@ -22,7 +22,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.lib import EventType, FamilyRelType
diff --git a/gramps/plugins/graph/gvfamilylines.py b/gramps/plugins/graph/gvfamilylines.py
index 194a1c267..f660a3bbd 100644
--- a/gramps/plugins/graph/gvfamilylines.py
+++ b/gramps/plugins/graph/gvfamilylines.py
@@ -44,7 +44,7 @@ log = logging.getLogger(".FamilyLines")
 
 #------------------------------------------------------------------------
 #
-# GRAMPS module
+# Gramps module
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/graph/gvhourglass.py b/gramps/plugins/graph/gvhourglass.py
index 5f725eb6d..a5f36eadf 100644
--- a/gramps/plugins/graph/gvhourglass.py
+++ b/gramps/plugins/graph/gvhourglass.py
@@ -33,7 +33,7 @@ Generate an hourglass graph using the Graphviz generator.
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/graph/gvrelgraph.py b/gramps/plugins/graph/gvrelgraph.py
index 6fc6cd6a4..eb176cc53 100644
--- a/gramps/plugins/graph/gvrelgraph.py
+++ b/gramps/plugins/graph/gvrelgraph.py
@@ -42,7 +42,7 @@ from functools import partial
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/importer/import.gpr.py b/gramps/plugins/importer/import.gpr.py
index 8412eed1a..5fd3a5077 100644
--- a/gramps/plugins/importer/import.gpr.py
+++ b/gramps/plugins/importer/import.gpr.py
@@ -79,7 +79,7 @@ plg.extension = "gw"
 
 #------------------------------------------------------------------------
 #
-# GRAMPS package (portable XML)
+# Gramps package (portable XML)
 #
 #------------------------------------------------------------------------
 
@@ -98,7 +98,7 @@ plg.extension = "gpkg"
 
 #------------------------------------------------------------------------
 #
-# GRAMPS XML database
+# Gramps XML database
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/importer/importcsv.py b/gramps/plugins/importer/importcsv.py
index e8c0fac33..d99ac7849 100644
--- a/gramps/plugins/importer/importcsv.py
+++ b/gramps/plugins/importer/importcsv.py
@@ -43,7 +43,7 @@ LOG = logging.getLogger(".ImportCSV")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/importer/importgedcom.py b/gramps/plugins/importer/importgedcom.py
index 542850823..cee39d044 100644
--- a/gramps/plugins/importer/importgedcom.py
+++ b/gramps/plugins/importer/importgedcom.py
@@ -31,7 +31,7 @@ LOG = logging.getLogger(".GedcomImport")
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/importer/importgeneweb.py b/gramps/plugins/importer/importgeneweb.py
index c5ef46d8b..6fe3b9764 100644
--- a/gramps/plugins/importer/importgeneweb.py
+++ b/gramps/plugins/importer/importgeneweb.py
@@ -40,7 +40,7 @@ LOG = logging.getLogger(".ImportGeneWeb")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/importer/importgpkg.py b/gramps/plugins/importer/importgpkg.py
index 330b609fe..cd8ad7571 100644
--- a/gramps/plugins/importer/importgpkg.py
+++ b/gramps/plugins/importer/importgpkg.py
@@ -43,7 +43,7 @@ log = logging.getLogger(".ReadPkg")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import XMLFILE
diff --git a/gramps/plugins/importer/importprogen.py b/gramps/plugins/importer/importprogen.py
index 2a091cd17..fd365990b 100644
--- a/gramps/plugins/importer/importprogen.py
+++ b/gramps/plugins/importer/importprogen.py
@@ -42,7 +42,7 @@ log = logging.getLogger('.ImportProGen')
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/importer/importvcard.py b/gramps/plugins/importer/importvcard.py
index 05bda1335..09a004a6e 100644
--- a/gramps/plugins/importer/importvcard.py
+++ b/gramps/plugins/importer/importvcard.py
@@ -41,7 +41,7 @@ LOG = logging.getLogger(".ImportVCard")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/importer/importxml.py b/gramps/plugins/importer/importxml.py
index ea41339eb..6ea8124e4 100644
--- a/gramps/plugins/importer/importxml.py
+++ b/gramps/plugins/importer/importxml.py
@@ -1132,7 +1132,7 @@ class GrampsParser(UpdateCallback):
         self.info.add('new-object', PLACE_KEY, self.placeobj)
         self.place_names = 0
 
-        # GRAMPS LEGACY: title in the placeobj tag
+        # Gramps LEGACY: title in the placeobj tag
         self.placeobj.title = attrs.get('title', '')
         self.locations = 0
         self.update(self.p.CurrentLineNumber)
@@ -1230,7 +1230,7 @@ class GrampsParser(UpdateCallback):
         id, privacy and changetime.
         """
         if self.person or self.family:
-            # GRAMPS LEGACY: old events that were written inside
+            # Gramps LEGACY: old events that were written inside
             # person or family objects.
             self.event = Event()
             self.event.handle = create_id()
@@ -1593,7 +1593,7 @@ class GrampsParser(UpdateCallback):
         self.family.private = bool(attrs.get("priv"))
         self.family.change = int(attrs.get('change', self.change))
         self.info.add('new-object', FAMILY_KEY, self.family)
-        # GRAMPS LEGACY: the type now belongs to <rel> tag
+        # Gramps LEGACY: the type now belongs to <rel> tag
         # Here we need to support old format of <family type="Married">
         if 'type' in attrs:
             self.family.type.set_from_xml_str(attrs["type"])
@@ -1885,7 +1885,7 @@ class GrampsParser(UpdateCallback):
             self.note_text = None
             self.note_tags = []
         else:
-            # GRAMPS LEGACY: old notes that were written inside other objects
+            # Gramps LEGACY: old notes that were written inside other objects
             # We need to create a top-level note, it's type depends on
             #   the caller object, and inherits privacy from caller object
             # On stop_note the reference to this note will be added
@@ -2086,7 +2086,7 @@ class GrampsParser(UpdateCallback):
         if self.citation:
             self.citation.set_reference_handle(handle)
         else:
-            # GRAMPS LEGACY: Prior to v1.5.0 there were no citation objects.
+            # Gramps LEGACY: Prior to v1.5.0 there were no citation objects.
             # We need to copy the contents of the old SourceRef into a new
             # Citation object.
             self.in_old_sourceref = True
@@ -2204,7 +2204,7 @@ class GrampsParser(UpdateCallback):
         self.object.change = int(attrs.get('change', self.change))
         self.info.add('new-object', MEDIA_KEY, self.object)
 
-        # GRAMPS LEGACY: src, mime, and description attributes
+        # Gramps LEGACY: src, mime, and description attributes
         # now belong to the <file> tag. Here we are supporting
         # the old format of <object src="blah"...>
         self.object.mime = attrs.get('mime', '')
diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py
index b9f09e984..3d4ee4aea 100644
--- a/gramps/plugins/lib/libgedcom.py
+++ b/gramps/plugins/lib/libgedcom.py
@@ -107,7 +107,7 @@ LOG = logging.getLogger(".libgedcom")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -7883,7 +7883,7 @@ def make_gedcom_date(subdate, calendar, mode, quality):
         retval = retval + " (swedish)"
         # Skip prefix @#DUNKNOWN@ as it seems
         # not used in all other genealogy applications.
-        # GRAMPS can handle it on import, but not with (swedish) appended
+        # Gramps can handle it on import, but not with (swedish) appended
         # to explain what calendar, the unknown refer to
         prefix = ""
     if prefix:
diff --git a/gramps/plugins/lib/libgrampsxml.py b/gramps/plugins/lib/libgrampsxml.py
index a184ba74c..3e9b04e08 100644
--- a/gramps/plugins/lib/libgrampsxml.py
+++ b/gramps/plugins/lib/libgrampsxml.py
@@ -24,7 +24,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/lib/libholiday.py b/gramps/plugins/lib/libholiday.py
index 567f300be..bac89fd88 100644
--- a/gramps/plugins/lib/libholiday.py
+++ b/gramps/plugins/lib/libholiday.py
@@ -30,7 +30,7 @@ import os
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -45,7 +45,7 @@ from gramps.gen.lib.gcalendar import (gregorian_ymd, hebrew_sdn)
 #------------------------------------------------------------------------
 def g2iso(dow):
     """ Converst GRAMPS day of week to ISO day of week """
-    # GRAMPS: SUN = 1
+    # Gramps: SUN = 1
     # ISO: MON = 1
     return (dow + 5) % 7 + 1
 
diff --git a/gramps/plugins/lib/libhtml.py b/gramps/plugins/lib/libhtml.py
index 0d237a6bb..050897b92 100644
--- a/gramps/plugins/lib/libhtml.py
+++ b/gramps/plugins/lib/libhtml.py
@@ -34,7 +34,7 @@ import re
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/lib/libhtmlconst.py b/gramps/plugins/lib/libhtmlconst.py
index 2ae6aff1b..9819616a9 100644
--- a/gramps/plugins/lib/libhtmlconst.py
+++ b/gramps/plugins/lib/libhtmlconst.py
@@ -35,7 +35,7 @@ _ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 
diff --git a/gramps/plugins/lib/libmapservice.py b/gramps/plugins/lib/libmapservice.py
index 0a497ed0e..03670ef31 100644
--- a/gramps/plugins/lib/libmapservice.py
+++ b/gramps/plugins/lib/libmapservice.py
@@ -30,7 +30,7 @@ Base class for map services. Example: open place in openstreetmap.org
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.utils.place import conv_lat_lon
diff --git a/gramps/plugins/lib/libnarrate.py b/gramps/plugins/lib/libnarrate.py
index aa747a35a..6aa23e81d 100644
--- a/gramps/plugins/lib/libnarrate.py
+++ b/gramps/plugins/lib/libnarrate.py
@@ -30,7 +30,7 @@ Narrator class for use by plugins.
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.lib.date import Date
diff --git a/gramps/plugins/lib/libplaceimport.py b/gramps/plugins/lib/libplaceimport.py
index 946d74f5b..101426740 100644
--- a/gramps/plugins/lib/libplaceimport.py
+++ b/gramps/plugins/lib/libplaceimport.py
@@ -24,7 +24,7 @@ Helper class for importing places.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Place, PlaceName, PlaceType, PlaceRef
diff --git a/gramps/plugins/lib/librecords.py b/gramps/plugins/lib/librecords.py
index e6901f43b..bab67441d 100644
--- a/gramps/plugins/lib/librecords.py
+++ b/gramps/plugins/lib/librecords.py
@@ -30,7 +30,7 @@ import datetime
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/lib/maps/cairoprint.py b/gramps/plugins/lib/maps/cairoprint.py
index 657f86c3c..b78afa29a 100644
--- a/gramps/plugins/lib/maps/cairoprint.py
+++ b/gramps/plugins/lib/maps/cairoprint.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/mapservices/eniroswedenmap.py b/gramps/plugins/mapservices/eniroswedenmap.py
index c4b5c6aa1..badfd48bd 100644
--- a/gramps/plugins/mapservices/eniroswedenmap.py
+++ b/gramps/plugins/mapservices/eniroswedenmap.py
@@ -34,7 +34,7 @@ _ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.plugins.lib.libmapservice import MapService
diff --git a/gramps/plugins/mapservices/googlemap.py b/gramps/plugins/mapservices/googlemap.py
index c2a616611..ddcb27e50 100644
--- a/gramps/plugins/mapservices/googlemap.py
+++ b/gramps/plugins/mapservices/googlemap.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.plugins.lib.libmapservice import MapService
diff --git a/gramps/plugins/mapservices/openstreetmap.py b/gramps/plugins/mapservices/openstreetmap.py
index 64e76b3d7..6f800f381 100644
--- a/gramps/plugins/mapservices/openstreetmap.py
+++ b/gramps/plugins/mapservices/openstreetmap.py
@@ -31,7 +31,7 @@ _ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.plugins.lib.libmapservice import MapService
diff --git a/gramps/plugins/quickview/all_relations.py b/gramps/plugins/quickview/all_relations.py
index 9a44d70a6..ab44b9f17 100644
--- a/gramps/plugins/quickview/all_relations.py
+++ b/gramps/plugins/quickview/all_relations.py
@@ -25,7 +25,7 @@ Display a person's relations to the home person
 """
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_ca.py b/gramps/plugins/rel/rel_ca.py
index e8f5896d4..2cdda5095 100644
--- a/gramps/plugins/rel/rel_ca.py
+++ b/gramps/plugins/rel/rel_ca.py
@@ -33,7 +33,7 @@ not explicitly in the dictionary, but "netastre" is.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_cs.py b/gramps/plugins/rel/rel_cs.py
index f8fa57d1e..a2bcc0716 100644
--- a/gramps/plugins/rel/rel_cs.py
+++ b/gramps/plugins/rel/rel_cs.py
@@ -28,7 +28,7 @@ Czech-specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_da.py b/gramps/plugins/rel/rel_da.py
index eeac9f6b2..ee336ea38 100644
--- a/gramps/plugins/rel/rel_da.py
+++ b/gramps/plugins/rel/rel_da.py
@@ -29,7 +29,7 @@ Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_de.py b/gramps/plugins/rel/rel_de.py
index 9ad5de03a..613d162e4 100644
--- a/gramps/plugins/rel/rel_de.py
+++ b/gramps/plugins/rel/rel_de.py
@@ -41,7 +41,7 @@ import re
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_es.py b/gramps/plugins/rel/rel_es.py
index d2aa02b3c..98b1321fb 100644
--- a/gramps/plugins/rel/rel_es.py
+++ b/gramps/plugins/rel/rel_es.py
@@ -27,7 +27,7 @@ Spanish-specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_fi.py b/gramps/plugins/rel/rel_fi.py
index 0fb6329a1..07f515f8a 100644
--- a/gramps/plugins/rel/rel_fi.py
+++ b/gramps/plugins/rel/rel_fi.py
@@ -29,7 +29,7 @@ Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_fr.py b/gramps/plugins/rel/rel_fr.py
index e69cfce31..4c89c3a8b 100644
--- a/gramps/plugins/rel/rel_fr.py
+++ b/gramps/plugins/rel/rel_fr.py
@@ -27,7 +27,7 @@ French-specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_hr.py b/gramps/plugins/rel/rel_hr.py
index d56e15fa6..aa6ddcbb7 100644
--- a/gramps/plugins/rel/rel_hr.py
+++ b/gramps/plugins/rel/rel_hr.py
@@ -26,7 +26,7 @@ Croatian-specific classes for calculating relationships and kinship names.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_hu.py b/gramps/plugins/rel/rel_hu.py
index 666dc4d5a..79e190489 100644
--- a/gramps/plugins/rel/rel_hu.py
+++ b/gramps/plugins/rel/rel_hu.py
@@ -29,7 +29,7 @@ Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_it.py b/gramps/plugins/rel/rel_it.py
index bc6b48b68..31ef267f7 100644
--- a/gramps/plugins/rel/rel_it.py
+++ b/gramps/plugins/rel/rel_it.py
@@ -32,7 +32,7 @@ Italian-Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_nl.py b/gramps/plugins/rel/rel_nl.py
index ef48e35ee..aed1f445a 100644
--- a/gramps/plugins/rel/rel_nl.py
+++ b/gramps/plugins/rel/rel_nl.py
@@ -25,7 +25,7 @@ Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_no.py b/gramps/plugins/rel/rel_no.py
index e6b6afa9a..69ee5f59e 100644
--- a/gramps/plugins/rel/rel_no.py
+++ b/gramps/plugins/rel/rel_no.py
@@ -29,7 +29,7 @@ Norwegian-Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_pl.py b/gramps/plugins/rel/rel_pl.py
index 7fa610a83..7e57819b1 100644
--- a/gramps/plugins/rel/rel_pl.py
+++ b/gramps/plugins/rel/rel_pl.py
@@ -32,7 +32,7 @@ Polish-specific definitions of relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_pt.py b/gramps/plugins/rel/rel_pt.py
index 368937f5e..7089e8769 100644
--- a/gramps/plugins/rel/rel_pt.py
+++ b/gramps/plugins/rel/rel_pt.py
@@ -29,7 +29,7 @@ Specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_ru.py b/gramps/plugins/rel/rel_ru.py
index c6ca8c582..1b38a595d 100644
--- a/gramps/plugins/rel/rel_ru.py
+++ b/gramps/plugins/rel/rel_ru.py
@@ -28,7 +28,7 @@ Russian-specific definitions of relationships
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_sk.py b/gramps/plugins/rel/rel_sk.py
index 0ef7387f1..6c9cbdeb4 100644
--- a/gramps/plugins/rel/rel_sk.py
+++ b/gramps/plugins/rel/rel_sk.py
@@ -25,7 +25,7 @@ Slovak-specific classes for relationships.
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_sl.py b/gramps/plugins/rel/rel_sl.py
index 52981f0b2..766785ac2 100644
--- a/gramps/plugins/rel/rel_sl.py
+++ b/gramps/plugins/rel/rel_sl.py
@@ -28,7 +28,7 @@ Slovenian-specific definitions of relationships
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_sv.py b/gramps/plugins/rel/rel_sv.py
index 8ed2b9fee..dafaa4a74 100644
--- a/gramps/plugins/rel/rel_sv.py
+++ b/gramps/plugins/rel/rel_sv.py
@@ -31,7 +31,7 @@ Swedish-specific definitions of relationships
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/rel/rel_uk.py b/gramps/plugins/rel/rel_uk.py
index a6d63550e..592f9877b 100644
--- a/gramps/plugins/rel/rel_uk.py
+++ b/gramps/plugins/rel/rel_uk.py
@@ -31,7 +31,7 @@ Ukrainian-specific definitions of relationships
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 
diff --git a/gramps/plugins/sidebar/categorysidebar.py b/gramps/plugins/sidebar/categorysidebar.py
index 495a88809..95d2eb397 100644
--- a/gramps/plugins/sidebar/categorysidebar.py
+++ b/gramps/plugins/sidebar/categorysidebar.py
@@ -31,7 +31,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/plugins/sidebar/dropdownsidebar.py b/gramps/plugins/sidebar/dropdownsidebar.py
index 96bd7cd45..37b657e98 100644
--- a/gramps/plugins/sidebar/dropdownsidebar.py
+++ b/gramps/plugins/sidebar/dropdownsidebar.py
@@ -32,7 +32,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/plugins/sidebar/expandersidebar.py b/gramps/plugins/sidebar/expandersidebar.py
index 2bb892e7f..af3393014 100644
--- a/gramps/plugins/sidebar/expandersidebar.py
+++ b/gramps/plugins/sidebar/expandersidebar.py
@@ -33,7 +33,7 @@ import logging
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.config import config
diff --git a/gramps/plugins/textreport/birthdayreport.py b/gramps/plugins/textreport/birthdayreport.py
index 1101bd84d..df971bc64 100644
--- a/gramps/plugins/textreport/birthdayreport.py
+++ b/gramps/plugins/textreport/birthdayreport.py
@@ -30,7 +30,7 @@ import datetime, time
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -351,7 +351,7 @@ class BirthdayReport(Report):
                                 spouse_name = self.get_name(spouse)
                                 short_name = self.get_name(person)
                                 # TEMP: this will handle ordered events
-                                # GRAMPS 3.0 will have a new mechanism for start/stop events
+                                # Gramps 3.0 will have a new mechanism for start/stop events
                                 are_married = None
                                 for event_ref in fam.get_event_ref_list():
                                     event = self.database.get_event_from_handle(event_ref.ref)
diff --git a/gramps/plugins/textreport/descendreport.py b/gramps/plugins/textreport/descendreport.py
index ecc85e82d..246036fe9 100644
--- a/gramps/plugins/textreport/descendreport.py
+++ b/gramps/plugins/textreport/descendreport.py
@@ -36,7 +36,7 @@ Reports/Text Reports/Descendant Report.
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/detancestralreport.py b/gramps/plugins/textreport/detancestralreport.py
index 7dfd1c04b..fbaf0bc68 100644
--- a/gramps/plugins/textreport/detancestralreport.py
+++ b/gramps/plugins/textreport/detancestralreport.py
@@ -39,7 +39,7 @@ import math
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/detdescendantreport.py b/gramps/plugins/textreport/detdescendantreport.py
index a33f97254..d9e06d3f9 100644
--- a/gramps/plugins/textreport/detdescendantreport.py
+++ b/gramps/plugins/textreport/detdescendantreport.py
@@ -40,7 +40,7 @@ from functools import partial
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/familygroup.py b/gramps/plugins/textreport/familygroup.py
index 0ef5c8633..010000229 100644
--- a/gramps/plugins/textreport/familygroup.py
+++ b/gramps/plugins/textreport/familygroup.py
@@ -33,7 +33,7 @@ from functools import partial
 
 #------------------------------------------------------------------------
 #
-# GRAMPS
+# Gramps
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/indivcomplete.py b/gramps/plugins/textreport/indivcomplete.py
index c3aee6018..54ff8e768 100644
--- a/gramps/plugins/textreport/indivcomplete.py
+++ b/gramps/plugins/textreport/indivcomplete.py
@@ -35,7 +35,7 @@ from collections import defaultdict
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/notelinkreport.py b/gramps/plugins/textreport/notelinkreport.py
index 8aac09636..de110c207 100644
--- a/gramps/plugins/textreport/notelinkreport.py
+++ b/gramps/plugins/textreport/notelinkreport.py
@@ -29,7 +29,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/numberofancestorsreport.py b/gramps/plugins/textreport/numberofancestorsreport.py
index eba0e001d..ea029c7f0 100644
--- a/gramps/plugins/textreport/numberofancestorsreport.py
+++ b/gramps/plugins/textreport/numberofancestorsreport.py
@@ -34,7 +34,7 @@ import math
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/recordsreport.py b/gramps/plugins/textreport/recordsreport.py
index c2d3e21a8..ee103d523 100644
--- a/gramps/plugins/textreport/recordsreport.py
+++ b/gramps/plugins/textreport/recordsreport.py
@@ -29,7 +29,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/summary.py b/gramps/plugins/textreport/summary.py
index 32583a468..67fd58330 100644
--- a/gramps/plugins/textreport/summary.py
+++ b/gramps/plugins/textreport/summary.py
@@ -34,7 +34,7 @@ import posixpath
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/textreport/tagreport.py b/gramps/plugins/textreport/tagreport.py
index 2349c793e..c85ec6d32 100644
--- a/gramps/plugins/textreport/tagreport.py
+++ b/gramps/plugins/textreport/tagreport.py
@@ -32,7 +32,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/tool/changetypes.py b/gramps/plugins/tool/changetypes.py
index 1c865b217..fcc97fbb5 100644
--- a/gramps/plugins/tool/changetypes.py
+++ b/gramps/plugins/tool/changetypes.py
@@ -24,7 +24,7 @@
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/tool/check.py b/gramps/plugins/tool/check.py
index d7e68bfcc..a9981d51d 100644
--- a/gramps/plugins/tool/check.py
+++ b/gramps/plugins/tool/check.py
@@ -50,7 +50,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/tool/dateparserdisplaytest.py b/gramps/plugins/tool/dateparserdisplaytest.py
index e22887033..0fdb6961a 100644
--- a/gramps/plugins/tool/dateparserdisplaytest.py
+++ b/gramps/plugins/tool/dateparserdisplaytest.py
@@ -39,7 +39,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import Date, Event, EventRef, EventType, Name, Person, Surname, Tag
diff --git a/gramps/plugins/tool/eventcmp.py b/gramps/plugins/tool/eventcmp.py
index aa31ffbb8..f62879cc2 100644
--- a/gramps/plugins/tool/eventcmp.py
+++ b/gramps/plugins/tool/eventcmp.py
@@ -39,7 +39,7 @@ from gi.repository import Gtk
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.filters import GenericFilter, rules
diff --git a/gramps/plugins/tool/finddupes.py b/gramps/plugins/tool/finddupes.py
index b575760b4..8f8e6dfae 100644
--- a/gramps/plugins/tool/finddupes.py
+++ b/gramps/plugins/tool/finddupes.py
@@ -31,7 +31,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import URL_MANUAL_PAGE
diff --git a/gramps/plugins/tool/mediamanager.py b/gramps/plugins/tool/mediamanager.py
index 3bee97ea0..b5bfde06f 100644
--- a/gramps/plugins/tool/mediamanager.py
+++ b/gramps/plugins/tool/mediamanager.py
@@ -44,7 +44,7 @@ from gi.repository import GdkPixbuf
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import URL_MANUAL_PAGE, ICON, SPLASH
diff --git a/gramps/plugins/tool/mergecitations.py b/gramps/plugins/tool/mergecitations.py
index c20a677d0..1085add56 100644
--- a/gramps/plugins/tool/mergecitations.py
+++ b/gramps/plugins/tool/mergecitations.py
@@ -40,7 +40,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/tool/notrelated.py b/gramps/plugins/tool/notrelated.py
index cbf19fcf9..740b006d4 100644
--- a/gramps/plugins/tool/notrelated.py
+++ b/gramps/plugins/tool/notrelated.py
@@ -33,7 +33,7 @@ from gi.repository import GObject
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/gramps/plugins/tool/rebuild.py b/gramps/plugins/tool/rebuild.py
index 2bee3a538..6d26eee1f 100644
--- a/gramps/plugins/tool/rebuild.py
+++ b/gramps/plugins/tool/rebuild.py
@@ -46,7 +46,7 @@ log = logging.getLogger(".Rebuild")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gui.plug import tool
diff --git a/gramps/plugins/tool/rebuildgenderstat.py b/gramps/plugins/tool/rebuildgenderstat.py
index 86f11c0a2..8125965cd 100644
--- a/gramps/plugins/tool/rebuildgenderstat.py
+++ b/gramps/plugins/tool/rebuildgenderstat.py
@@ -46,7 +46,7 @@ log = logging.getLogger(".RebuildGenderStat")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gui.plug import tool
diff --git a/gramps/plugins/tool/rebuildrefmap.py b/gramps/plugins/tool/rebuildrefmap.py
index 44b9be7c3..f62c13d9f 100644
--- a/gramps/plugins/tool/rebuildrefmap.py
+++ b/gramps/plugins/tool/rebuildrefmap.py
@@ -48,7 +48,7 @@ log = logging.getLogger(".RebuildRefMap")
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gui.plug import tool
diff --git a/gramps/plugins/tool/relcalc.py b/gramps/plugins/tool/relcalc.py
index 6b7b371b4..fd661b669 100644
--- a/gramps/plugins/tool/relcalc.py
+++ b/gramps/plugins/tool/relcalc.py
@@ -41,7 +41,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.display.name import displayer as name_displayer
diff --git a/gramps/plugins/tool/removeunused.py b/gramps/plugins/tool/removeunused.py
index 3365cfc65..6363400ef 100644
--- a/gramps/plugins/tool/removeunused.py
+++ b/gramps/plugins/tool/removeunused.py
@@ -51,7 +51,7 @@ from gi.repository import GObject
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.db import DbTxn
diff --git a/gramps/plugins/tool/reorderids.py b/gramps/plugins/tool/reorderids.py
index 700cc7f78..0e44ed9ed 100644
--- a/gramps/plugins/tool/reorderids.py
+++ b/gramps/plugins/tool/reorderids.py
@@ -36,7 +36,7 @@ _ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gui.utils import ProgressMeter
diff --git a/gramps/plugins/tool/testcasegenerator.py b/gramps/plugins/tool/testcasegenerator.py
index a09c9ce67..692fbd9c7 100644
--- a/gramps/plugins/tool/testcasegenerator.py
+++ b/gramps/plugins/tool/testcasegenerator.py
@@ -43,7 +43,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gen.lib import (Address, Attribute, AttributeType, ChildRef,
diff --git a/gramps/plugins/tool/verify.py b/gramps/plugins/tool/verify.py
index b842b4090..94f5d2e98 100644
--- a/gramps/plugins/tool/verify.py
+++ b/gramps/plugins/tool/verify.py
@@ -48,7 +48,7 @@ from gi.repository import GObject
 
 #------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import URL_MANUAL_PAGE, VERSION_DIR
diff --git a/gramps/plugins/view/dashboardview.py b/gramps/plugins/view/dashboardview.py
index 197e5ed14..8f4272d17 100644
--- a/gramps/plugins/view/dashboardview.py
+++ b/gramps/plugins/view/dashboardview.py
@@ -31,7 +31,7 @@ from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 from gramps.gui.views.pageview import PageView
diff --git a/gramps/plugins/view/fanchartdescview.py b/gramps/plugins/view/fanchartdescview.py
index 29ee1eb3f..e659ecd65 100644
--- a/gramps/plugins/view/fanchartdescview.py
+++ b/gramps/plugins/view/fanchartdescview.py
@@ -38,7 +38,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 import gramps.gui.widgets.fanchart as fanchart
diff --git a/gramps/plugins/view/fanchartview.py b/gramps/plugins/view/fanchartview.py
index 6b6078e9f..d9029bc82 100644
--- a/gramps/plugins/view/fanchartview.py
+++ b/gramps/plugins/view/fanchartview.py
@@ -38,7 +38,7 @@ _ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #
-# GRAMPS modules
+# Gramps modules
 #
 #-------------------------------------------------------------------------
 import gramps.gui.widgets.fanchart as fanchart
diff --git a/gramps/plugins/view/relview.py b/gramps/plugins/view/relview.py
index 54721d535..169894e36 100644
--- a/gramps/plugins/view/relview.py
+++ b/gramps/plugins/view/relview.py
@@ -584,7 +584,7 @@ class RelationshipView(NavigationView):
         subgrid.set_row_spacing(0)
         eventbox.add(subgrid)
         self._set_draggable_person(eventbox, person.get_handle())
-        # GRAMPS ID
+        # Gramps ID
 
         subgrid.attach(widgets.BasicLabel("%s:" % _('ID')), 1, 0, 1, 1)
         label = widgets.BasicLabel(person.gramps_id)
diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py
index a509efd1c..00b0da788 100644
--- a/gramps/plugins/webreport/narrativeweb.py
+++ b/gramps/plugins/webreport/narrativeweb.py
@@ -94,7 +94,7 @@ import logging
 log = logging.getLogger(".NarrativeWeb")
 
 #------------------------------------------------
-# GRAMPS module
+# Gramps module
 #------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
@@ -2048,7 +2048,7 @@ class BasePage(object):
                 if mediaref.ref == handle and mediaref.rect is not None:
 
                     (x1, y1, x2, y2) = mediaref.rect
-                    # GRAMPS gives us absolute coordinates,
+                    # Gramps gives us absolute coordinates,
                     # but we need relative width + height
                     w = x2 - x1
                     h = y2 - y1
@@ -3756,7 +3756,7 @@ class EventPages(BasePage):
                                 else:
                                     tcell += "&nbsp;"
 
-                                # GRAMPS ID
+                                # Gramps ID
                                 trow += Html("td", class_ = "ColumnGRAMPSID") + (
                                     self.event_grampsid_link(event_handle, gid, None)
                                     )
@@ -4720,7 +4720,7 @@ class MediaPages(BasePage):
                 with Html("table", class_ = "infolist gallery") as table:
                     summaryarea += table
 
-                    # GRAMPS ID
+                    # Gramps ID
                     media_gid = media.gramps_id
                     if not self.noid and media_gid:
                         trow = Html("tr") + (
@@ -6285,7 +6285,7 @@ class PersonPages(BasePage):
                             )
                         table += trow
 
-                # GRAMPS ID
+                # Gramps ID
                 person_gid = self.person.get_gramps_id()
                 if not self.noid and person_gid:
                     trow = Html("tr") + (
diff --git a/gramps/plugins/webreport/webcal.py b/gramps/plugins/webreport/webcal.py
index 974417d80..1e7fbdd6d 100644
--- a/gramps/plugins/webreport/webcal.py
+++ b/gramps/plugins/webreport/webcal.py
@@ -43,7 +43,7 @@ import logging
 log = logging.getLogger(".WebPage")
 
 #------------------------------------------------------------------------
-# GRAMPS module
+# Gramps module
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
@@ -418,7 +418,7 @@ class WebCalReport(Report):
         if body_id is not None:
             body.attr = "id = '%(idtag)s'" % { 'idtag' : body_id }
 
-        # GRAMPS favicon
+        # Gramps favicon
         fname1 = "/".join(subdirs + ["images", "favicon2.ico"])
 
         # _CALENDARSCREEN stylesheet
diff --git a/gramps/webapp/init.py b/gramps/webapp/init.py
index 9e794d2fd..e7bdb0bdc 100644
--- a/gramps/webapp/init.py
+++ b/gramps/webapp/init.py
@@ -197,7 +197,7 @@ for type in type_models:
     count = 1
     # Add each code:
     for tuple in type._DATAMAP:
-        if len(tuple) == 3: # GRAMPS BSDDB style
+        if len(tuple) == 3: # Gramps BSDDB style
             val, name = get_datamap(tuple)
         else: # NEW SQL based
             val, name = tuple