diff --git a/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm b/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
index 911064d270..4bd967c802 100644
--- a/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
+++ b/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
@@ -71,7 +71,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash core-utils)) ; for gnc:version
 (use-modules (gnucash gettext))
-(use-modules (gnucash tax-de_DE))
+(use-modules (gnucash locale de_DE tax))
 
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/report" 0)
diff --git a/gnucash/report/reports/locale-specific/us/taxtxf.scm b/gnucash/report/reports/locale-specific/us/taxtxf.scm
index 85ef5c24c4..62928f6625 100644
--- a/gnucash/report/reports/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/reports/locale-specific/us/taxtxf.scm
@@ -103,7 +103,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(use-modules (gnucash tax-us))
+(use-modules (gnucash locale us tax))
 
 (eval-when
       (compile load eval expand)
diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt
index 30b8cb010f..f518772415 100644
--- a/libgnucash/tax/CMakeLists.txt
+++ b/libgnucash/tax/CMakeLists.txt
@@ -24,42 +24,42 @@ install(TARGETS gncmod-locale-tax
 # Scheme
 
 set(gncmod_tax_us_SCHEME_1 us/txf.scm us/txf-help.scm)
-set(gncmod_tax_us_SCHEME_2 us/tax-us.scm)
+set(gncmod_tax_us_SCHEME_2 us/tax.scm)
 
-set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf-de_DE.scm de_DE/txf-help-de_DE.scm)
-set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax-de_DE.scm)
+set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf.scm de_DE/txf-help.scm)
+set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax.scm)
 
 set(GUILE_DEPENDS scm-app-utils scm-gnc-module)
 
 gnc_add_scheme_targets(scm-tax-us-1
 "${gncmod_tax_us_SCHEME_1}"
-"gnucash/tax-us"
+"gnucash/locale/us/tax"
 "${GUILE_DEPENDS}"
 TRUE
 )
 gnc_add_scheme_targets(scm-tax-us-2
 "${gncmod_tax_us_SCHEME_2}"
-gnucash
+"gnucash/locale/us"
 "${GUILE_DEPENDS}"
 FALSE
 )
 
 gnc_add_scheme_targets(scm-tax-de_DE-1
 "${gncmod_tax_de_DE_SCHEME_1}"
-"gnucash/tax-de_DE"
+"gnucash/locale/de_DE/tax"
 "${GUILE_DEPENDS}"
 TRUE
 )
 gnc_add_scheme_targets(scm-tax-de_DE-2
 "${gncmod_tax_de_DE_SCHEME_2}"
-gnucash
+"gnucash/locale/de_DE"
 "${GUILE_DEPENDS}"
 FALSE
 )
 
 # Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash tax-de_DE" "scm-tax-de_DE-2" "")
-gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash tax-us" "scm-tax-us-2" "")
+gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash locale de_DE tax" "scm-tax-de_DE-2" "")
+gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash locale us tax" "scm-tax-us-2" "")
 
 add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
 
diff --git a/libgnucash/tax/de_DE/tax-de_DE.scm b/libgnucash/tax/de_DE/tax.scm
similarity index 93%
rename from libgnucash/tax/de_DE/tax-de_DE.scm
rename to libgnucash/tax/de_DE/tax.scm
index 26d4200465..1fff197efa 100644
--- a/libgnucash/tax/de_DE/tax-de_DE.scm
+++ b/libgnucash/tax/de_DE/tax.scm
@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash tax-de_DE))
+(define-module (gnucash locale de_DE tax))
 
 (use-modules (gnucash gnc-module))
 (eval-when
@@ -54,5 +54,5 @@
 
 (export gnc:*tax-label* gnc:*tax-nr-label*)
 
-(load-from-path "gnucash/tax-de_DE/txf-de_DE")
-(load-from-path "gnucash/tax-de_DE/txf-help-de_DE")
+(load-from-path "gnucash/locale/de_DE/tax/txf")
+(load-from-path "gnucash/locale/de_DE/tax/txf-help")
diff --git a/libgnucash/tax/de_DE/txf-help-de_DE.scm b/libgnucash/tax/de_DE/txf-help.scm
similarity index 100%
rename from libgnucash/tax/de_DE/txf-help-de_DE.scm
rename to libgnucash/tax/de_DE/txf-help.scm
diff --git a/libgnucash/tax/de_DE/txf-de_DE.scm b/libgnucash/tax/de_DE/txf.scm
similarity index 100%
rename from libgnucash/tax/de_DE/txf-de_DE.scm
rename to libgnucash/tax/de_DE/txf.scm
diff --git a/libgnucash/tax/gncmod-locale-tax.c b/libgnucash/tax/gncmod-locale-tax.c
index 0246283594..10751575e9 100644
--- a/libgnucash/tax/gncmod-locale-tax.c
+++ b/libgnucash/tax/gncmod-locale-tax.c
@@ -80,9 +80,9 @@ libgncmod_locale_tax_gnc_module_init(int refcount)
     gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
 # endif /* G_OS_WIN32 */
     if (is_de_DE)
-        lmod("(gnucash tax-de_DE)");
+        lmod("(gnucash locale de_DE tax)");
     else
-        lmod("(gnucash tax-us)");
+        lmod("(gnucash locale us tax)");
     return TRUE;
 }
 
diff --git a/libgnucash/tax/us/tax-us.scm b/libgnucash/tax/us/tax.scm
similarity index 91%
rename from libgnucash/tax/us/tax-us.scm
rename to libgnucash/tax/us/tax.scm
index d613406e14..14d70021ec 100644
--- a/libgnucash/tax/us/tax-us.scm
+++ b/libgnucash/tax/us/tax.scm
@@ -17,7 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash tax-us))
+(define-module (gnucash locale us tax))
 
 (export gnc:txf-get-payer-name-source)
 (export gnc:txf-get-form)
@@ -40,5 +40,5 @@
 (export txf-asset-categories)
 (export txf-liab-eq-categories)
 
-(load-from-path "gnucash/tax-us/txf")
-(load-from-path "gnucash/tax-us/txf-help")
+(load-from-path "gnucash/locale/us/tax/txf")
+(load-from-path "gnucash/locale/us/tax/txf-help")
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 169765e447..9339bf3a38 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -695,10 +695,10 @@ libgnucash/gnc-module/gnc-module.c
 libgnucash/gnc-module/gnc-module.scm
 libgnucash/scm/price-quotes.scm
 libgnucash/scm/utilities.scm
-libgnucash/tax/de_DE/tax-de_DE.scm
-libgnucash/tax/de_DE/txf-de_DE.scm
-libgnucash/tax/de_DE/txf-help-de_DE.scm
+libgnucash/tax/de_DE/tax.scm
+libgnucash/tax/de_DE/txf-help.scm
+libgnucash/tax/de_DE/txf.scm
 libgnucash/tax/gncmod-locale-tax.c
-libgnucash/tax/us/tax-us.scm
+libgnucash/tax/us/tax.scm
 libgnucash/tax/us/txf-help.scm
 libgnucash/tax/us/txf.scm