diff --git a/gramps/gui/plug/report/_docreportdialog.py b/gramps/gui/plug/report/_docreportdialog.py
index e85609bbb..e8fa68cd0 100644
--- a/gramps/gui/plug/report/_docreportdialog.py
+++ b/gramps/gui/plug/report/_docreportdialog.py
@@ -185,9 +185,7 @@ class DocReportDialog(ReportDialog):
             ext = ""
         else:
             spath = self.get_default_directory()
-            default_name = self.dbname + "_" + \
-                        "".join(x[0].upper() for x in self.raw_name.split("_"))
-            base = "%s.%s" % (default_name, ext)
+            default_name = self.dbname + "_" + self.raw_name
             if self.options.get_output():
                 base = os.path.basename(self.options.get_output())
             else:
diff --git a/gramps/gui/plug/report/_graphvizreportdialog.py b/gramps/gui/plug/report/_graphvizreportdialog.py
index 251fc422f..122794290 100644
--- a/gramps/gui/plug/report/_graphvizreportdialog.py
+++ b/gramps/gui/plug/report/_graphvizreportdialog.py
@@ -166,12 +166,11 @@ class GraphvizReportDialog(ReportDialog):
             ext = ""
         else:
             spath = self.get_default_directory()
-            default_name = self.dbname + "_" + \
-                        "".join(x[0].upper() for x in self.raw_name.split("_"))
+            default_name = self.dbname + "_" + self.raw_name
             if self.options.get_output():
                 base = os.path.basename(self.options.get_output())
             else:
-                base = "%s.%s" % (default_name, ext)
+                base = "%s%s" % (default_name, ext) # "ext" already has a dot
             spath = os.path.normpath(os.path.join(spath, base))
             self.target_fileentry.set_filename(spath)