diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index fa776d707a..f215836f16 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -433,7 +433,7 @@ not found.")))
                      gnc:optname-stylesheet))))
 
 (define (gnc:report-set-stylesheet! report stylesheet)
-  (gnc-set-value
+  (gnc-set-option
    (gnc:optiondb (gnc:report-options report))
    gnc:pagename-general gnc:optname-stylesheet
    (string->symbol (gnc:html-style-sheet-name stylesheet))))
diff --git a/gnucash/report/reports/standard/account-piecharts.scm b/gnucash/report/reports/standard/account-piecharts.scm
index 24e745e101..2cca87bb43 100644
--- a/gnucash/report/reports/standard/account-piecharts.scm
+++ b/gnucash/report/reports/standard/account-piecharts.scm
@@ -462,7 +462,7 @@ balance at a given time"))
                       (gnc:options-copy-values (gnc:report-options report-obj)
                                                options)
                       ;; and set the destination accounts
-                      (gnc-option-set-value
+                      (gnc-set-option
                        options gnc:pagename-accounts optname-accounts
                        (map cadr finish))
                       (set! id (gnc:make-report report-guid options))
diff --git a/gnucash/report/reports/standard/new-aging.scm b/gnucash/report/reports/standard/new-aging.scm
index 57d4efd8f0..ac1f9ee86c 100644
--- a/gnucash/report/reports/standard/new-aging.scm
+++ b/gnucash/report/reports/standard/new-aging.scm
@@ -428,7 +428,7 @@ exist but have no suitable transactions."))
 
 (define (receivables-report-create-internal acct title show-zeros?)
   (let* ((options (gnc:make-report-options receivables-aging-guid)))
-    (when title (gnc-set-option-set-value
+    (when title (gnc-set-option
                  options gnc:pagename-general gnc:optname-reportname title))
     (gnc-set-option options gnc:pagename-general optname-show-zeros show-zeros?)
     (gnc:make-report receivables-aging-guid options)))
diff --git a/gnucash/report/reports/standard/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm
index 0f7a2e583b..d5ca446037 100644
--- a/gnucash/report/reports/standard/test/test-transaction.scm
+++ b/gnucash/report/reports/standard/test/test-transaction.scm
@@ -107,7 +107,7 @@
       (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
 (define (opt-val options section name)
   (if (gnc-lookup-option options section name)
-      (gnc-get-option options section name value)
+      (gnc-optiondb-lookup-value options section name)
       (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
 
 (define structure