diff --git a/borrowed/guile-json/CMakeLists.txt b/borrowed/guile-json/CMakeLists.txt
index 60c302627d..e8bd8a6920 100644
--- a/borrowed/guile-json/CMakeLists.txt
+++ b/borrowed/guile-json/CMakeLists.txt
@@ -1,9 +1,20 @@
-add_subdirectory(json)
+set (scm-guile-json-details
+  json/builder.scm
+  json/parser.scm
+  json/syntax.scm
+)
+
+gnc_add_scheme_targets (guile-json-details
+  "${scm-guile-json-details}"
+  gnucash/json
+  ""
+  TRUE
+)
 
 gnc_add_scheme_targets (guile-json
   json.scm
-  ""
-  ""
+  "gnucash"
+  "guile-json-details"
   FALSE
 )
 
@@ -12,8 +23,9 @@ set_local_dist(guile-json_DIST_LOCAL
   CMakeLists.txt
   COPYING
   json.scm
+  ${scm-guile-json-details}
   NEWS
   README.org
 )
 
-set(guile-json_DIST ${guile-json_DIST_LOCAL} ${guile-json-details_DIST} PARENT_SCOPE)
+set(guile-json_DIST ${guile-json_DIST_LOCAL} PARENT_SCOPE)
diff --git a/borrowed/guile-json/json.scm b/borrowed/guile-json/json.scm
index 3ca8dc026d..f474088654 100644
--- a/borrowed/guile-json/json.scm
+++ b/borrowed/guile-json/json.scm
@@ -23,9 +23,9 @@
 
 ;;; Code:
 
-(define-module (json)
-  #:use-module (json builder)
-  #:use-module (json parser))
+(define-module (gnucash json)
+  #:use-module (gnucash json builder)
+  #:use-module (gnucash json parser))
 
 (define-syntax re-export-modules
   (syntax-rules ()
@@ -35,7 +35,7 @@
                     (resolve-interface '(mod ...)))
        ...))))
 
-(re-export-modules (json builder)
-                   (json parser))
+(re-export-modules (gnucash json builder)
+                   (gnucash json parser))
 
 ;;; (json) ends here
diff --git a/borrowed/guile-json/json/CMakeLists.txt b/borrowed/guile-json/json/CMakeLists.txt
index 1b890b01a8..50aa82cccd 100644
--- a/borrowed/guile-json/json/CMakeLists.txt
+++ b/borrowed/guile-json/json/CMakeLists.txt
@@ -6,9 +6,9 @@ set (scm-guile-json-details
 
 gnc_add_scheme_targets (guile-json-details
   "${scm-guile-json-details}"
-  json
+  gnucash/json
   ""
-  FALSE
+  TRUE
 )
 
 set_dist_list (guile-json-details_DIST
diff --git a/borrowed/guile-json/json/builder.scm b/borrowed/guile-json/json/builder.scm
index 4b5e43a251..80e5716cee 100644
--- a/borrowed/guile-json/json/builder.scm
+++ b/borrowed/guile-json/json/builder.scm
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(define-module (json builder)
+(define-module (gnucash json builder)
   #:use-module (ice-9 format)
   #:use-module (srfi srfi-1)
   #:use-module (rnrs bytevectors)
diff --git a/borrowed/guile-json/json/parser.scm b/borrowed/guile-json/json/parser.scm
index eae6d482a5..fb145c15d2 100644
--- a/borrowed/guile-json/json/parser.scm
+++ b/borrowed/guile-json/json/parser.scm
@@ -23,7 +23,7 @@
 
 ;;; Code:
 
-(define-module (json parser)
+(define-module (gnucash json parser)
   #:use-module (ice-9 rdelim)
   #:use-module (rnrs bytevectors)
   #:use-module (srfi srfi-9)
diff --git a/borrowed/guile-json/json/syntax.scm b/borrowed/guile-json/json/syntax.scm
index 10e20997a0..083e374cc0 100644
--- a/borrowed/guile-json/json/syntax.scm
+++ b/borrowed/guile-json/json/syntax.scm
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(define-module (json syntax)
+(define-module (gnucash json syntax)
   #:use-module (ice-9 deprecated)
   #:use-module (ice-9 match)
   #:export (json))
diff --git a/gnucash/report/html-chart.scm b/gnucash/report/html-chart.scm
index 35f73abb84..056db7ed5d 100644
--- a/gnucash/report/html-chart.scm
+++ b/gnucash/report/html-chart.scm
@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (json builder))            ;for building JSON options
+(use-modules (gnucash json builder))            ;for building JSON options
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;