diff --git a/.gitignore b/.gitignore
index b13f1f21d9..b22d3ea740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,8 +173,8 @@ gnucash/register/register-gnome/test/test-link-module
 gnucash/report/business-reports/gnucash
 gnucash/report/locale-specific/us/gnucash
 gnucash/report/locale-specific/us/test/test-link-module
-gnucash/report/report-system/gnucash
-gnucash/report/report-system/test/test-link-module
+gnucash/report/gnucash
+gnucash/report/test/test-link-module
 gnucash/report/reports/gnucash
 gnucash/report/stylesheets/gnucash
 gnucash/report/utility-reports/gnucash
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index f9ca797bce..227c5faab0 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -66,7 +66,7 @@ endif (BUILDING_FROM_VCS)
 
 target_link_libraries (gnucash
    gncmod-ledger-core gnc-gnome gncmod-gnome-utils gncmod-app-utils
-   gncmod-engine gnc-module gnc-core-utils gncmod-report-system
+   gncmod-engine gnc-module gnc-core-utils gncmod-report
    ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 0a37e0471c..9e85879e6d 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -134,7 +134,7 @@ set (gnc_gnome_SOURCES
 set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
-target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-html gncmod-report-system
+target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-html gncmod-report
     gncmod-register-gnome gncmod-register-core gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
 
 target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
@@ -228,7 +228,7 @@ set(GUILE_DEPENDS
     scm-gnome-utils
     scm-gnc-module
     scm-scm
-    scm-report-system
+    scm-report
     scm-reports
 )
 
diff --git a/gnucash/gnome/report-menus.scm b/gnucash/gnome/report-menus.scm
index 2def1567d1..f4e313bb0b 100644
--- a/gnucash/gnome/report-menus.scm
+++ b/gnucash/gnome/report-menus.scm
@@ -37,7 +37,7 @@
 (use-modules (sw_gnome))
 
 (gnc:module-load "gnucash/gnome-utils" 0)
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (export gnc:report-menu-setup)
 (export gnc:add-report-template-menu-items)
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index f953319602..e6cb432e58 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -501,7 +501,7 @@ load_gnucash_modules()
         { "gnucash/import-export/aqbanking", 0, TRUE },
         { "gnucash/import-export/bi-import", 0, TRUE},
         { "gnucash/import-export/customer-import", 0, TRUE},
-        { "gnucash/report/report-system", 0, FALSE },
+        { "gnucash/report", 0, FALSE },
         { "gnucash/report/stylesheets", 0, FALSE },
         { "gnucash/report/locale-specific/us", 0, FALSE },
         { "gnucash/python", 0, TRUE },
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 5d5ca40dc1..9df673fd8c 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -1,10 +1,113 @@
 
 add_subdirectory(jqplot)
 add_subdirectory(locale-specific)
-add_subdirectory(report-system)
 add_subdirectory(reports)
 add_subdirectory(stylesheets)
+add_subdirectory(test)
 
-set_local_dist(report_DIST_local CMakeLists.txt )
-set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST} ${report_system_DIST}
-                ${reports_DIST} ${stylesheets_DIST} PARENT_SCOPE)
+set (report_HEADERS
+  gnc-report.h
+)
+
+# Command to generate the swig-report.c wrapper file
+gnc_add_swig_guile_command (swig-report-c
+    SWIG_REPORT_C swig-report.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/report.i ${report_HEADERS}
+)
+
+set (report_SOURCES
+  gncmod-report.c
+  gnc-report.c
+)
+
+add_library (gncmod-report
+  ${report_SOURCES}
+  ${report_HEADERS}
+  ${SWIG_REPORT_C}
+)
+
+target_compile_definitions(gncmod-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
+
+target_link_libraries(gncmod-report gnc-module gncmod-app-utils ${GTK3_LDFLAGS} ${GUILE_LDFLAGS})
+
+target_include_directories (gncmod-report
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK3_INCLUDE_DIRS}
+)
+
+
+if (APPLE)
+  set_target_properties (gncmod-report PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+endif()
+
+install(TARGETS gncmod-report
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+install(FILES ${report_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
+
+# Scheme
+
+set (report_SCHEME
+    report.scm
+    eguile-gnc.scm
+    eguile-utilities.scm
+    eguile-html-utilities.scm
+)
+
+set (report_SCHEME_2
+    commodity-utilities.scm
+    html-acct-table.scm
+    html-chart.scm
+    html-barchart.scm
+    html-document.scm
+    html-fonts.scm
+    html-piechart.scm
+    html-scatter.scm
+    html-linechart.scm
+    html-style-info.scm
+    html-style-sheet.scm
+    html-anytag.scm
+    html-table.scm
+    html-text.scm
+    html-utilities.scm
+    options-utilities.scm
+    report-core.scm
+    report-utilities.scm
+    report-register-hooks.scm
+    trep-engine.scm
+)
+
+set(GUILE_DEPENDS
+  gncmod-html
+  scm-gnome-utils
+  gncmod-report
+  scm-app-utils
+  scm-scm
+  scm-gnc-module
+  )
+
+gnc_add_scheme_targets(scm-report-1
+  "${report_SCHEME}"
+  "gnucash/report"
+  "${GUILE_DEPENDS}"
+  FALSE
+)
+
+gnc_add_scheme_targets(scm-report-2
+  "${report_SCHEME_2}"
+  "gnucash/report"
+  scm-report-1
+  TRUE
+)
+
+add_custom_target(scm-report ALL DEPENDS scm-report-2)
+
+set_local_dist(report_DIST_local CMakeLists.txt
+  report.i
+  ${report_HEADERS} ${report_SOURCES}
+  ${report_SCHEME} ${report_SCHEME_1}
+  ${report_SCHEME_2})
+
+set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST}
+                ${reports_DIST} ${stylesheets_DIST} ${test_report_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/report-system/commodity-utilities.scm b/gnucash/report/commodity-utilities.scm
similarity index 100%
rename from gnucash/report/report-system/commodity-utilities.scm
rename to gnucash/report/commodity-utilities.scm
diff --git a/gnucash/report/report-system/doc/report-html.txt b/gnucash/report/doc/report-html.txt
similarity index 100%
rename from gnucash/report/report-system/doc/report-html.txt
rename to gnucash/report/doc/report-html.txt
diff --git a/gnucash/report/report-system/eguile-gnc.scm b/gnucash/report/eguile-gnc.scm
similarity index 100%
rename from gnucash/report/report-system/eguile-gnc.scm
rename to gnucash/report/eguile-gnc.scm
diff --git a/gnucash/report/report-system/eguile-html-utilities.scm b/gnucash/report/eguile-html-utilities.scm
similarity index 99%
rename from gnucash/report/report-system/eguile-html-utilities.scm
rename to gnucash/report/eguile-html-utilities.scm
index 8a7030bab1..3f4a44d199 100644
--- a/gnucash/report/report-system/eguile-html-utilities.scm
+++ b/gnucash/report/eguile-html-utilities.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/app-utils" 0)
 
 (use-modules (ice-9 regex))  ; for regular expressions
diff --git a/gnucash/report/report-system/eguile-utilities.scm b/gnucash/report/eguile-utilities.scm
similarity index 98%
rename from gnucash/report/report-system/eguile-utilities.scm
rename to gnucash/report/eguile-utilities.scm
index 25a91d8603..e18dfdbaf3 100644
--- a/gnucash/report/report-system/eguile-utilities.scm
+++ b/gnucash/report/eguile-utilities.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/app-utils" 0)
 
 
diff --git a/gnucash/report/report-system/gnc-report.c b/gnucash/report/gnc-report.c
similarity index 100%
rename from gnucash/report/report-system/gnc-report.c
rename to gnucash/report/gnc-report.c
diff --git a/gnucash/report/report-system/gnc-report.h b/gnucash/report/gnc-report.h
similarity index 100%
rename from gnucash/report/report-system/gnc-report.h
rename to gnucash/report/gnc-report.h
diff --git a/gnucash/report/report-system/gncmod-report-system.c b/gnucash/report/gncmod-report.c
similarity index 77%
rename from gnucash/report/report-system/gncmod-report-system.c
rename to gnucash/report/gncmod-report.c
index bd6d3e792a..011fd60172 100644
--- a/gnucash/report/report-system/gncmod-report-system.c
+++ b/gnucash/report/gncmod-report.c
@@ -1,5 +1,5 @@
 /*********************************************************************
- * gncmod-report-system.c
+ * gncmod-report.c
  * module definition/initialization for the report infrastructure
  *
  * Copyright (c) 2001 Linux Developers Group, Inc.
@@ -32,33 +32,33 @@
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
-GNC_MODULE_API_DECL(libgncmod_report_system)
+GNC_MODULE_API_DECL(libgncmod_report)
 
 /* version of the gnc module system interface we require */
-int libgncmod_report_system_gnc_module_system_interface = 0;
+int libgncmod_report_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_report_system_gnc_module_current  = 0;
-int libgncmod_report_system_gnc_module_revision = 0;
-int libgncmod_report_system_gnc_module_age      = 0;
+int libgncmod_report_gnc_module_current  = 0;
+int libgncmod_report_gnc_module_revision = 0;
+int libgncmod_report_gnc_module_age      = 0;
 
 
 char *
-libgncmod_report_system_gnc_module_path(void)
+libgncmod_report_gnc_module_path(void)
 {
-    return g_strdup("gnucash/report/report-system");
+    return g_strdup("gnucash/report");
 }
 
 char *
-libgncmod_report_system_gnc_module_description(void)
+libgncmod_report_gnc_module_description(void)
 {
     return g_strdup("Core components of GnuCash report generation system");
 }
 
-extern SCM scm_init_sw_report_system_module(void);
+extern SCM scm_init_sw_report_module(void);
 
 int
-libgncmod_report_system_gnc_module_init(int refcount)
+libgncmod_report_gnc_module_init(int refcount)
 {
     /* load the engine (we depend on it) */
     if (!gnc_module_load("gnucash/engine", 0))
@@ -70,9 +70,9 @@ libgncmod_report_system_gnc_module_init(int refcount)
     {
         return FALSE;
     }
-    scm_init_sw_report_system_module();
+    scm_init_sw_report_module();
 
-    scm_c_eval_string("(use-modules (gnucash report report-system))");
+    scm_c_eval_string("(use-modules (gnucash report report))");
 
     /* if this is the first time the module's being loaded, initialize
      * the relative date system */
@@ -85,7 +85,7 @@ libgncmod_report_system_gnc_module_init(int refcount)
 }
 
 int
-libgncmod_report_system_gnc_module_end(int refcount)
+libgncmod_report_gnc_module_end(int refcount)
 {
     return TRUE;
 }
diff --git a/gnucash/report/report-system/html-acct-table.scm b/gnucash/report/html-acct-table.scm
similarity index 100%
rename from gnucash/report/report-system/html-acct-table.scm
rename to gnucash/report/html-acct-table.scm
diff --git a/gnucash/report/report-system/html-anytag.scm b/gnucash/report/html-anytag.scm
similarity index 100%
rename from gnucash/report/report-system/html-anytag.scm
rename to gnucash/report/html-anytag.scm
diff --git a/gnucash/report/report-system/html-barchart.scm b/gnucash/report/html-barchart.scm
similarity index 99%
rename from gnucash/report/report-system/html-barchart.scm
rename to gnucash/report/html-barchart.scm
index 8b3f847366..a2e3a592ed 100644
--- a/gnucash/report/report-system/html-barchart.scm
+++ b/gnucash/report/html-barchart.scm
@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-barchart>
   (make-record-type "<html-barchart>"
diff --git a/gnucash/report/report-system/html-chart.scm b/gnucash/report/html-chart.scm
similarity index 100%
rename from gnucash/report/report-system/html-chart.scm
rename to gnucash/report/html-chart.scm
diff --git a/gnucash/report/report-system/html-document.scm b/gnucash/report/html-document.scm
similarity index 100%
rename from gnucash/report/report-system/html-document.scm
rename to gnucash/report/html-document.scm
diff --git a/gnucash/report/report-system/html-fonts.scm b/gnucash/report/html-fonts.scm
similarity index 100%
rename from gnucash/report/report-system/html-fonts.scm
rename to gnucash/report/html-fonts.scm
diff --git a/gnucash/report/report-system/html-linechart.scm b/gnucash/report/html-linechart.scm
similarity index 99%
rename from gnucash/report/report-system/html-linechart.scm
rename to gnucash/report/html-linechart.scm
index b9778a6ea4..fda8cf612d 100644
--- a/gnucash/report/report-system/html-linechart.scm
+++ b/gnucash/report/html-linechart.scm
@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-linechart>
   (make-record-type "<html-linechart>"
diff --git a/gnucash/report/report-system/html-piechart.scm b/gnucash/report/html-piechart.scm
similarity index 99%
rename from gnucash/report/report-system/html-piechart.scm
rename to gnucash/report/html-piechart.scm
index de705f5ea0..4df031fd02 100644
--- a/gnucash/report/report-system/html-piechart.scm
+++ b/gnucash/report/html-piechart.scm
@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-piechart>
   (make-record-type "<html-piechart>"
diff --git a/gnucash/report/report-system/html-scatter.scm b/gnucash/report/html-scatter.scm
similarity index 99%
rename from gnucash/report/report-system/html-scatter.scm
rename to gnucash/report/html-scatter.scm
index 67647b3446..98116f4000 100644
--- a/gnucash/report/report-system/html-scatter.scm
+++ b/gnucash/report/html-scatter.scm
@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-scatter>
   (make-record-type "<html-scatter>"
diff --git a/gnucash/report/report-system/html-style-info.scm b/gnucash/report/html-style-info.scm
similarity index 100%
rename from gnucash/report/report-system/html-style-info.scm
rename to gnucash/report/html-style-info.scm
diff --git a/gnucash/report/report-system/html-style-sheet.scm b/gnucash/report/html-style-sheet.scm
similarity index 100%
rename from gnucash/report/report-system/html-style-sheet.scm
rename to gnucash/report/html-style-sheet.scm
diff --git a/gnucash/report/report-system/html-table.scm b/gnucash/report/html-table.scm
similarity index 100%
rename from gnucash/report/report-system/html-table.scm
rename to gnucash/report/html-table.scm
diff --git a/gnucash/report/report-system/html-text.scm b/gnucash/report/html-text.scm
similarity index 100%
rename from gnucash/report/report-system/html-text.scm
rename to gnucash/report/html-text.scm
diff --git a/gnucash/report/report-system/html-utilities.scm b/gnucash/report/html-utilities.scm
similarity index 100%
rename from gnucash/report/report-system/html-utilities.scm
rename to gnucash/report/html-utilities.scm
diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt
index 51b03a4da3..a132af4380 100644
--- a/gnucash/report/locale-specific/us/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/CMakeLists.txt
@@ -38,7 +38,7 @@ set(GUILE_DEPENDS
   scm-scm
   scm-test-core
   scm-tax-us
-  scm-report-system
+  scm-report
   scm-gnome-utils
   )
 
diff --git a/gnucash/report/locale-specific/us/gncmod-locale-reports-us.c b/gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
index 41cc49bd26..c9cb7f97f5 100644
--- a/gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
+++ b/gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
@@ -98,7 +98,7 @@ libgncmod_locale_reports_us_gnc_module_init(int refcount)
     }
 
     /* load the report system */
-    if (!gnc_module_load("gnucash/report/report-system", 0))
+    if (!gnc_module_load("gnucash/report", 0))
     {
         return FALSE;
     }
diff --git a/gnucash/report/locale-specific/us/taxtxf-de_DE.scm b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
index 207f7cb37e..7b5759fe57 100644
--- a/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
@@ -74,7 +74,7 @@
 
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/tax/de_DE" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/engine" 0)
 
 (define reportname (N_ "Tax Report / TXF Export"))
@@ -119,7 +119,7 @@
            (<= t end-date)))))
 
 ;; This is nearly identical to, and could be shared with
-;; display-report-list-item in report.scm. This adds warn-msg parameter
+;; display-report-list-item in report-impl.scm. This adds warn-msg parameter
 (define (gnc:display-report-list-item item port warn-msg)
   (cond
    ((string? item) (display item port))
diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
index d34d7afae3..d81998d8a2 100644
--- a/gnucash/report/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/locale-specific/us/taxtxf.scm
@@ -113,7 +113,7 @@
 
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/tax/us" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Tax Schedule Report/TXF Export"))
 
@@ -151,7 +151,7 @@
            (<= t64 end-date-t64)))))
 
 ;; This is nearly identical to, and could be shared with
-;; display-report-list-item in report.scm. This adds warn-msg parameter
+;; display-report-list-item in report-impl.scm. This adds warn-msg parameter
 (define (gnc:display-report-list-item item port warn-msg)
   (cond
    ((string? item) (display item port))
diff --git a/gnucash/report/report-system/options-utilities.scm b/gnucash/report/options-utilities.scm
similarity index 100%
rename from gnucash/report/report-system/options-utilities.scm
rename to gnucash/report/options-utilities.scm
diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-core.scm
similarity index 99%
rename from gnucash/report/report-system/report.scm
rename to gnucash/report/report-core.scm
index b9cba07052..99e6eb2d07 100644
--- a/gnucash/report/report-system/report.scm
+++ b/gnucash/report/report-core.scm
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; report.scm : structures/utilities for representing reports 
+;; report-impl.scm : structures/utilities for representing reports
 ;; Copyright 2000 Bill Gribble <grib@gnumatic.com>
 ;;
 ;; This program is free software; you can redistribute it and/or    
@@ -24,8 +24,8 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash gettext))
 (eval-when (compile load eval expand)
-  (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+  (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
 ;; Terminology in this file:
 ;; report-template: a report definition of some form. This can be a report
@@ -94,11 +94,11 @@
 (define (gui-error str)
   (if (gnucash-ui-is-running)
       (gnc-error-dialog '() str)
-      (gnc:error "report.scm error: " str)))
+      (gnc:error "report-impl.scm error: " str)))
 (define (gui-warning str)
   (if (gnucash-ui-is-running)
       (gnc-warning-dialog '() str)
-      (gnc:warn "report.scm warning: " str)))
+      (gnc:warn "report-impl.scm warning: " str)))
 (define (gui-error-missing-template template-name)
   (gui-error
    (string-append
diff --git a/gnucash/report/report-system/report-register-hooks.scm b/gnucash/report/report-register-hooks.scm
similarity index 100%
rename from gnucash/report/report-system/report-register-hooks.scm
rename to gnucash/report/report-register-hooks.scm
diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
deleted file mode 100644
index 293e1926ae..0000000000
--- a/gnucash/report/report-system/CMakeLists.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-add_subdirectory(test)
-
-set (report_system_HEADERS
-  gnc-report.h
-)
-
-# Command to generate the swig-report-system.c wrapper file
-gnc_add_swig_guile_command (swig-report-system-c
-    SWIG_REPORT_SYSTEM_C swig-report-system.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/report-system.i ${report_system_HEADERS}
-)
-
-set (report_system_SOURCES
-  gncmod-report-system.c
-  gnc-report.c
-)  
-
-add_library (gncmod-report-system
-  ${report_system_SOURCES}
-  ${report_system_HEADERS}
-  ${SWIG_REPORT_SYSTEM_C}
-)
-
-target_compile_definitions(gncmod-report-system PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
-
-target_link_libraries(gncmod-report-system gnc-module gncmod-app-utils ${GTK3_LDFLAGS} ${GUILE_LDFLAGS})
-
-target_include_directories (gncmod-report-system
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK3_INCLUDE_DIRS}
-)
-
-
-if (APPLE)
-  set_target_properties (gncmod-report-system PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-endif()
-
-install(TARGETS gncmod-report-system
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-install(FILES ${report_system_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-
-# Scheme
-
-set (report_system_SCHEME
-    report-system.scm
-    eguile-gnc.scm
-    eguile-utilities.scm
-    eguile-html-utilities.scm
-)
-
-set (report_system_SCHEME_2
-    commodity-utilities.scm
-    html-acct-table.scm
-    html-chart.scm
-    html-barchart.scm
-    html-document.scm
-    html-fonts.scm
-    html-piechart.scm
-    html-scatter.scm
-    html-linechart.scm
-    html-style-info.scm
-    html-style-sheet.scm
-    html-anytag.scm
-    html-table.scm
-    html-text.scm
-    html-utilities.scm
-    options-utilities.scm
-    report-utilities.scm
-    report-register-hooks.scm
-    report.scm
-    trep-engine.scm
-)
-
-set(GUILE_DEPENDS
-  gncmod-html
-  scm-gnome-utils
-  gncmod-report-system
-  scm-app-utils
-  scm-scm
-  scm-gnc-module
-  )
-
-gnc_add_scheme_targets(scm-report-system-1
-  "${report_system_SCHEME}"
-  "gnucash/report"
-  "${GUILE_DEPENDS}"
-  FALSE
-)
-
-gnc_add_scheme_targets(scm-report-system-2
-  "${report_system_SCHEME_2}"
-  ""
-  scm-report-system-1
-  FALSE
-)
-
-add_custom_target(scm-report-system ALL DEPENDS scm-report-system-2)
-
-set_local_dist(report_system_DIST_local CMakeLists.txt
-  report-system.i
-  ${report_system_HEADERS} ${report_system_SOURCES}
-  ${report_system_SCHEME} ${report_system_SCHEME_1}
-  ${report_system_SCHEME_2})
-
-set(report_system_DIST ${report_system_DIST_local} ${test_report_system_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
deleted file mode 100644
index b38527dc8d..0000000000
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-
-set(REPORT_SYSTEM_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
-  ${GUILE_INCLUDE_DIRS}
-)
-set(REPORT_SYSTEM_TEST_LIBS gnc-module)
-
-gnc_add_test_with_guile(test-link-module-report-system test-link-module.c
-  REPORT_SYSTEM_TEST_INCLUDE_DIRS REPORT_SYSTEM_TEST_LIBS
-)
-
-set(scm_test_report_system_SOURCES
-  test-load-report-system-module.scm
-  test-test-extras.scm
-)
-
-set (scm_test_report_system_with_srfi64_SOURCES
-  test-commodity-utils.scm
-  test-report-utilities.scm
-  test-html-utilities-srfi64.scm
-  test-html-fonts.scm
-  test-html-chart.scm
-  test-report-html.scm
-  test-report-system.scm
-  )
-
-set(GUILE_DEPENDS
-  scm-gnc-module
-  scm-app-utils
-  scm-core-utils
-  scm-gettext
-  scm-engine
-  scm-test-engine
-  scm-scm
-  scm-report-system
-  scm-test-report-system
-  )
-gnc_add_scheme_tests("${scm_test_report_system_SOURCES}")
-
-if (HAVE_SRFI64)
-  gnc_add_scheme_test_targets(scm-test-report-system-srfi64
-    "${scm_test_report_system_with_srfi64_SOURCES}"
-    "tests"
-    "${GUILE_DEPENDS};scm-srfi64-extras"
-    FALSE
-    )
-
-  gnc_add_scheme_tests ("${scm_test_report_system_with_srfi64_SOURCES}")
-endif (HAVE_SRFI64)
-
-gnc_add_scheme_test_targets(scm-test-report-system
-  "test-report-system-extras.scm"
-  "tests"
-  "${GUILE_DEPENDS}"
-  FALSE
-  )
-
-gnc_add_scheme_test_targets(scm-test-report-system-2
-  "${scm_test_report_system_SOURCES}"
-  "tests"
-  "scm-test-report-system"
-  FALSE
-)
-
-add_dependencies(check scm-test-report-system)
-set_dist_list(test_report_system_DIST
-  CMakeLists.txt
-  ${scm_test_report_system_with_srfi64_SOURCES}
-  ${scm_test_report_system_SOURCES}
-  test-report-system-extras.scm
-  test-link-module.c
-)
diff --git a/gnucash/report/report-system/report-utilities.scm b/gnucash/report/report-utilities.scm
similarity index 100%
rename from gnucash/report/report-system/report-utilities.scm
rename to gnucash/report/report-utilities.scm
diff --git a/gnucash/report/report-system/report-system.i b/gnucash/report/report.i
similarity index 95%
rename from gnucash/report/report-system/report-system.i
rename to gnucash/report/report.i
index 3034de0dea..e11655a3ca 100644
--- a/gnucash/report/report-system/report-system.i
+++ b/gnucash/report/report.i
@@ -18,7 +18,7 @@
  *                                                                  *
 \********************************************************************/
 
-%module sw_report_system
+%module sw_report
 %{
 /* Includes the header in the wrapper code */
 #include <config.h>
@@ -28,7 +28,7 @@
 %{
 #include "guile-mappings.h"
 
-SCM scm_init_sw_report_system_module (void);
+SCM scm_init_sw_report_module (void);
 %}
 #endif
 
@@ -41,4 +41,4 @@ gint gnc_report_add(SCM report);
 gchar* gnc_get_default_report_font_family();
 
 void gnc_saved_reports_backup (void);
-gboolean gnc_saved_reports_write_to_file (const gchar* report_def, gboolean overwrite);
\ No newline at end of file
+gboolean gnc_saved_reports_write_to_file (const gchar* report_def, gboolean overwrite);
diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report.scm
similarity index 96%
rename from gnucash/report/report-system/report-system.scm
rename to gnucash/report/report.scm
index ee122b4348..454006c096 100644
--- a/gnucash/report/report-system/report-system.scm
+++ b/gnucash/report/report.scm
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  report-system.scm
+;;  report.scm
 ;;  module definition for the report system code
 ;;
 ;;  Copyright (c) 2001 Linux Developers Group, Inc.
@@ -24,7 +24,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report report-system))
+(define-module (gnucash report report))
 (use-modules (gnucash utilities)) 
 (use-modules (ice-9 regex))
 (use-modules (srfi srfi-1))
@@ -122,7 +122,7 @@
 (export gnc:html-css-include)
 (export gnc:html-string-sanitize)
 
-;; report.scm
+;; report-core.scm
 (export gnc:menuname-reports)
 (export gnc:menuname-asset-liability)
 (export gnc:menuname-income-expense)
@@ -758,27 +758,27 @@
 (export gnc:lookup-register-report)
 
 
-(load-from-path "commodity-utilities")
-(load-from-path "html-chart")
-(load-from-path "html-barchart")
-(load-from-path "html-document")
-(load-from-path "html-piechart")
-(load-from-path "html-scatter")
-(load-from-path "html-linechart")
-(load-from-path "html-style-info")
-(load-from-path "html-fonts")
+(load-from-path "gnucash/report/commodity-utilities")
+(load-from-path "gnucash/report/html-chart")
+(load-from-path "gnucash/report/html-barchart")
+(load-from-path "gnucash/report/html-document")
+(load-from-path "gnucash/report/html-piechart")
+(load-from-path "gnucash/report/html-scatter")
+(load-from-path "gnucash/report/html-linechart")
+(load-from-path "gnucash/report/html-style-info")
+(load-from-path "gnucash/report/html-fonts")
 
-(load-from-path "html-style-sheet")
-(load-from-path "html-anytag")
-(load-from-path "html-table")
-(load-from-path "html-text")
-(load-from-path "html-acct-table")
-(load-from-path "html-utilities")
-(load-from-path "options-utilities")
-(load-from-path "report-utilities")
-(load-from-path "report-register-hooks")
-(load-from-path "report")
-(load-from-path "trep-engine")
+(load-from-path "gnucash/report/html-style-sheet")
+(load-from-path "gnucash/report/html-anytag")
+(load-from-path "gnucash/report/html-table")
+(load-from-path "gnucash/report/html-text")
+(load-from-path "gnucash/report/html-acct-table")
+(load-from-path "gnucash/report/html-utilities")
+(load-from-path "gnucash/report/options-utilities")
+(load-from-path "gnucash/report/report-utilities")
+(load-from-path "gnucash/report/report-register-hooks")
+(load-from-path "gnucash/report/report-core")
+(load-from-path "gnucash/report/trep-engine")
 
 ;; Report uuids used for the category barcharts
 
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index d7e81eb506..3d540cbe05 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -67,7 +67,7 @@ set(scm_rpts_GUILE_DEPENDS
   scm-gettext
   scm-scm
   scm-gnome-utils
-  scm-report-system
+  scm-report
   )
 
 set(scm_rpt_example_GUILE_DEPENDS
@@ -79,7 +79,7 @@ set(scm_rpt_example_GUILE_DEPENDS
   scm-scm
   scm-reports-example-links
   scm-gnome-utils
-  scm-report-system
+  scm-report
   )
 
 set(scm_rpt_std_GUILE_DEPENDS
diff --git a/gnucash/report/reports/aging.scm b/gnucash/report/reports/aging.scm
index fda00b905f..f73dc1be20 100644
--- a/gnucash/report/reports/aging.scm
+++ b/gnucash/report/reports/aging.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash report reports))
 
diff --git a/gnucash/report/reports/example/average-balance.scm b/gnucash/report/reports/example/average-balance.scm
index 70472e12be..0ea2cb3605 100644
--- a/gnucash/report/reports/example/average-balance.scm
+++ b/gnucash/report/reports/example/average-balance.scm
@@ -31,7 +31,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Average Balance"))
 
diff --git a/gnucash/report/reports/example/daily-reports.scm b/gnucash/report/reports/example/daily-reports.scm
index c15d3a84f0..18b90a09b7 100644
--- a/gnucash/report/reports/example/daily-reports.scm
+++ b/gnucash/report/reports/example/daily-reports.scm
@@ -32,7 +32,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define menuname-income (N_ "Income vs. Day of Week"))
 (define menuname-expense (N_ "Expenses vs. Day of Week"))
diff --git a/gnucash/report/reports/example/hello-world.scm b/gnucash/report/reports/example/hello-world.scm
index aec8fcdf4a..f5fa1b2dc1 100644
--- a/gnucash/report/reports/example/hello-world.scm
+++ b/gnucash/report/reports/example/hello-world.scm
@@ -30,7 +30,7 @@
 
 (debug-enable 'backtrace)
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0) ;for gnc-build-url
 
 ;; This function will generate a set of options that GnuCash
diff --git a/gnucash/report/reports/example/sample-graphs.scm b/gnucash/report/reports/example/sample-graphs.scm
index 357af0bf66..aea7df59fa 100644
--- a/gnucash/report/reports/example/sample-graphs.scm
+++ b/gnucash/report/reports/example/sample-graphs.scm
@@ -32,7 +32,7 @@
 ;; Use (_ string) to use a translation of this string if it exists.
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 ;; It's common to define frequently used strings once
diff --git a/gnucash/report/reports/example/welcome-to-gnucash.scm b/gnucash/report/reports/example/welcome-to-gnucash.scm
index 56ce389117..51790d755c 100644
--- a/gnucash/report/reports/example/welcome-to-gnucash.scm
+++ b/gnucash/report/reports/example/welcome-to-gnucash.scm
@@ -29,10 +29,10 @@
 (use-modules (gnucash gnc-module))
 (eval-when
       (compile load eval expand)
-      (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+      (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (options)
   (gnc:new-options))
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
index a96cbc5ecc..6ba1a7f4a6 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -28,7 +28,7 @@
 (use-modules (srfi srfi-13))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash utilities))
 
 (export gnc:register-report-create)
diff --git a/gnucash/report/reports/standard/account-piecharts.scm b/gnucash/report/reports/standard/account-piecharts.scm
index 4a2a362863..aeba46ca0a 100644
--- a/gnucash/report/reports/standard/account-piecharts.scm
+++ b/gnucash/report/reports/standard/account-piecharts.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define menuname-income (N_ "Income Piechart"))
 (define menuname-expense (N_ "Expense Piechart"))
diff --git a/gnucash/report/reports/standard/account-summary.scm b/gnucash/report/reports/standard/account-summary.scm
index 86ddb838d0..f26dd3fadb 100644
--- a/gnucash/report/reports/standard/account-summary.scm
+++ b/gnucash/report/reports/standard/account-summary.scm
@@ -55,7 +55,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; account summary report prints a table of account information,
 ;; optionally with clickable links to open the corresponding register
diff --git a/gnucash/report/reports/standard/advanced-portfolio.scm b/gnucash/report/reports/standard/advanced-portfolio.scm
index 8befe36a6f..9b4b372487 100644
--- a/gnucash/report/reports/standard/advanced-portfolio.scm
+++ b/gnucash/report/reports/standard/advanced-portfolio.scm
@@ -32,7 +32,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Advanced Portfolio"))
 
diff --git a/gnucash/report/reports/standard/balance-forecast.scm b/gnucash/report/reports/standard/balance-forecast.scm
index 4c46cf8bc6..634524defe 100644
--- a/gnucash/report/reports/standard/balance-forecast.scm
+++ b/gnucash/report/reports/standard/balance-forecast.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash gettext))
 (use-modules (srfi srfi-1))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ; Name definitions
 (define reportname           (N_ "Balance Forecast"))
diff --git a/gnucash/report/reports/standard/balance-sheet.scm b/gnucash/report/reports/standard/balance-sheet.scm
index 9ff740b428..9e4708150a 100644
--- a/gnucash/report/reports/standard/balance-sheet.scm
+++ b/gnucash/report/reports/standard/balance-sheet.scm
@@ -67,7 +67,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Balance Sheet"))
 
diff --git a/gnucash/report/reports/standard/balsheet-eg.scm b/gnucash/report/reports/standard/balsheet-eg.scm
index eac6509dd6..37e7f5b48f 100644
--- a/gnucash/report/reports/standard/balsheet-eg.scm
+++ b/gnucash/report/reports/standard/balsheet-eg.scm
@@ -42,7 +42,7 @@
 (use-modules (ice-9 local-eval))  ; for the-environment
 (use-modules (srfi srfi-13)) ; for extra string functions
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0)
 
 (define debugging? #f)
diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index c6d5ab3781..64514b0383 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -31,7 +31,7 @@
 (use-modules (gnucash gettext))
 (use-modules (srfi srfi-1))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define FOOTER-TEXT
   (gnc:make-html-text
diff --git a/gnucash/report/reports/standard/budget-balance-sheet.scm b/gnucash/report/reports/standard/budget-balance-sheet.scm
index 67c3632524..5aa05ecf66 100644
--- a/gnucash/report/reports/standard/budget-balance-sheet.scm
+++ b/gnucash/report/reports/standard/budget-balance-sheet.scm
@@ -33,7 +33,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Budget Balance Sheet"))
 
diff --git a/gnucash/report/reports/standard/budget-barchart.scm b/gnucash/report/reports/standard/budget-barchart.scm
index a1b6a4b04b..0eb1d2c3c6 100644
--- a/gnucash/report/reports/standard/budget-barchart.scm
+++ b/gnucash/report/reports/standard/budget-barchart.scm
@@ -31,7 +31,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname
   (N_ "Budget Chart"))
diff --git a/gnucash/report/reports/standard/budget-flow.scm b/gnucash/report/reports/standard/budget-flow.scm
index 3aa7d0315a..1dd4e3ded2 100644
--- a/gnucash/report/reports/standard/budget-flow.scm
+++ b/gnucash/report/reports/standard/budget-flow.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define reportname
diff --git a/gnucash/report/reports/standard/budget-income-statement.scm b/gnucash/report/reports/standard/budget-income-statement.scm
index 0153255366..01f00c186f 100644
--- a/gnucash/report/reports/standard/budget-income-statement.scm
+++ b/gnucash/report/reports/standard/budget-income-statement.scm
@@ -45,7 +45,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; define all option's names and help text so that they are properly
 ;; defined in *one* place.
diff --git a/gnucash/report/reports/standard/budget.scm b/gnucash/report/reports/standard/budget.scm
index eff00398b6..495b7ae2a2 100644
--- a/gnucash/report/reports/standard/budget.scm
+++ b/gnucash/report/reports/standard/budget.scm
@@ -35,7 +35,7 @@
 
 (use-modules (srfi srfi-1))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define reportname (N_ "Budget Report"))
diff --git a/gnucash/report/reports/standard/cash-flow.scm b/gnucash/report/reports/standard/cash-flow.scm
index 229da7d44f..fc13aa83dc 100644
--- a/gnucash/report/reports/standard/cash-flow.scm
+++ b/gnucash/report/reports/standard/cash-flow.scm
@@ -33,7 +33,7 @@
 (use-modules (gnucash gettext))
 (use-modules (gnucash engine))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (export cash-flow-calc-money-in-out)
diff --git a/gnucash/report/reports/standard/cashflow-barchart.scm b/gnucash/report/reports/standard/cashflow-barchart.scm
index bf401e974d..dfe1531af7 100644
--- a/gnucash/report/reports/standard/cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/cashflow-barchart.scm
@@ -35,7 +35,7 @@
 (use-modules (gnucash engine))
 (use-modules (gnucash report reports standard cash-flow))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Cash Flow Barchart"))
 
diff --git a/gnucash/report/reports/standard/category-barchart.scm b/gnucash/report/reports/standard/category-barchart.scm
index 7ebf3143e5..f7fe644c5e 100644
--- a/gnucash/report/reports/standard/category-barchart.scm
+++ b/gnucash/report/reports/standard/category-barchart.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; The option names are defined here to 1. save typing and 2. avoid
 ;; spelling errors. The *reportnames* are defined here (and not only
diff --git a/gnucash/report/reports/standard/customer-summary.scm b/gnucash/report/reports/standard/customer-summary.scm
index 64a9839096..e7f4ee8bea 100644
--- a/gnucash/report/reports/standard/customer-summary.scm
+++ b/gnucash/report/reports/standard/customer-summary.scm
@@ -33,7 +33,7 @@
 (use-modules (gnucash utilities))                ; for gnc:debug
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 ;; Option names
diff --git a/gnucash/report/reports/standard/dashboard.scm b/gnucash/report/reports/standard/dashboard.scm
index 6d9b4ba315..e34f38ca77 100644
--- a/gnucash/report/reports/standard/dashboard.scm
+++ b/gnucash/report/reports/standard/dashboard.scm
@@ -31,10 +31,10 @@
 (use-modules (gnucash gnc-module))
 (eval-when
       (compile load eval expand)
-      (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+      (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define multicolumn-guid "d8ba4a2e89e8479ca9f6eccdeb164588")
 (define acct-summary-guid "3298541c236b494998b236dfad6ad752")
diff --git a/gnucash/report/reports/standard/equity-statement.scm b/gnucash/report/reports/standard/equity-statement.scm
index 07d66879ac..47e1d622f2 100644
--- a/gnucash/report/reports/standard/equity-statement.scm
+++ b/gnucash/report/reports/standard/equity-statement.scm
@@ -50,7 +50,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Equity Statement"))
 
diff --git a/gnucash/report/reports/standard/general-journal.scm b/gnucash/report/reports/standard/general-journal.scm
index bf5deb891d..e7efd5d734 100644
--- a/gnucash/report/reports/standard/general-journal.scm
+++ b/gnucash/report/reports/standard/general-journal.scm
@@ -32,7 +32,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "General Journal"))
 (define regrptname (N_ "Register"))
diff --git a/gnucash/report/reports/standard/general-ledger.scm b/gnucash/report/reports/standard/general-ledger.scm
index 493da07f1e..ec79f9e076 100644
--- a/gnucash/report/reports/standard/general-ledger.scm
+++ b/gnucash/report/reports/standard/general-ledger.scm
@@ -35,7 +35,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "General Ledger"))
 (define xactrptguid "2fe3b9833af044abb929a88d5a59620f")
diff --git a/gnucash/report/reports/standard/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm
index 281b8d62f7..75d9b96ae6 100644
--- a/gnucash/report/reports/standard/income-gst-statement.scm
+++ b/gnucash/report/reports/standard/income-gst-statement.scm
@@ -31,7 +31,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; Define the strings here to avoid typos and make changes easier.
 (define reportname (N_ "Income and GST Statement"))
diff --git a/gnucash/report/reports/standard/income-statement.scm b/gnucash/report/reports/standard/income-statement.scm
index 8252eef925..704bab8fc4 100644
--- a/gnucash/report/reports/standard/income-statement.scm
+++ b/gnucash/report/reports/standard/income-statement.scm
@@ -46,7 +46,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; define all option's names and help text so that they are properly
 ;; defined in *one* place.
diff --git a/gnucash/report/reports/standard/invoice.scm b/gnucash/report/reports/standard/invoice.scm
index 72d9738fa6..78f7ef0b7f 100644
--- a/gnucash/report/reports/standard/invoice.scm
+++ b/gnucash/report/reports/standard/invoice.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash gettext))
 (use-modules (gnucash utilities))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 (define (addif pred . data) (if pred data '()))
diff --git a/gnucash/report/reports/standard/job-report.scm b/gnucash/report/reports/standard/job-report.scm
index ef87168846..15211fb02d 100644
--- a/gnucash/report/reports/standard/job-report.scm
+++ b/gnucash/report/reports/standard/job-report.scm
@@ -31,7 +31,7 @@
 (use-modules (gnucash utilities))		; for gnc:debug
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 (define acct-string (N_ "Account"))
diff --git a/gnucash/report/reports/standard/net-charts.scm b/gnucash/report/reports/standard/net-charts.scm
index 0d58a2bd45..a57f7a3408 100644
--- a/gnucash/report/reports/standard/net-charts.scm
+++ b/gnucash/report/reports/standard/net-charts.scm
@@ -33,7 +33,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 
 (define optname-from-date (N_ "Start Date"))
diff --git a/gnucash/report/reports/standard/owner-report.scm b/gnucash/report/reports/standard/owner-report.scm
index a1f6288876..1abfb72e6c 100644
--- a/gnucash/report/reports/standard/owner-report.scm
+++ b/gnucash/report/reports/standard/owner-report.scm
@@ -32,7 +32,7 @@
 (use-modules (gnucash utilities))        ; for gnc:debug
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 ;; Option names
diff --git a/gnucash/report/reports/standard/payables.scm b/gnucash/report/reports/standard/payables.scm
index 3be38e121d..2bc7e00d20 100644
--- a/gnucash/report/reports/standard/payables.scm
+++ b/gnucash/report/reports/standard/payables.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash report reports aging))
 (use-modules (gnucash report reports))
diff --git a/gnucash/report/reports/standard/portfolio.scm b/gnucash/report/reports/standard/portfolio.scm
index 01b3286f0e..16e2bea217 100644
--- a/gnucash/report/reports/standard/portfolio.scm
+++ b/gnucash/report/reports/standard/portfolio.scm
@@ -28,7 +28,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Investment Portfolio"))
 
diff --git a/gnucash/report/reports/standard/price-scatter.scm b/gnucash/report/reports/standard/price-scatter.scm
index f38eca5689..d2a0846ae0 100644
--- a/gnucash/report/reports/standard/price-scatter.scm
+++ b/gnucash/report/reports/standard/price-scatter.scm
@@ -30,7 +30,7 @@
 (use-modules (gnucash core-utils))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define optname-from-date (N_ "Start Date"))
 (define optname-to-date (N_ "End Date"))
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index 35a9d97896..906aa4acc6 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -20,7 +20,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 
diff --git a/gnucash/report/reports/standard/receivables.scm b/gnucash/report/reports/standard/receivables.scm
index fa57775ad0..ace0a5419c 100644
--- a/gnucash/report/reports/standard/receivables.scm
+++ b/gnucash/report/reports/standard/receivables.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash report reports aging))
 (use-modules (gnucash report reports))
diff --git a/gnucash/report/reports/standard/reconcile-report.scm b/gnucash/report/reports/standard/reconcile-report.scm
index 719eb33a06..c05ae58d99 100644
--- a/gnucash/report/reports/standard/reconcile-report.scm
+++ b/gnucash/report/reports/standard/reconcile-report.scm
@@ -28,7 +28,7 @@
 
 (use-modules (gnucash gettext))
 (use-modules (gnucash gnc-module))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (reconcile-report-options-generator)
   (let ((options (gnc:trep-options-generator)))
diff --git a/gnucash/report/reports/standard/register.scm b/gnucash/report/reports/standard/register.scm
index 152e8e5033..0b8c984c76 100644
--- a/gnucash/report/reports/standard/register.scm
+++ b/gnucash/report/reports/standard/register.scm
@@ -27,7 +27,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (date-col columns-used)
   (vector-ref columns-used 0))
@@ -708,7 +708,7 @@
 
 ;; we get called from elsewhere... but this doesn't work FIX-ME, find
 ;; out how to get report-guid's exported from report into the report
-;; system at large. might have to define this at the report-system
+;; system at large. might have to define this at the report
 ;; level to get them read by other reports. Look at the aging reports
 ;; for suggestions, perhaps
 (export register-report-guid)
diff --git a/gnucash/report/reports/standard/sx-summary.scm b/gnucash/report/reports/standard/sx-summary.scm
index e1010c1314..7156ed7d01 100644
--- a/gnucash/report/reports/standard/sx-summary.scm
+++ b/gnucash/report/reports/standard/sx-summary.scm
@@ -38,7 +38,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Future Scheduled Transactions Summary"))
 
diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
index 0b61ed9945..cab5900b96 100644
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -28,7 +28,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 503771f990..330e21fad8 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -28,7 +28,7 @@ set(GUILE_DEPENDS
   scm-test-engine
   scm-gettext
   scm-scm
-  scm-test-report-system
+  scm-test-report
   scm-reports
   scm-report-stylesheets
   )
diff --git a/gnucash/report/reports/standard/test/test-average-balance.scm b/gnucash/report/reports/standard/test/test-average-balance.scm
index 6e1d660143..3185c49756 100644
--- a/gnucash/report/reports/standard/test/test-average-balance.scm
+++ b/gnucash/report/reports/standard/test/test-average-balance.scm
@@ -1,11 +1,11 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 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 report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash report reports standard budget))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
index bee5475865..8736d61644 100644
--- a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
@@ -4,8 +4,8 @@
 (use-modules (gnucash report reports standard balance-sheet))
 (use-modules (gnucash report reports standard income-statement))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
diff --git a/gnucash/report/reports/standard/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm
index 4c91db90b2..c5b4e5d7a0 100644
--- a/gnucash/report/reports/standard/test/test-budget.scm
+++ b/gnucash/report/reports/standard/test/test-budget.scm
@@ -23,15 +23,15 @@
 (use-modules (gnucash gnc-module))
 (use-modules (tests srfi64-extras))
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard budget))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))
 (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 db62bfc96e..1551291bab 100644
--- a/gnucash/report/reports/standard/test/test-cash-flow.scm
+++ b/gnucash/report/reports/standard/test/test-cash-flow.scm
@@ -4,7 +4,7 @@
 
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard cash-flow))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define (run-test)
   (and (test test-one-tx-in-cash-flow)
diff --git a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
index 3eadcf8845..e25e8d8ffd 100644
--- a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
@@ -20,14 +20,14 @@
 (use-modules (gnucash gnc-module))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard cashflow-barchart))
 (use-modules (gnucash report stylesheets))
 (use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm
index 9909979a8a..e0a9e37d90 100644
--- a/gnucash/report/reports/standard/test/test-charts.scm
+++ b/gnucash/report/reports/standard/test/test-charts.scm
@@ -8,8 +8,8 @@
 (use-modules (gnucash report reports standard price-scatter))
 (use-modules (gnucash report reports example daily-reports))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
diff --git a/gnucash/report/reports/standard/test/test-income-gst.scm b/gnucash/report/reports/standard/test/test-income-gst.scm
index 7634516672..31ced870b0 100644
--- a/gnucash/report/reports/standard/test/test-income-gst.scm
+++ b/gnucash/report/reports/standard/test/test-income-gst.scm
@@ -3,8 +3,8 @@
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
diff --git a/gnucash/report/reports/standard/test/test-invoice.scm b/gnucash/report/reports/standard/test/test-invoice.scm
index 9e122d2fb6..173ba5c3df 100644
--- a/gnucash/report/reports/standard/test/test-invoice.scm
+++ b/gnucash/report/reports/standard/test/test-invoice.scm
@@ -3,8 +3,8 @@
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard invoice))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
diff --git a/gnucash/report/reports/standard/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm
index 3b9e1118fa..e231283ba3 100644
--- a/gnucash/report/reports/standard/test/test-register.scm
+++ b/gnucash/report/reports/standard/test/test-register.scm
@@ -28,15 +28,15 @@
 ;; causing the test to fail
 ;; That's what the wrapper below is meant for:
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard register))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))
 (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 7531436fd3..ca313e8064 100644
--- a/gnucash/report/reports/standard/test/test-standard-category-report.scm
+++ b/gnucash/report/reports/standard/test/test-standard-category-report.scm
@@ -28,15 +28,15 @@
 ;; causing the test to fail
 ;; That's what the wrapper below is meant for:
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities)) 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard net-charts))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard category-barchart))
 (use-modules (gnucash report stylesheets))
 (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 b1721dc82d..41a9db49a2 100644
--- a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
@@ -18,7 +18,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (srfi srfi-1))
@@ -26,7 +26,7 @@
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable
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 01f16132c3..211095a4d6 100644
--- a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
@@ -18,7 +18,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (srfi srfi-1))
@@ -26,7 +26,7 @@
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable
diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm
index 7438d38b84..7abb062117 100644
--- a/gnucash/report/reports/standard/test/test-stress-options.scm
+++ b/gnucash/report/reports/standard/test/test-stress-options.scm
@@ -8,8 +8,8 @@
 (use-modules (gnucash report reports standard view-column))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report reports standard taxinvoice))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (srfi srfi-98))
 (use-modules (tests srfi64-extras))
diff --git a/gnucash/report/reports/standard/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm
index 92f9d07351..867a8fb2b6 100644
--- a/gnucash/report/reports/standard/test/test-transaction.scm
+++ b/gnucash/report/reports/standard/test/test-transaction.scm
@@ -4,8 +4,8 @@
 (use-modules (gnucash report reports standard transaction))
 (use-modules (gnucash report reports standard reconcile-report))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))
diff --git a/gnucash/report/reports/standard/transaction.scm b/gnucash/report/reports/standard/transaction.scm
index 2c4b296b04..fb0a28b563 100644
--- a/gnucash/report/reports/standard/transaction.scm
+++ b/gnucash/report/reports/standard/transaction.scm
@@ -26,7 +26,7 @@
 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (gnc:define-report
  'version 1
diff --git a/gnucash/report/reports/standard/trial-balance.scm b/gnucash/report/reports/standard/trial-balance.scm
index 4c17805341..b3c880f491 100644
--- a/gnucash/report/reports/standard/trial-balance.scm
+++ b/gnucash/report/reports/standard/trial-balance.scm
@@ -55,7 +55,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Trial Balance"))
 
diff --git a/gnucash/report/reports/standard/view-column.scm b/gnucash/report/reports/standard/view-column.scm
index 2f0caa2172..0ffe548c67 100644
--- a/gnucash/report/reports/standard/view-column.scm
+++ b/gnucash/report/reports/standard/view-column.scm
@@ -33,10 +33,10 @@
 (use-modules (gnucash gettext))
 (eval-when
       (compile load eval expand)
-      (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+      (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0) ;for gnc-build-url
 
 (define (make-options)
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index ff86da5bbe..714efe222e 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -11,7 +11,7 @@ set(stylesheets_noinst_HEADERS
 
 add_library(gncmod-stylesheets MODULE ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS})
 
-target_link_libraries(gncmod-stylesheets gnc-gnome gncmod-report-system gncmod-gnome-utils gnc-module
+target_link_libraries(gncmod-stylesheets gnc-gnome gncmod-report gncmod-gnome-utils gnc-module
     ${GUILE_LDFLAGS} ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
 
 target_compile_definitions(gncmod-stylesheets PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
@@ -59,7 +59,7 @@ set(GUILE_DEPENDS
   scm-gettext
   scm-scm
   gncmod-html
-  scm-report-system
+  scm-report
   )
 
 gnc_add_scheme_targets(scm-report-stylesheets-1
diff --git a/gnucash/report/stylesheets/gncmod-stylesheets.c b/gnucash/report/stylesheets/gncmod-stylesheets.c
index e6403f4cf9..3758d832e4 100644
--- a/gnucash/report/stylesheets/gncmod-stylesheets.c
+++ b/gnucash/report/stylesheets/gncmod-stylesheets.c
@@ -61,7 +61,7 @@ int
 libgncmod_stylesheets_gnc_module_init(int refcount)
 {
     /* load the report system */
-    if (!gnc_module_load("gnucash/report/report-system", 0))
+    if (!gnc_module_load("gnucash/report", 0))
     {
         return FALSE;
     }
diff --git a/gnucash/report/stylesheets/stylesheet-easy.scm b/gnucash/report/stylesheets/stylesheet-easy.scm
index b1eed52f5e..6370a803dc 100644
--- a/gnucash/report/stylesheets/stylesheet-easy.scm
+++ b/gnucash/report/stylesheets/stylesheet-easy.scm
@@ -34,7 +34,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (easy-options)
   (let* ((options (gnc:new-options))
diff --git a/gnucash/report/stylesheets/stylesheet-fancy.scm b/gnucash/report/stylesheets/stylesheet-fancy.scm
index 26dae6e551..fa7191aaa6 100644
--- a/gnucash/report/stylesheets/stylesheet-fancy.scm
+++ b/gnucash/report/stylesheets/stylesheet-fancy.scm
@@ -28,7 +28,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (fancy-options)
   (let* ((options (gnc:new-options))
diff --git a/gnucash/report/stylesheets/stylesheet-footer.scm b/gnucash/report/stylesheets/stylesheet-footer.scm
index 5f22cbcc15..143891ace9 100644
--- a/gnucash/report/stylesheets/stylesheet-footer.scm
+++ b/gnucash/report/stylesheets/stylesheet-footer.scm
@@ -39,7 +39,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (footer-options)
   (let* ((options (gnc:new-options))
diff --git a/gnucash/report/stylesheets/stylesheet-head-or-tail.scm b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
index be64e663bf..1eaeaf3055 100644
--- a/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
+++ b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
@@ -41,7 +41,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (head-or-tail-options)
   (let* ((options (gnc:new-options))
diff --git a/gnucash/report/stylesheets/stylesheet-plain.scm b/gnucash/report/stylesheets/stylesheet-plain.scm
index 6cb7909428..4eca60778d 100644
--- a/gnucash/report/stylesheets/stylesheet-plain.scm
+++ b/gnucash/report/stylesheets/stylesheet-plain.scm
@@ -32,7 +32,7 @@
 (use-modules (srfi srfi-14))
 
 (gnc:module-load "gnucash/html" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; plain style sheet
 ;; this should generally be the default style sheet for most reports.
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index 38d2f751ae..76ca7014d8 100644
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@@ -8,7 +8,7 @@ set(GUILE_DEPENDS
   gncmod-backend-xml
   scm-gnome-utils
   gncmod-html
-  scm-report-system
+  scm-report
   scm-gnome
   scm-report-stylesheets
 )
diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt
new file mode 100644
index 0000000000..c6e28b5d93
--- /dev/null
+++ b/gnucash/report/test/CMakeLists.txt
@@ -0,0 +1,72 @@
+
+set(REPORT_TEST_INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
+  ${GUILE_INCLUDE_DIRS}
+)
+set(REPORT_TEST_LIBS gnc-module)
+
+gnc_add_test_with_guile(test-link-module-report test-link-module.c
+  REPORT_TEST_INCLUDE_DIRS REPORT_TEST_LIBS
+)
+
+set(scm_test_report_SOURCES
+  test-load-report-module.scm
+  test-test-extras.scm
+)
+
+set (scm_test_report_with_srfi64_SOURCES
+  test-commodity-utils.scm
+  test-report-utilities.scm
+  test-html-utilities-srfi64.scm
+  test-html-fonts.scm
+  test-html-chart.scm
+  test-report-html.scm
+  test-report.scm
+  )
+
+set(GUILE_DEPENDS
+  scm-gnc-module
+  scm-app-utils
+  scm-core-utils
+  scm-gettext
+  scm-engine
+  scm-test-engine
+  scm-scm
+  scm-report-2
+  scm-test-report
+  )
+gnc_add_scheme_tests("${scm_test_report_SOURCES}")
+
+if (HAVE_SRFI64)
+  gnc_add_scheme_test_targets(scm-test-report-srfi64
+    "${scm_test_report_with_srfi64_SOURCES}"
+    "tests"
+    "${GUILE_DEPENDS};scm-srfi64-extras"
+    FALSE
+    )
+
+  gnc_add_scheme_tests ("${scm_test_report_with_srfi64_SOURCES}")
+endif (HAVE_SRFI64)
+
+gnc_add_scheme_test_targets(scm-test-report
+  "test-report-extras.scm"
+  "tests"
+  "${GUILE_DEPENDS}"
+  FALSE
+  )
+
+gnc_add_scheme_test_targets(scm-test-report-2
+  "${scm_test_report_SOURCES}"
+  "tests"
+  "scm-test-report"
+  FALSE
+)
+
+add_dependencies(check scm-test-report)
+set_dist_list(test_report_DIST
+  CMakeLists.txt
+  ${scm_test_report_with_srfi64_SOURCES}
+  ${scm_test_report_SOURCES}
+  test-report-extras.scm
+  test-link-module.c
+)
diff --git a/gnucash/report/report-system/test/test-commodity-utils.scm b/gnucash/report/test/test-commodity-utils.scm
similarity index 99%
rename from gnucash/report/report-system/test/test-commodity-utils.scm
rename to gnucash/report/test/test-commodity-utils.scm
index b360cc12a7..0c0a81fef9 100644
--- a/gnucash/report/report-system/test/test-commodity-utils.scm
+++ b/gnucash/report/test/test-commodity-utils.scm
@@ -29,7 +29,7 @@
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (sw_app_utils))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (system vm coverage))
 
 (setlocale LC_ALL "C")
diff --git a/gnucash/report/report-system/test/test-html-chart.scm b/gnucash/report/test/test-html-chart.scm
similarity index 95%
rename from gnucash/report/report-system/test/test-html-chart.scm
rename to gnucash/report/test/test-html-chart.scm
index 4e8e82d7b1..f077af86dc 100644
--- a/gnucash/report/report-system/test/test-html-chart.scm
+++ b/gnucash/report/test/test-html-chart.scm
@@ -1,13 +1,13 @@
 (use-modules (gnucash gnc-module))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
-(use-modules (tests test-report-system-extras))
-(use-modules (gnucash report report-system))
+(use-modules (tests test-report-extras))
+(use-modules (gnucash report report))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
diff --git a/gnucash/report/report-system/test/test-html-fonts.scm b/gnucash/report/test/test-html-fonts.scm
similarity index 97%
rename from gnucash/report/report-system/test/test-html-fonts.scm
rename to gnucash/report/test/test-html-fonts.scm
index d136a1de2e..c9a0910d98 100644
--- a/gnucash/report/report-system/test/test-html-fonts.scm
+++ b/gnucash/report/test/test-html-fonts.scm
@@ -1,6 +1,6 @@
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
-(load "html-fonts")
+(load "gnucash/report/html-fonts")
 
 (setlocale LC_ALL "C")
 
diff --git a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm b/gnucash/report/test/test-html-utilities-srfi64.scm
similarity index 89%
rename from gnucash/report/report-system/test/test-html-utilities-srfi64.scm
rename to gnucash/report/test/test-html-utilities-srfi64.scm
index 4a52705692..d969a79d5a 100644
--- a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
+++ b/gnucash/report/test/test-html-utilities-srfi64.scm
@@ -1,11 +1,11 @@
 (use-modules (gnucash gnc-module))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (tests test-engine-extras))
-(use-modules (tests test-report-system-extras))
-(use-modules (gnucash report report-system))
+(use-modules (tests test-report-extras))
+(use-modules (gnucash report report))
 (use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-64))
 
diff --git a/gnucash/report/report-system/test/test-link-module.c b/gnucash/report/test/test-link-module.c
similarity index 96%
rename from gnucash/report/report-system/test/test-link-module.c
rename to gnucash/report/test/test-link-module.c
index 6bd967c61e..8a5183bc81 100644
--- a/gnucash/report/report-system/test/test-link-module.c
+++ b/gnucash/report/test/test-link-module.c
@@ -27,7 +27,7 @@ guile_main(void *closure, int argc, char ** argv)
 {
     GNCModule mod;
     gnc_module_system_init();
-    mod = gnc_module_load("gnucash/report/report-system", 0);
+    mod = gnc_module_load("gnucash/report", 0);
 
     exit(mod == NULL);
 }
diff --git a/gnucash/report/report-system/test/test-load-report-system-module.scm b/gnucash/report/test/test-load-report-module.scm
similarity index 87%
rename from gnucash/report/report-system/test/test-load-report-system-module.scm
rename to gnucash/report/test/test-load-report-module.scm
index b2158de530..aef1452c14 100755
--- a/gnucash/report/report-system/test/test-load-report-system-module.scm
+++ b/gnucash/report/test/test-load-report-module.scm
@@ -10,7 +10,7 @@
 
 (gnc:module-system-init)
 
-(if (gnc:module-load "gnucash/report/report-system" 0)
+(if (gnc:module-load "gnucash/report" 0)
     (begin 
       (display "ok\n")
       (exit 0))
diff --git a/gnucash/report/report-system/test/test-report-system-extras.scm b/gnucash/report/test/test-report-extras.scm
similarity index 97%
rename from gnucash/report/report-system/test/test-report-system-extras.scm
rename to gnucash/report/test/test-report-extras.scm
index bbeef1d5b8..9f7db0ad34 100644
--- a/gnucash/report/report-system/test/test-report-system-extras.scm
+++ b/gnucash/report/test/test-report-extras.scm
@@ -17,11 +17,11 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (tests test-report-system-extras))
+(define-module (tests test-report-extras))
 
 (use-modules (gnucash gnc-module))
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (sxml simple))
 (use-modules (sxml xpath))
 
diff --git a/gnucash/report/report-system/test/test-report-html.scm b/gnucash/report/test/test-report-html.scm
similarity index 99%
rename from gnucash/report/report-system/test/test-report-html.scm
rename to gnucash/report/test/test-report-html.scm
index e9086eb508..c094bf1c61 100644
--- a/gnucash/report/report-system/test/test-report-html.scm
+++ b/gnucash/report/test/test-report-html.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 report-system))
+(use-modules (gnucash report report))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 
diff --git a/gnucash/report/report-system/test/test-report-utilities.scm b/gnucash/report/test/test-report-utilities.scm
similarity index 99%
rename from gnucash/report/report-system/test/test-report-utilities.scm
rename to gnucash/report/test/test-report-utilities.scm
index 2a3dad8ea2..542177b520 100644
--- a/gnucash/report/report-system/test/test-report-utilities.scm
+++ b/gnucash/report/test/test-report-utilities.scm
@@ -1,13 +1,13 @@
 (use-modules (gnucash gnc-module))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
-(use-modules (tests test-report-system-extras))
-(use-modules (gnucash report report-system))
+(use-modules (tests test-report-extras))
+(use-modules (gnucash report report))
 
 (setlocale LC_ALL "C")
 
diff --git a/gnucash/report/report-system/test/test-report-system.scm b/gnucash/report/test/test-report.scm
similarity index 98%
rename from gnucash/report/report-system/test/test-report-system.scm
rename to gnucash/report/test/test-report.scm
index a2a9d1511f..1e3819c406 100644
--- a/gnucash/report/report-system/test/test-report-system.scm
+++ b/gnucash/report/test/test-report.scm
@@ -3,13 +3,13 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 
 (use-modules (tests test-engine-extras))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
-  (test-begin "Testing/Temporary/test-report-system")
+  (test-begin "Testing/Temporary/test-report")
   ;; if (test-runner-factory gnc:test-runner) is commented out, this
   ;; will create Testing/Temporary/test-asset-performance.log
   (test-check1)
@@ -19,7 +19,7 @@
   (test-report-template-getters)
   (test-make-report)
   (test-report)
-  (test-end "Testing/Temporary/test-report-system"))
+  (test-end "Testing/Temporary/test-report"))
 
 (define test4-guid "54c2fc051af64a08ba2334c2e9179e24")
 ;; -----------------------------------------------------------------------
diff --git a/gnucash/report/report-system/test/test-test-extras.scm b/gnucash/report/test/test-test-extras.scm
similarity index 96%
rename from gnucash/report/report-system/test/test-test-extras.scm
rename to gnucash/report/test/test-test-extras.scm
index bd03b2af36..78cd693c6d 100644
--- a/gnucash/report/report-system/test/test-test-extras.scm
+++ b/gnucash/report/test/test-test-extras.scm
@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
diff --git a/gnucash/report/report-system/trep-engine.scm b/gnucash/report/trep-engine.scm
similarity index 100%
rename from gnucash/report/report-system/trep-engine.scm
rename to gnucash/report/trep-engine.scm
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e244701ec0..55eeae484d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -418,11 +418,34 @@ gnucash/register/register-gnome/gnucash-style.c
 gnucash/register/register-gnome/pricecell-gnome.c
 gnucash/register/register-gnome/quickfillcell-gnome.c
 gnucash/register/register-gnome/table-gnome.c
+gnucash/report/commodity-utilities.scm
+gnucash/report/eguile-gnc.scm
+gnucash/report/eguile-html-utilities.scm
+gnucash/report/eguile-utilities.scm
+gnucash/report/gncmod-report.c
+gnucash/report/gnc-report.c
+gnucash/report/html-acct-table.scm
+gnucash/report/html-anytag.scm
+gnucash/report/html-barchart.scm
+gnucash/report/html-chart.scm
+gnucash/report/html-document.scm
+gnucash/report/html-fonts.scm
+gnucash/report/html-linechart.scm
+gnucash/report/html-piechart.scm
+gnucash/report/html-scatter.scm
+gnucash/report/html-style-info.scm
+gnucash/report/html-style-sheet.scm
+gnucash/report/html-table.scm
+gnucash/report/html-text.scm
+gnucash/report/html-utilities.scm
 gnucash/report/locale-specific/us/de_DE.scm
 gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
 gnucash/report/locale-specific/us/taxtxf-de_DE.scm
 gnucash/report/locale-specific/us/taxtxf.scm
 gnucash/report/locale-specific/us/us.scm
+gnucash/report/options-utilities.scm
+gnucash/report/report-core.scm
+gnucash/report/report-register-hooks.scm
 gnucash/report/reports/aging.scm
 gnucash/report/reports/example/average-balance.scm
 gnucash/report/reports/example/daily-reports.scm
@@ -471,32 +494,8 @@ gnucash/report/reports/standard/view-column.scm
 gnucash/report/reports/support/balsheet-eg.eguile.scm
 gnucash/report/reports/support/receipt.eguile.scm
 gnucash/report/reports/support/taxinvoice.eguile.scm
-gnucash/report/report-system/commodity-utilities.scm
-gnucash/report/report-system/eguile-gnc.scm
-gnucash/report/report-system/eguile-html-utilities.scm
-gnucash/report/report-system/eguile-utilities.scm
-gnucash/report/report-system/gncmod-report-system.c
-gnucash/report/report-system/gnc-report.c
-gnucash/report/report-system/html-acct-table.scm
-gnucash/report/report-system/html-anytag.scm
-gnucash/report/report-system/html-barchart.scm
-gnucash/report/report-system/html-chart.scm
-gnucash/report/report-system/html-document.scm
-gnucash/report/report-system/html-fonts.scm
-gnucash/report/report-system/html-linechart.scm
-gnucash/report/report-system/html-piechart.scm
-gnucash/report/report-system/html-scatter.scm
-gnucash/report/report-system/html-style-info.scm
-gnucash/report/report-system/html-style-sheet.scm
-gnucash/report/report-system/html-table.scm
-gnucash/report/report-system/html-text.scm
-gnucash/report/report-system/html-utilities.scm
-gnucash/report/report-system/options-utilities.scm
-gnucash/report/report-system/report-register-hooks.scm
-gnucash/report/report-system/report.scm
-gnucash/report/report-system/report-system.scm
-gnucash/report/report-system/report-utilities.scm
-gnucash/report/report-system/trep-engine.scm
+gnucash/report/report.scm
+gnucash/report/report-utilities.scm
 gnucash/report/stylesheets/gncmod-stylesheets.c
 gnucash/report/stylesheets/gnc-plugin-stylesheets.c
 gnucash/report/stylesheets/stylesheet-easy.scm
@@ -505,6 +504,7 @@ gnucash/report/stylesheets/stylesheet-footer.scm
 gnucash/report/stylesheets/stylesheet-head-or-tail.scm
 gnucash/report/stylesheets/stylesheet-plain.scm
 gnucash/report/stylesheets/stylesheets.scm
+gnucash/report/trep-engine.scm
 libgnucash/app-utils/app-utils.scm
 libgnucash/app-utils/business-helpers.c
 libgnucash/app-utils/business-options.c