                                         value
                                         (wrap-val value type))))))
                acc)
-             (doto request-factory (.setOptions (request-options options)))
+             (doto request-factory (.setOptions (make-request-options options)))
              variables))
 
 (defn submit-request
   "Construct, submit, and return raw results of request for the given
   `session` using `request-factory` and `query`. Modify it
   with (possibly empty) `options` and `variables` maps. Applies type
-  conversion to response according to defaults and `types`. Variables
+  conversion to response according to defaults and `xcc-type->conv-fn`. Variables
   may be passed as a map of Strings or with String names corresponding
   to maps describing the variable using mandatory key `:value` and
   optional keys `:namespace` and `:type`.`"
   [request-factory session query options variables types shape]
   (let [req (sling/try+ (.submitRequest session
-                                        (request-obj request-factory options variables))
+                                        (make-request-obj request-factory options variables))
                         ;; RequestException and its subclass
                         ;; XQueryException have overridden toString,
                         ;; so only those need to be re-thrown with

    :timeout-millis
    :timezone})

(defn request-options
  "Creates a Request Options object (to pass to a Request or a
  Session) out of the given options map. See `valid-request-options`
  for supported keywords."

  return only the first value.

  Type conversion overrides must be a map using keys present in
  `uruk.core/xcc-type->conv-fn` and conform to use in `convert-types`,
  that is, including values which are a function of one variable."
  ([session module]
   (execute-module session module {}))
  ([session module {:keys [options variables types shape]}]
