diff --git a/gramps/gen/utils/docgen/CSVTab.py b/gramps/gen/utils/docgen/csvtab.py
similarity index 98%
rename from gramps/gen/utils/docgen/CSVTab.py
rename to gramps/gen/utils/docgen/csvtab.py
index 6af1b40ec..dd9e3aced 100644
--- a/gramps/gen/utils/docgen/CSVTab.py
+++ b/gramps/gen/utils/docgen/csvtab.py
@@ -32,7 +32,7 @@ import csv
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from .TabbedDoc import *
+from .tabbeddoc import *
 
 class CSVTab(TabbedDoc):
 
diff --git a/gramps/gen/utils/docgen/ODSTab.py b/gramps/gen/utils/docgen/odstab.py
similarity index 99%
rename from gramps/gen/utils/docgen/ODSTab.py
rename to gramps/gen/utils/docgen/odstab.py
index df7c8b872..6469400b8 100644
--- a/gramps/gen/utils/docgen/ODSTab.py
+++ b/gramps/gen/utils/docgen/odstab.py
@@ -35,7 +35,7 @@ from ...ggettext import gettext as _
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from .TabbedDoc import *
+from .tabbeddoc import *
 from ...const import PROGRAM_NAME, VERSION
 from ...errors import ReportError
 from ...constfunc import cuni
diff --git a/gramps/gen/utils/docgen/TabbedDoc.py b/gramps/gen/utils/docgen/tabbeddoc.py
similarity index 98%
rename from gramps/gen/utils/docgen/TabbedDoc.py
rename to gramps/gen/utils/docgen/tabbeddoc.py
index 20908f715..e713cee2f 100644
--- a/gramps/gen/utils/docgen/TabbedDoc.py
+++ b/gramps/gen/utils/docgen/tabbeddoc.py
@@ -17,7 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# docgen/TabbedDoc.py
 # $Id$
 #
 
diff --git a/gramps/plugins/export/test/exportVCard_test.py b/gramps/plugins/export/test/exportvcard_test.py
similarity index 100%
rename from gramps/plugins/export/test/exportVCard_test.py
rename to gramps/plugins/export/test/exportvcard_test.py
diff --git a/gramps/plugins/importer/test/importVCard_test.py b/gramps/plugins/importer/test/importvcard_test.py
similarity index 100%
rename from gramps/plugins/importer/test/importVCard_test.py
rename to gramps/plugins/importer/test/importvcard_test.py
diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py
index 0ac6d29ee..6b866cd2d 100644
--- a/gramps/plugins/lib/maps/geography.py
+++ b/gramps/plugins/lib/maps/geography.py
@@ -62,7 +62,7 @@ from gramps.gui.selectors.selectplace import SelectPlace
 
 from gi.repository import OsmGpsMap as osmgpsmap
 from . import constants
-from .osmGps import OsmGps
+from .osmgps import OsmGps
 from .selectionlayer import SelectionLayer
 from .placeselection import PlaceSelection
 
diff --git a/gramps/plugins/lib/maps/osmGps.py b/gramps/plugins/lib/maps/osmgps.py
similarity index 100%
rename from gramps/plugins/lib/maps/osmGps.py
rename to gramps/plugins/lib/maps/osmgps.py
diff --git a/gramps/plugins/lib/maps/placeselection.py b/gramps/plugins/lib/maps/placeselection.py
index 44436e2b4..01abaa617 100644
--- a/gramps/plugins/lib/maps/placeselection.py
+++ b/gramps/plugins/lib/maps/placeselection.py
@@ -54,7 +54,7 @@ from gi.repository import Gtk
 #-------------------------------------------------------------------------
 from gramps.gen.errors import WindowActiveError
 from gramps.gui.managedwindow import ManagedWindow
-from .osmGps import OsmGps
+from .osmgps import OsmGps
 
 #-------------------------------------------------------------------------
 #
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 104633ee3..6462f04e8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -572,7 +572,7 @@ gramps/plugins/lib/libplugins.gpr.py
 gramps/plugins/lib/librecords.py
 gramps/plugins/lib/libtranslate.py
 gramps/plugins/lib/maps/geography.py
-gramps/plugins/lib/maps/osmGps.py
+gramps/plugins/lib/maps/osmgps.py
 gramps/plugins/lib/maps/placeselection.py
 gramps/plugins/mapservices/eniroswedenmap.py
 gramps/plugins/mapservices/mapservice.gpr.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 42f5858d9..d1b6e18ec 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -264,9 +264,9 @@ gramps/gen/utils/test/callback_test.py
 # gen.utils.docgen
 #
 gramps/gen/utils/docgen/__init__.py
-gramps/gen/utils/docgen/CSVTab.py
-gramps/gen/utils/docgen/ODSTab.py
-gramps/gen/utils/docgen/TabbedDoc.py
+gramps/gen/utils/docgen/csvtab.py
+gramps/gen/utils/docgen/odstab.py
+gramps/gen/utils/docgen/tabbeddoc.py
 #
 # gui - GUI code
 #
@@ -424,7 +424,7 @@ gramps/plugins/drawreport/__init__.py
 #
 gramps/plugins/export/exportftree.py
 gramps/plugins/export/__init__.py
-gramps/plugins/export/test/exportVCard_test.py
+gramps/plugins/export/test/exportvcard_test.py
 #
 # plugins/lib directory
 #
@@ -464,7 +464,7 @@ gramps/plugins/quickview/__init__.py
 # plugins/import directory
 #
 gramps/plugins/importer/__init__.py
-gramps/plugins/importer/test/importVCard_test.py
+gramps/plugins/importer/test/importvcard_test.py
 #
 # plugins/gramplet directory
 #