From 70393bc08ad02c4f32ed7b84e6143e621affee4b Mon Sep 17 00:00:00 2001
From: Geert Janssens <geert@kobaltwit.be>
Date: Fri, 14 Jun 2019 15:37:33 +0200
Subject: [PATCH] RptCleanup - install reports into their own toplevel module
 (gnucash reports)

---
 .gitignore                                         |  2 +-
 gnucash/gnome/gnc-plugin-report-system.c           |  2 +-
 gnucash/gnome/report-menus.scm                     |  2 +-
 gnucash/report/html-document.scm                   |  7 ++++---
 gnucash/report/report.scm                          |  4 ++--
 gnucash/report/reports/CMakeLists.txt              |  8 ++++----
 gnucash/report/reports/aging.scm                   |  2 +-
 gnucash/report/reports/example/average-balance.scm |  2 +-
 gnucash/report/reports/example/daily-reports.scm   |  2 +-
 gnucash/report/reports/example/hello-world.scm     |  2 +-
 gnucash/report/reports/example/sample-graphs.scm   |  2 +-
 .../report/reports/example/welcome-to-gnucash.scm  |  2 +-
 .../report/reports/locale-specific/CMakeLists.txt  |  2 +-
 .../locale-specific/gncmod-locale-specific.c       |  4 ++--
 .../reports/locale-specific/taxtxf-de_DE.scm       |  2 +-
 gnucash/report/reports/locale-specific/taxtxf.scm  |  2 +-
 gnucash/report/reports/reports.scm                 | 12 ++++++------
 .../report/reports/standard/account-piecharts.scm  |  2 +-
 .../report/reports/standard/account-summary.scm    |  2 +-
 .../report/reports/standard/advanced-portfolio.scm |  2 +-
 .../report/reports/standard/balance-forecast.scm   |  2 +-
 gnucash/report/reports/standard/balance-sheet.scm  |  2 +-
 gnucash/report/reports/standard/balsheet-eg.scm    |  2 +-
 gnucash/report/reports/standard/balsheet-pnl.scm   |  2 +-
 .../reports/standard/budget-balance-sheet.scm      |  2 +-
 .../report/reports/standard/budget-barchart.scm    |  2 +-
 gnucash/report/reports/standard/budget-flow.scm    |  2 +-
 .../reports/standard/budget-income-statement.scm   |  2 +-
 gnucash/report/reports/standard/budget.scm         |  2 +-
 gnucash/report/reports/standard/cash-flow.scm      |  2 +-
 .../report/reports/standard/cashflow-barchart.scm  |  4 ++--
 .../report/reports/standard/category-barchart.scm  |  2 +-
 .../report/reports/standard/customer-summary.scm   |  2 +-
 gnucash/report/reports/standard/dashboard.scm      |  2 +-
 .../report/reports/standard/equity-statement.scm   |  2 +-
 .../report/reports/standard/general-journal.scm    |  2 +-
 gnucash/report/reports/standard/general-ledger.scm |  2 +-
 .../reports/standard/income-gst-statement.scm      |  2 +-
 .../report/reports/standard/income-statement.scm   |  2 +-
 gnucash/report/reports/standard/invoice.scm        |  2 +-
 gnucash/report/reports/standard/job-report.scm     |  2 +-
 gnucash/report/reports/standard/net-charts.scm     |  2 +-
 gnucash/report/reports/standard/owner-report.scm   |  2 +-
 gnucash/report/reports/standard/payables.scm       |  4 ++--
 gnucash/report/reports/standard/portfolio.scm      |  2 +-
 gnucash/report/reports/standard/price-scatter.scm  |  2 +-
 gnucash/report/reports/standard/receipt.scm        |  2 +-
 gnucash/report/reports/standard/receivables.scm    |  4 ++--
 .../report/reports/standard/reconcile-report.scm   |  2 +-
 gnucash/report/reports/standard/register.scm       |  2 +-
 gnucash/report/reports/standard/sx-summary.scm     |  2 +-
 gnucash/report/reports/standard/taxinvoice.scm     |  2 +-
 .../reports/standard/test/test-average-balance.scm |  4 ++--
 .../reports/standard/test/test-balsheet-pnl.scm    |  4 ++--
 .../report/reports/standard/test/test-budget.scm   |  2 +-
 .../reports/standard/test/test-cash-flow.scm       |  2 +-
 .../standard/test/test-cashflow-barchart.scm       |  2 +-
 .../report/reports/standard/test/test-charts.scm   | 12 ++++++------
 .../reports/standard/test/test-income-gst.scm      |  2 +-
 .../report/reports/standard/test/test-invoice.scm  |  2 +-
 .../report/reports/standard/test/test-register.scm |  2 +-
 .../test/test-standard-category-report.scm         |  4 ++--
 .../standard/test/test-standard-net-barchart.scm   |  2 +-
 .../standard/test/test-standard-net-linechart.scm  |  2 +-
 .../reports/standard/test/test-stress-options.scm  |  4 ++--
 .../reports/standard/test/test-transaction.scm     |  4 ++--
 gnucash/report/reports/standard/transaction.scm    |  2 +-
 gnucash/report/reports/standard/trial-balance.scm  |  2 +-
 gnucash/report/reports/standard/view-column.scm    |  2 +-
 libgnucash/core-utils/gnc-path.c                   | 14 +++++++-------
 libgnucash/core-utils/gnc-path.h                   |  8 ++++----
 71 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc9e97b99d..f9ca4fde5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,7 +175,7 @@ gnucash/report/locale-specific/gnucash
 gnucash/report/locale-specific/test/test-link-module
 gnucash/report/gnucash
 gnucash/report/test/test-link-module
-gnucash/report/reports/gnucash
+gnucash/reports/gnucash
 gnucash/report/stylesheets/gnucash
 gnucash/report/utility-reports/gnucash
 swig-*.c
diff --git a/gnucash/gnome/gnc-plugin-report-system.c b/gnucash/gnome/gnc-plugin-report-system.c
index 94ebaff89a..a9a5071d70 100644
--- a/gnucash/gnome/gnc-plugin-report-system.c
+++ b/gnucash/gnome/gnc-plugin-report-system.c
@@ -266,7 +266,7 @@ gnc_plugin_report_system_new (void)
     gnc_html_register_url_handler (URL_TYPE_REPORT, gnc_report_system_report_url_cb);
     gnc_html_register_url_handler (URL_TYPE_HELP, gnc_report_system_help_url_cb);
 
-    scm_c_use_module("gnucash report reports");
+    scm_c_use_module("gnucash reports");
     scm_c_use_module("gnucash report-menus");
     scm_c_eval_string("(gnc:report-menu-setup)");
 
diff --git a/gnucash/gnome/report-menus.scm b/gnucash/gnome/report-menus.scm
index f4e313bb0b..3668a23d95 100644
--- a/gnucash/gnome/report-menus.scm
+++ b/gnucash/gnome/report-menus.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gnome-utils))
 (use-modules (gnucash gettext))
-(use-modules (gnucash report reports standard dashboard))
+(use-modules (gnucash reports standard dashboard))
 
 (eval-when (compile load eval expand)
   (load-extension "libgnc-gnome" "scm_init_sw_gnome_module"))
diff --git a/gnucash/report/html-document.scm b/gnucash/report/html-document.scm
index 9b9b95b3fa..58c73e92f1 100644
--- a/gnucash/report/html-document.scm
+++ b/gnucash/report/html-document.scm
@@ -146,9 +146,10 @@
           (gnc:report-render-starting (gnc:html-document-title doc))
           (when headers?
             ;;This is the only place where <html> appears
-            ;;with the exception of 2 eguile report templates:
-            ;;./share/gnucash/scm/gnucash/report/reports/data/taxinvoice.eguile.scm:<html>
-            ;;./share/gnucash/scm/gnucash/report/reports/data/balsheet-eg.eguile.scm:<html>
+            ;;with the exception of 3 eguile report templates:
+            ;;<guile-sitedir>/gnucash/reports/data/taxinvoice.eguile.scm:<html>
+            ;;<guile-sitedir>/gnucash/reports/data/balsheet-eg.eguile.scm:<html>
+            ;;<guile-sitedir>/gnucash/reports/data/receipt.eguile.scm:<html>
 
             (push "<html>\n")
             (push "<head>\n")
diff --git a/gnucash/report/report.scm b/gnucash/report/report.scm
index 8e59f3241f..0f4b5ae207 100644
--- a/gnucash/report/report.scm
+++ b/gnucash/report/report.scm
@@ -797,10 +797,10 @@
 ;; This assumes the modules are located on the file system in a
 ;; path matching the module prefix
 ;; For example passing
-;; '('(gnucash report stylesheets) '(gnucash report reports standard))
+;; '('(gnucash report stylesheets) '(gnucash reports standard))
 ;; will search for scm files in
 ;; - <gnc-guile-dir>/gnucash/report/stylesheets
-;; - <gnc-guile-dir>/gnucash/report/reports/standard
+;; - <gnc-guile-dir>/gnucash/reports/standard
 ;; and try to load them.
 ;; This function is non-recursive so it won't
 ;; descend in subdirectories.
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 93722d3199..e1c7045d41 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -93,21 +93,21 @@ set(scm_rpt_std_GUILE_DEPENDS
 
 gnc_add_scheme_targets(scm-rpt-reports
   "${reports_SCHEME}"
-  "gnucash/report"
+  "gnucash"
   "${scm_rpts_GUILE_DEPENDS}"
   TRUE
 )
 
 gnc_add_scheme_targets(scm-reports-common
   "${reports_common_SCHEME}"
-  "gnucash/report/reports"
+  "gnucash/reports"
   "scm-reports-common-links;scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
   TRUE
 )
 
 gnc_add_scheme_targets(scm-reports-standard
   "${reports_standard_SCHEME}"
-  "gnucash/report/reports/standard"
+  "gnucash/reports/standard"
   "scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
   TRUE
 )
@@ -115,7 +115,7 @@ gnc_add_scheme_targets(scm-reports-standard
 
 gnc_add_scheme_targets(scm-reports-example
   "${reports_example_SCHEME}"
-  "gnucash/report/reports/example"
+  "gnucash/reports/example"
   "${scm_rpt_example_GUILE_DEPENDS}"
   TRUE
 )
diff --git a/gnucash/report/reports/aging.scm b/gnucash/report/reports/aging.scm
index c9359d9c51..ca2b52d231 100644
--- a/gnucash/report/reports/aging.scm
+++ b/gnucash/report/reports/aging.scm
@@ -24,7 +24,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports aging))
+(define-module (gnucash reports aging))
 
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/example/average-balance.scm b/gnucash/report/reports/example/average-balance.scm
index 0ea2cb3605..8c5b2d56fe 100644
--- a/gnucash/report/reports/example/average-balance.scm
+++ b/gnucash/report/reports/example/average-balance.scm
@@ -26,7 +26,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report reports example average-balance))
+(define-module (gnucash reports example average-balance))
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/example/daily-reports.scm b/gnucash/report/reports/example/daily-reports.scm
index 18b90a09b7..32692fcd5b 100644
--- a/gnucash/report/reports/example/daily-reports.scm
+++ b/gnucash/report/reports/example/daily-reports.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports example daily-reports))
+(define-module (gnucash reports example daily-reports))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/example/hello-world.scm b/gnucash/report/reports/example/hello-world.scm
index f5fa1b2dc1..2f5a03a5e3 100644
--- a/gnucash/report/reports/example/hello-world.scm
+++ b/gnucash/report/reports/example/hello-world.scm
@@ -23,7 +23,7 @@
 ;; It illustrates the basic techniques used to create
 ;; new reports for GnuCash.
 
-(define-module (gnucash report reports example hello-world))
+(define-module (gnucash reports example hello-world))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/example/sample-graphs.scm b/gnucash/report/reports/example/sample-graphs.scm
index aea7df59fa..d942ae2e54 100644
--- a/gnucash/report/reports/example/sample-graphs.scm
+++ b/gnucash/report/reports/example/sample-graphs.scm
@@ -23,7 +23,7 @@
 ;; It illustrates the basic techniques used to create
 ;; new reports for GnuCash.
 
-(define-module (gnucash report reports example sample-graphs))
+(define-module (gnucash reports example sample-graphs))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 
diff --git a/gnucash/report/reports/example/welcome-to-gnucash.scm b/gnucash/report/reports/example/welcome-to-gnucash.scm
index 51790d755c..05c589bb5b 100644
--- a/gnucash/report/reports/example/welcome-to-gnucash.scm
+++ b/gnucash/report/reports/example/welcome-to-gnucash.scm
@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports example welcome-to-gnucash))
+(define-module (gnucash reports example welcome-to-gnucash))
 
 (use-modules (gnucash utilities))
 (use-modules (gnucash core-utils)) ; for gnc:version
diff --git a/gnucash/report/reports/locale-specific/CMakeLists.txt b/gnucash/report/reports/locale-specific/CMakeLists.txt
index 5d53edecf0..eb6f2e77be 100644
--- a/gnucash/report/reports/locale-specific/CMakeLists.txt
+++ b/gnucash/report/reports/locale-specific/CMakeLists.txt
@@ -40,7 +40,7 @@ set(GUILE_DEPENDS
 
 gnc_add_scheme_targets(scm-reports-locale-specific-1
   "${gncmod_locale_reports_SCHEME}"
-  gnucash/report/reports/locale-specific
+  gnucash/reports/locale-specific
   "${GUILE_DEPENDS}"
   FALSE
 )
diff --git a/gnucash/report/reports/locale-specific/gncmod-locale-specific.c b/gnucash/report/reports/locale-specific/gncmod-locale-specific.c
index c7bea0562c..6314beee7f 100644
--- a/gnucash/report/reports/locale-specific/gncmod-locale-specific.c
+++ b/gnucash/report/reports/locale-specific/gncmod-locale-specific.c
@@ -80,12 +80,12 @@ libgncmod_locale_specific_gnc_module_init(int refcount)
     if (is_de_DE)
     {
         tax_module = "gnucash/tax/de_DE";
-        report_taxtxf = "(use-modules (gnucash report reports locale-specific taxtxf-de_DE))";
+        report_taxtxf = "(use-modules (gnucash reports locale-specific taxtxf-de_DE))";
     }
     else
     {
         tax_module = "gnucash/tax/us";
-        report_taxtxf = "(use-modules (gnucash report reports locale-specific taxtxf))";
+        report_taxtxf = "(use-modules (gnucash reports locale-specific taxtxf))";
     }
 
     /* The gchar* cast is only because the function declaration expects
diff --git a/gnucash/report/reports/locale-specific/taxtxf-de_DE.scm b/gnucash/report/reports/locale-specific/taxtxf-de_DE.scm
index 4f28a25298..187dba7e0d 100644
--- a/gnucash/report/reports/locale-specific/taxtxf-de_DE.scm
+++ b/gnucash/report/reports/locale-specific/taxtxf-de_DE.scm
@@ -66,7 +66,7 @@
 
 ;; depends must be outside module scope -- and should eventually go away.
 
-(define-module (gnucash report reports locale-specific taxtxf-de_DE))
+(define-module (gnucash reports locale-specific taxtxf-de_DE))
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash core-utils)) ; for gnc:version
diff --git a/gnucash/report/reports/locale-specific/taxtxf.scm b/gnucash/report/reports/locale-specific/taxtxf.scm
index 2b7904ce5b..1f85eb73fc 100644
--- a/gnucash/report/reports/locale-specific/taxtxf.scm
+++ b/gnucash/report/reports/locale-specific/taxtxf.scm
@@ -98,7 +98,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report reports locale-specific taxtxf))
+(define-module (gnucash reports locale-specific taxtxf))
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
index 135633628f..8b5b2ac6c3 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -24,7 +24,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report reports))
+(define-module (gnucash reports))
 (use-modules (srfi srfi-13))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
@@ -42,8 +42,8 @@
 ;owner-report-create)
 
 (define report-dirs (list
-    '(gnucash report reports standard) ; base directory for standard reports included in gnucash
-    '(gnucash report reports example)  ; base directory for example reports included in gnucash
+    '(gnucash reports standard) ; base directory for standard reports included in gnucash
+    '(gnucash reports example)  ; base directory for example reports included in gnucash
 ))
 
 (report-module-loader report-dirs)
@@ -78,15 +78,15 @@
         0
         ))
 
-(use-modules (gnucash report reports standard payables))
+(use-modules (gnucash reports standard payables))
 (define (gnc:payables-report-create account title show-zeros?)
   (payables-report-create-internal account title show-zeros?))
 
-(use-modules (gnucash report reports standard receivables))
+(use-modules (gnucash reports standard receivables))
 (define (gnc:receivables-report-create account title show-zeros?)
   (receivables-report-create-internal account title show-zeros?))
 
-(use-modules (gnucash report reports standard owner-report))
+(use-modules (gnucash reports standard owner-report))
 (define (gnc:owner-report-create owner account)
   ; Figure out an account to use if nothing exists here.
   (if (null? account)
diff --git a/gnucash/report/reports/standard/account-piecharts.scm b/gnucash/report/reports/standard/account-piecharts.scm
index aeba46ca0a..d5a9589828 100644
--- a/gnucash/report/reports/standard/account-piecharts.scm
+++ b/gnucash/report/reports/standard/account-piecharts.scm
@@ -23,7 +23,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard account-piecharts))
+(define-module (gnucash reports standard account-piecharts))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/account-summary.scm b/gnucash/report/reports/standard/account-summary.scm
index f26dd3fadb..42ff587c70 100644
--- a/gnucash/report/reports/standard/account-summary.scm
+++ b/gnucash/report/reports/standard/account-summary.scm
@@ -48,7 +48,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard account-summary))
+(define-module (gnucash reports standard account-summary))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities)) 
diff --git a/gnucash/report/reports/standard/advanced-portfolio.scm b/gnucash/report/reports/standard/advanced-portfolio.scm
index 9b4b372487..4e144fb13c 100644
--- a/gnucash/report/reports/standard/advanced-portfolio.scm
+++ b/gnucash/report/reports/standard/advanced-portfolio.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard advanced-portfolio))
+(define-module (gnucash reports standard advanced-portfolio))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/balance-forecast.scm b/gnucash/report/reports/standard/balance-forecast.scm
index 634524defe..d796bd15df 100644
--- a/gnucash/report/reports/standard/balance-forecast.scm
+++ b/gnucash/report/reports/standard/balance-forecast.scm
@@ -23,7 +23,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard balance-forecast))
+(define-module (gnucash reports standard balance-forecast))
 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/balance-sheet.scm b/gnucash/report/reports/standard/balance-sheet.scm
index 9e4708150a..bfbb0499e3 100644
--- a/gnucash/report/reports/standard/balance-sheet.scm
+++ b/gnucash/report/reports/standard/balance-sheet.scm
@@ -62,7 +62,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard balance-sheet))
+(define-module (gnucash reports standard balance-sheet))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/balsheet-eg.scm b/gnucash/report/reports/standard/balsheet-eg.scm
index 6a18c7f33c..be285d5f36 100644
--- a/gnucash/report/reports/standard/balsheet-eg.scm
+++ b/gnucash/report/reports/standard/balsheet-eg.scm
@@ -31,7 +31,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard balsheet-eg))
+(define-module (gnucash reports standard balsheet-eg))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index 64514b0383..d8deceacd4 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard balsheet-pnl))
+(define-module (gnucash reports standard balsheet-pnl))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/budget-balance-sheet.scm b/gnucash/report/reports/standard/budget-balance-sheet.scm
index 5aa05ecf66..87e74d5c37 100644
--- a/gnucash/report/reports/standard/budget-balance-sheet.scm
+++ b/gnucash/report/reports/standard/budget-balance-sheet.scm
@@ -28,7 +28,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard budget-balance-sheet))
+(define-module (gnucash reports standard budget-balance-sheet))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/budget-barchart.scm b/gnucash/report/reports/standard/budget-barchart.scm
index 0eb1d2c3c6..5f33e40462 100644
--- a/gnucash/report/reports/standard/budget-barchart.scm
+++ b/gnucash/report/reports/standard/budget-barchart.scm
@@ -24,7 +24,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard budget-barchart))
+(define-module (gnucash reports standard budget-barchart))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities)) 
diff --git a/gnucash/report/reports/standard/budget-flow.scm b/gnucash/report/reports/standard/budget-flow.scm
index 1dd4e3ded2..2d794a1231 100644
--- a/gnucash/report/reports/standard/budget-flow.scm
+++ b/gnucash/report/reports/standard/budget-flow.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard budget-flow))
+(define-module (gnucash reports standard budget-flow))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/budget-income-statement.scm b/gnucash/report/reports/standard/budget-income-statement.scm
index 01f00c186f..eb3dc41cca 100644
--- a/gnucash/report/reports/standard/budget-income-statement.scm
+++ b/gnucash/report/reports/standard/budget-income-statement.scm
@@ -40,7 +40,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard budget-income-statement))
+(define-module (gnucash reports standard budget-income-statement))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/budget.scm b/gnucash/report/reports/standard/budget.scm
index 495b7ae2a2..4df9715047 100644
--- a/gnucash/report/reports/standard/budget.scm
+++ b/gnucash/report/reports/standard/budget.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard budget))
+(define-module (gnucash reports standard budget))
 
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/cash-flow.scm b/gnucash/report/reports/standard/cash-flow.scm
index fc13aa83dc..7242ea1c97 100644
--- a/gnucash/report/reports/standard/cash-flow.scm
+++ b/gnucash/report/reports/standard/cash-flow.scm
@@ -27,7 +27,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard cash-flow))
+(define-module (gnucash reports standard cash-flow))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/cashflow-barchart.scm b/gnucash/report/reports/standard/cashflow-barchart.scm
index dfe1531af7..e288b1eab7 100644
--- a/gnucash/report/reports/standard/cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/cashflow-barchart.scm
@@ -27,13 +27,13 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard cashflow-barchart))
+(define-module (gnucash reports standard cashflow-barchart))
 
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 (use-modules (gnucash engine))
-(use-modules (gnucash report reports standard cash-flow))
+(use-modules (gnucash reports standard cash-flow))
 
 (gnc:module-load "gnucash/report" 0)
 
diff --git a/gnucash/report/reports/standard/category-barchart.scm b/gnucash/report/reports/standard/category-barchart.scm
index f7fe644c5e..5036b902ab 100644
--- a/gnucash/report/reports/standard/category-barchart.scm
+++ b/gnucash/report/reports/standard/category-barchart.scm
@@ -23,7 +23,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; depends must be outside module scope -- and should eventually go away.
-(define-module (gnucash report reports standard category-barchart))
+(define-module (gnucash reports standard category-barchart))
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/customer-summary.scm b/gnucash/report/reports/standard/customer-summary.scm
index 22c2871c85..547f1f3673 100644
--- a/gnucash/report/reports/standard/customer-summary.scm
+++ b/gnucash/report/reports/standard/customer-summary.scm
@@ -26,7 +26,7 @@
 ;; not only print a summary for one single owner (here: only
 ;; customers), but instead a table showing all customers.
 
-(define-module (gnucash report reports standard customer-summary))
+(define-module (gnucash reports standard customer-summary))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/dashboard.scm b/gnucash/report/reports/standard/dashboard.scm
index e34f38ca77..365b9e0178 100644
--- a/gnucash/report/reports/standard/dashboard.scm
+++ b/gnucash/report/reports/standard/dashboard.scm
@@ -22,7 +22,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard dashboard))
+(define-module (gnucash reports standard dashboard))
 (export gnc:make-dashboard)
 
 (use-modules (gnucash utilities))
diff --git a/gnucash/report/reports/standard/equity-statement.scm b/gnucash/report/reports/standard/equity-statement.scm
index 47e1d622f2..aa33287a70 100644
--- a/gnucash/report/reports/standard/equity-statement.scm
+++ b/gnucash/report/reports/standard/equity-statement.scm
@@ -45,7 +45,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard equity-statement))
+(define-module (gnucash reports standard equity-statement))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/general-journal.scm b/gnucash/report/reports/standard/general-journal.scm
index e7efd5d734..fad6e6ca9e 100644
--- a/gnucash/report/reports/standard/general-journal.scm
+++ b/gnucash/report/reports/standard/general-journal.scm
@@ -26,7 +26,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard general-journal))
+(define-module (gnucash reports standard general-journal))
 (export gnc:make-general-journal-report)
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/general-ledger.scm b/gnucash/report/reports/standard/general-ledger.scm
index ec79f9e076..6806676248 100644
--- a/gnucash/report/reports/standard/general-ledger.scm
+++ b/gnucash/report/reports/standard/general-ledger.scm
@@ -29,7 +29,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard general-ledger))
+(define-module (gnucash reports standard general-ledger))
 (export gnc:make-general-ledger-report)
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm
index 75d9b96ae6..900304add8 100644
--- a/gnucash/report/reports/standard/income-gst-statement.scm
+++ b/gnucash/report/reports/standard/income-gst-statement.scm
@@ -25,7 +25,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard income-gst-statement))
+(define-module (gnucash reports standard income-gst-statement))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/income-statement.scm b/gnucash/report/reports/standard/income-statement.scm
index 704bab8fc4..68e2e8ca6a 100644
--- a/gnucash/report/reports/standard/income-statement.scm
+++ b/gnucash/report/reports/standard/income-statement.scm
@@ -41,7 +41,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard income-statement))
+(define-module (gnucash reports standard income-statement))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/invoice.scm b/gnucash/report/reports/standard/invoice.scm
index ea3fa108ba..4e6516a3b0 100644
--- a/gnucash/report/reports/standard/invoice.scm
+++ b/gnucash/report/reports/standard/invoice.scm
@@ -22,7 +22,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 
-(define-module (gnucash report reports standard invoice))
+(define-module (gnucash reports standard invoice))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/job-report.scm b/gnucash/report/reports/standard/job-report.scm
index b8dad6f8e4..cc2d54b0b5 100644
--- a/gnucash/report/reports/standard/job-report.scm
+++ b/gnucash/report/reports/standard/job-report.scm
@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 
-(define-module (gnucash report reports standard job-report))
+(define-module (gnucash reports standard job-report))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/net-charts.scm b/gnucash/report/reports/standard/net-charts.scm
index a57f7a3408..4efdadbf00 100644
--- a/gnucash/report/reports/standard/net-charts.scm
+++ b/gnucash/report/reports/standard/net-charts.scm
@@ -26,7 +26,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard net-charts))
+(define-module (gnucash reports standard net-charts))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities)) 
diff --git a/gnucash/report/reports/standard/owner-report.scm b/gnucash/report/reports/standard/owner-report.scm
index 072da64af0..c9f7f66134 100644
--- a/gnucash/report/reports/standard/owner-report.scm
+++ b/gnucash/report/reports/standard/owner-report.scm
@@ -25,7 +25,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 
-(define-module (gnucash report reports standard owner-report))
+(define-module (gnucash reports standard owner-report))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/payables.scm b/gnucash/report/reports/standard/payables.scm
index 16818262cf..d800945a3b 100644
--- a/gnucash/report/reports/standard/payables.scm
+++ b/gnucash/report/reports/standard/payables.scm
@@ -23,7 +23,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard payables))
+(define-module (gnucash reports standard payables))
 
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
@@ -31,7 +31,7 @@
 
 (gnc:module-load "gnucash/report" 0)
 
-(use-modules (gnucash report reports aging))
+(use-modules (gnucash reports aging))
 
 (define acc-page gnc:pagename-general)
 (define this-acc (N_ "Payable Account"))
diff --git a/gnucash/report/reports/standard/portfolio.scm b/gnucash/report/reports/standard/portfolio.scm
index 16e2bea217..7ad5ec6b4c 100644
--- a/gnucash/report/reports/standard/portfolio.scm
+++ b/gnucash/report/reports/standard/portfolio.scm
@@ -21,7 +21,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard portfolio))
+(define-module (gnucash reports standard portfolio))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/price-scatter.scm b/gnucash/report/reports/standard/price-scatter.scm
index d2a0846ae0..24e066a1e2 100644
--- a/gnucash/report/reports/standard/price-scatter.scm
+++ b/gnucash/report/reports/standard/price-scatter.scm
@@ -22,7 +22,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard price-scatter))
+(define-module (gnucash reports standard price-scatter))
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index 560f3b1621..7abf85576b 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -14,7 +14,7 @@
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ;; 02111-1307 USA
 
-(define-module (gnucash report reports standard receipt))
+(define-module (gnucash reports standard receipt))
 
 (use-modules (ice-9 local-eval))  ; for the-environment
 (use-modules (gnucash utilities))
diff --git a/gnucash/report/reports/standard/receivables.scm b/gnucash/report/reports/standard/receivables.scm
index 167c177f37..086e6ceb57 100644
--- a/gnucash/report/reports/standard/receivables.scm
+++ b/gnucash/report/reports/standard/receivables.scm
@@ -23,7 +23,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard receivables))
+(define-module (gnucash reports standard receivables))
 
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
@@ -31,7 +31,7 @@
 
 (gnc:module-load "gnucash/report" 0)
 
-(use-modules (gnucash report reports aging))
+(use-modules (gnucash reports aging))
 
 (define acc-page gnc:pagename-general)
 (define this-acc (N_ "Receivables Account"))
diff --git a/gnucash/report/reports/standard/reconcile-report.scm b/gnucash/report/reports/standard/reconcile-report.scm
index c05ae58d99..951484fedb 100644
--- a/gnucash/report/reports/standard/reconcile-report.scm
+++ b/gnucash/report/reports/standard/reconcile-report.scm
@@ -24,7 +24,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard reconcile-report))
+(define-module (gnucash reports standard reconcile-report))
 
 (use-modules (gnucash gettext))
 (use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/standard/register.scm b/gnucash/report/reports/standard/register.scm
index 0b8c984c76..bde2b320d7 100644
--- a/gnucash/report/reports/standard/register.scm
+++ b/gnucash/report/reports/standard/register.scm
@@ -20,7 +20,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report reports standard register))
+(define-module (gnucash reports standard register))
 
 (use-modules (gnucash utilities))
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/sx-summary.scm b/gnucash/report/reports/standard/sx-summary.scm
index 7156ed7d01..6929819292 100644
--- a/gnucash/report/reports/standard/sx-summary.scm
+++ b/gnucash/report/reports/standard/sx-summary.scm
@@ -31,7 +31,7 @@
 ;; periods. Apart from this, all display options are taken from
 ;; account-summary unchangedly.
 
-(define-module (gnucash report reports standard sx-summary))
+(define-module (gnucash reports standard sx-summary))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities))
diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
index aec4209b01..b4f80b80c1 100644
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -22,7 +22,7 @@
 ; - specify a different module name below (eg mytaxinvoice)
 ; - refer to it from .gnucash/config.user
 ; (see https://wiki.gnucash.org/wiki/Custom_Reports )
-(define-module (gnucash report reports standard taxinvoice))
+(define-module (gnucash reports standard taxinvoice))
 
 (use-modules (ice-9 local-eval))  ; for the-environment
 (use-modules (gnucash utilities))
diff --git a/gnucash/report/reports/standard/test/test-average-balance.scm b/gnucash/report/reports/standard/test/test-average-balance.scm
index a23793181b..cb27326fc9 100644
--- a/gnucash/report/reports/standard/test/test-average-balance.scm
+++ b/gnucash/report/reports/standard/test/test-average-balance.scm
@@ -2,9 +2,9 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports example average-balance))
+(use-modules (gnucash reports example average-balance))
 (use-modules (gnucash report))
-(use-modules (gnucash report reports standard budget))
+(use-modules (gnucash reports standard budget))
 (use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (tests srfi64-extras))
diff --git a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
index 661b2b258b..c6941ec64c 100644
--- a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
@@ -1,8 +1,8 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard balance-sheet))
-(use-modules (gnucash report reports standard income-statement))
+(use-modules (gnucash reports standard balance-sheet))
+(use-modules (gnucash reports standard income-statement))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
diff --git a/gnucash/report/reports/standard/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm
index 50e2d60eb6..5e9252ccbf 100644
--- a/gnucash/report/reports/standard/test/test-budget.scm
+++ b/gnucash/report/reports/standard/test/test-budget.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash report reports standard budget))
+(use-modules (gnucash reports standard budget))
 (use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (tests test-engine-extras))
diff --git a/gnucash/report/reports/standard/test/test-cash-flow.scm b/gnucash/report/reports/standard/test/test-cash-flow.scm
index 68a3c43f4f..291b4f4cee 100644
--- a/gnucash/report/reports/standard/test/test-cash-flow.scm
+++ b/gnucash/report/reports/standard/test/test-cash-flow.scm
@@ -3,7 +3,7 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard cash-flow))
+(use-modules (gnucash reports standard cash-flow))
 (use-modules (gnucash report))
 
 (define (run-test)
diff --git a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
index 9d07250184..26ad552353 100644
--- a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
@@ -28,7 +28,7 @@
 (use-modules (tests srfi64-extras))
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report reports standard cashflow-barchart))
+(use-modules (gnucash reports standard cashflow-barchart))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm
index 01cff66b71..ec963f0252 100644
--- a/gnucash/report/reports/standard/test/test-charts.scm
+++ b/gnucash/report/reports/standard/test/test-charts.scm
@@ -1,12 +1,12 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard category-barchart))
-(use-modules (gnucash report reports standard net-charts))
-(use-modules (gnucash report reports standard account-piecharts))
-(use-modules (gnucash report reports standard cashflow-barchart))
-(use-modules (gnucash report reports standard price-scatter))
-(use-modules (gnucash report reports example daily-reports))
+(use-modules (gnucash reports standard category-barchart))
+(use-modules (gnucash reports standard net-charts))
+(use-modules (gnucash reports standard account-piecharts))
+(use-modules (gnucash reports standard cashflow-barchart))
+(use-modules (gnucash reports standard price-scatter))
+(use-modules (gnucash reports example daily-reports))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
diff --git a/gnucash/report/reports/standard/test/test-income-gst.scm b/gnucash/report/reports/standard/test/test-income-gst.scm
index 90fa189207..faccdfb302 100644
--- a/gnucash/report/reports/standard/test/test-income-gst.scm
+++ b/gnucash/report/reports/standard/test/test-income-gst.scm
@@ -1,7 +1,7 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard income-gst-statement))
+(use-modules (gnucash reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
diff --git a/gnucash/report/reports/standard/test/test-invoice.scm b/gnucash/report/reports/standard/test/test-invoice.scm
index d107419066..f5a5ac6997 100644
--- a/gnucash/report/reports/standard/test/test-invoice.scm
+++ b/gnucash/report/reports/standard/test/test-invoice.scm
@@ -1,7 +1,7 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard invoice))
+(use-modules (gnucash reports standard invoice))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
diff --git a/gnucash/report/reports/standard/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm
index e7c76c42ae..864a727101 100644
--- a/gnucash/report/reports/standard/test/test-register.scm
+++ b/gnucash/report/reports/standard/test/test-register.scm
@@ -35,7 +35,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash report reports standard register))
+(use-modules (gnucash reports standard register))
 (use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (tests test-engine-extras))
diff --git a/gnucash/report/reports/standard/test/test-standard-category-report.scm b/gnucash/report/reports/standard/test/test-standard-category-report.scm
index ead8da8aa9..13cdee7558 100644
--- a/gnucash/report/reports/standard/test/test-standard-category-report.scm
+++ b/gnucash/report/reports/standard/test/test-standard-category-report.scm
@@ -35,9 +35,9 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash report reports standard net-charts))
+(use-modules (gnucash reports standard net-charts))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report reports standard category-barchart))
+(use-modules (gnucash reports standard category-barchart))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (tests test-engine-extras))
 
diff --git a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
index b9aac203a2..bed5e71174 100644
--- a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
@@ -27,7 +27,7 @@
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report reports standard net-charts))
+(use-modules (gnucash reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")
diff --git a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
index fda989f444..ca94e85d4c 100644
--- a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
@@ -27,7 +27,7 @@
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report reports standard net-charts))
+(use-modules (gnucash reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")
diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm
index 45c4b43ff4..7e73076ed9 100644
--- a/gnucash/report/reports/standard/test/test-stress-options.scm
+++ b/gnucash/report/reports/standard/test/test-stress-options.scm
@@ -4,9 +4,9 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard view-column))
+(use-modules (gnucash reports standard view-column))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
-(use-modules (gnucash report reports standard taxinvoice))
+(use-modules (gnucash reports standard taxinvoice))
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
diff --git a/gnucash/report/reports/standard/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm
index ebcb5cc6bd..c91878b2d6 100644
--- a/gnucash/report/reports/standard/test/test-transaction.scm
+++ b/gnucash/report/reports/standard/test/test-transaction.scm
@@ -1,8 +1,8 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report reports standard transaction))
-(use-modules (gnucash report reports standard reconcile-report))
+(use-modules (gnucash reports standard transaction))
+(use-modules (gnucash reports standard reconcile-report))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (gnucash report))
 (use-modules (tests test-report-extras))
diff --git a/gnucash/report/reports/standard/transaction.scm b/gnucash/report/reports/standard/transaction.scm
index fb0a28b563..25d33e2133 100644
--- a/gnucash/report/reports/standard/transaction.scm
+++ b/gnucash/report/reports/standard/transaction.scm
@@ -22,7 +22,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard transaction))
+(define-module (gnucash reports standard transaction))
 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/trial-balance.scm b/gnucash/report/reports/standard/trial-balance.scm
index b3c880f491..3ef212c9b2 100644
--- a/gnucash/report/reports/standard/trial-balance.scm
+++ b/gnucash/report/reports/standard/trial-balance.scm
@@ -50,7 +50,7 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports standard trial-balance))
+(define-module (gnucash reports standard trial-balance))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
diff --git a/gnucash/report/reports/standard/view-column.scm b/gnucash/report/reports/standard/view-column.scm
index 0ffe548c67..55c2d59225 100644
--- a/gnucash/report/reports/standard/view-column.scm
+++ b/gnucash/report/reports/standard/view-column.scm
@@ -26,7 +26,7 @@
 ;; edited in a special window.  Every view gets a stylesheet so we
 ;; don't have to worry about that here.
 
-(define-module (gnucash report reports standard view-column))
+(define-module (gnucash reports standard view-column))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash app-utils))
 (use-modules (gnucash gnc-module))
diff --git a/libgnucash/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
index f02d661413..eb362a4c26 100644
--- a/libgnucash/core-utils/gnc-path.c
+++ b/libgnucash/core-utils/gnc-path.c
@@ -171,7 +171,7 @@ gchar *gnc_path_get_accountsdir()
 }
 
 /** Returns the file path to the directory containing all guile scripts, usually
- * "$prefix/guile/site/2.2".
+ * "$prefix/guile/site/x.y".
  * This path is determined by querying guile for its sitedir and then
  * rebasing this to be relative to our own installation prefix.
  *
@@ -186,7 +186,7 @@ gchar *gnc_path_get_scmdir()
 }
 
 /** Returns the file path to the report directory, usually
- * "$prefix/share/gnucash/scm/gnucash/report".
+ * "$prefix/share/guile/site/x.y/gnucash/report".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_reportdir()
@@ -199,21 +199,21 @@ gchar *gnc_path_get_reportdir()
 }
 
 /** Returns the file path to the reports directory, usually
- * "$prefix/share/gnucash/scm/gnucash/report/reports".
+ * "$prefix/share/guile/site/x.y/gnucash/reports".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_reportsdir()
 {
-    gchar *reportdir = gnc_path_get_reportdir ();
-    gchar *result = g_build_filename (reportdir, "reports", NULL);
-    g_free (reportdir);
+    gchar *scmdir = gnc_path_get_scmdir ();
+    gchar *result = g_build_filename (scmdir, "gnucash", "reports", NULL);
+    g_free (scmdir);
     //printf("Returning reportsdir %s\n", result);
     return result;
 }
 
 /** Returns the file path to the standard
  * reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
+ * "$prefix/share/guile/site/x.y/gnucash/reports/standard".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_stdreportsdir()
diff --git a/libgnucash/core-utils/gnc-path.h b/libgnucash/core-utils/gnc-path.h
index ac65ea7727..cc133e9217 100644
--- a/libgnucash/core-utils/gnc-path.h
+++ b/libgnucash/core-utils/gnc-path.h
@@ -93,26 +93,26 @@ gchar *gnc_path_get_localedir(void);
 gchar *gnc_path_get_accountsdir(void);
 
 /** Returns the file path to the directory containing all guile scripts, usually
- * "$prefix/share/gnucash/scm".
+ * "$prefix/share/guile/site/x.y".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_scmdir(void);
 
 /** Returns the file path to the report directory, usually
- * "$prefix/share/gnucash/scm/gnucash/report".
+ * "$prefix/share/guile/site/x.y/gnucash/report".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_reportdir(void);
 
 /** Returns the file path to the reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/reports".
+ * "$prefix/share/guile/site/x.y/gnucash/reports".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_reportsdir(void);
 
 /** Returns the file path to the standard
  * reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
+ * "$prefix/share/guile/site/x.y/gnucash/reports/standard".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_stdreportsdir(void);