                                        config/WebserverSslPemConfig)
    (schema/optional-key :callback-fn) (schema/pred ifn?)})
 
-(def WebserverServiceContext
+(def ServerContext
   {:state     Atom
    :handlers  ContextHandlerCollection
    :server    (schema/maybe Server)})


(schema/defn ^:always-validate
  add-handler :- ContextHandler
  [webserver-context :- WebserverServiceContext
   handler :- ContextHandler]
  (.addHandler (:handlers webserver-context) handler)
  handler)

  merge-webserver-overrides-with-options :- config/WebserverServiceRawConfig
  "Merge any overrides made to the webserver config settings with the supplied
   options."
  [webserver-context :- ServerContext
   options :- config/WebserverServiceRawConfig]
  {:post [(map? %)]}
  (let [overrides (:overrides (swap! (:state webserver-context)
