diff --git a/src/keri/app/__init__.py b/src/keri/app/__init__.py
index dc4e1dce0..bd61c63ae 100644
--- a/src/keri/app/__init__.py
+++ b/src/keri/app/__init__.py
@@ -10,12 +10,12 @@
                        messenger, messengerFrom, streamMessengerFrom,
                        httpClient, schemes)
 from .apping import Consoler
-from .challenging import ChallengeHandler, loadChallengingHandlers
+from .challenging import ChallengeHandler
 from .configing import openCF, Configer, ConfigerDoer
 from .delegating import Anchorer, DelegateRequestHandler, delegateRequestExn
 from .directing import Director, Reactor, Directant, Reactant, runController
 from .forwarding import Poster, StreamPoster, ForwardHandler, introduce
-from .grouping import (Counselor, MultisigNotificationHandler, multisigInceptExn, loadGroupingHandlers,
+from .grouping import (Counselor, MultisigNotificationHandler, multisigInceptExn,
                        multisigRotateExn, multisigInteractExn, multisigRegistryInceptExn,
                        multisigIssueExn, multisigRevokeExn, multisigRpyExn,
                        multisigExn, getEscrowedEvent, Multiplexor)
@@ -32,12 +32,12 @@
                       KeeperDoer, Creator, RandyCreator, SaltyCreator,
                       Creatory, Initage, Manager, ManagerDoer, Algos)
 from .notifying import notice, Notice, DicterSuber, Noter, Notifier
-from .oobiing import (loadOobiingEnds, loadOobiingHandlers, OobiResource, OobiRequestHandler,
+from .oobiing import (OobiResource, OobiRequestHandler,
                       oobiRequestExn, Oobiery, Authenticator, Result)
 from .organizing import BaseOrganizer, Organizer, IdentifierOrganizer
 from .querying import (QueryDoer, KeyStateNoticer, LogQuerier,
                        SeqNoQuerier, AnchorQuerier)
-from .signaling import (signal, Signal, Signaler, loadSignalingEnds,
+from .signaling import (signal, Signal, Signaler,
                         SignalsEnd, SignalIterable)
 from .signing import serialize, signPaths, transSeal
 from .specing import SpecResource
diff --git a/src/keri/app/challenging.py b/src/keri/app/challenging.py
index 20be8ae46..444486937 100644
--- a/src/keri/app/challenging.py
+++ b/src/keri/app/challenging.py
@@ -7,7 +7,7 @@
 from ..core import Diger
 
 
-def loadChallengingHandlers(db, signaler, exc):
+def loadHandlers(db, signaler, exc):
     """ Load handlers for the peer-to-peer challenge response protocol
 
     Parameters:
diff --git a/src/keri/app/grouping.py b/src/keri/app/grouping.py
index 971073c41..1dba3cbb6 100644
--- a/src/keri/app/grouping.py
+++ b/src/keri/app/grouping.py
@@ -269,7 +269,7 @@ def handle(self, serder, attachments=None):
         self.mux.add(serder=serder)
 
 
-def loadGroupingHandlers(exc, mux):
+def loadHandlers(exc, mux):
     """ Load handlers for the peer-to-peer distributed group multisig protocol
 
     Parameters:
diff --git a/src/keri/app/indirecting.py b/src/keri/app/indirecting.py
index b7764d019..aacf32497 100644
--- a/src/keri/app/indirecting.py
+++ b/src/keri/app/indirecting.py
@@ -24,7 +24,7 @@
 from ..core import (Kevery, parsing, routing, coring, serdering,
                     Counter, receipt, Codens)
 from ..db import BaserDoer
-from ..end import loadEndingEnds
+from ..end import loadEnds as loadEndingEnds
 from ..help import nowUTC
 from ..peer import Exchanger
 
@@ -34,7 +34,7 @@
 from .httping import Clienter, createCESRRequest, parseCesrHttpRequest, CESR_CONTENT_TYPE
 from .forwarding import ForwardHandler
 from .agenting import httpClient
-from .oobiing import Oobiery, loadOobiingEnds
+from .oobiing import Oobiery, loadEnds as loadOobiingEnds
 
 logger = ogler.getLogger()
 
@@ -905,6 +905,14 @@ def on_post(self, req, rep):
                204:
                   description: KEL or EXN event accepted.
         """
+        if req.method == "OPTIONS":
+            rep.status = falcon.HTTP_200
+            return
+
+        rep.set_header('Cache-Control', "no-cache")
+        rep.set_header('connection', "close")
+
+        cr = parseCesrHttpRequest(req=req)
         sadder = coring.Sadder(ked=cr.payload, kind=Kinds.json)
         msg = bytearray(sadder.raw)
         msg.extend(cr.attachments.encode("utf-8"))
diff --git a/src/keri/app/oobiing.py b/src/keri/app/oobiing.py
index 6586ee43a..a0b637cd0 100644
--- a/src/keri/app/oobiing.py
+++ b/src/keri/app/oobiing.py
@@ -32,13 +32,13 @@
 Result = Resultage(resolved='resolved', failed='failed')
 
 
-def loadOobiingEnds(app, *, hby, prefix=""):
+def loadEnds(app, *, hby, prefix=""):
     oobiEnd = OobiResource(hby=hby)
     app.add_route(prefix + "/oobi", oobiEnd)
     return []
 
 
-def loadOobiingHandlers(hby, exc, notifier):
+def loadHandlers(hby, exc, notifier):
     """ Load handlers for the peer-to-peer delegation protocols
 
     Parameters:
diff --git a/src/keri/app/signaling.py b/src/keri/app/signaling.py
index e5d341315..9bf896498 100644
--- a/src/keri/app/signaling.py
+++ b/src/keri/app/signaling.py
@@ -159,7 +159,7 @@ def expireDo(self, tymth=None, tock=0.0, **kwa):
             yield self.tock
 
 
-def loadSignalingEnds(app, *, signals=None):
+def loadEnds(app, *, signals=None):
     """ Load endpoints for agent to controller messages
 
     Args:
diff --git a/src/keri/cli/commands/challenge/verify.py b/src/keri/cli/commands/challenge/verify.py
index 5668d839a..d37f9826b 100644
--- a/src/keri/cli/commands/challenge/verify.py
+++ b/src/keri/cli/commands/challenge/verify.py
@@ -11,8 +11,8 @@
 from hio.base import doing
 from hio.help import ogler
 
-from ....app import (MailboxDirector, Organizer, Signaler,
-                     loadChallengingHandlers)
+from ....app import MailboxDirector, Organizer, Signaler
+from ....app.challenging import loadHandlers
 from ....help import helping
 from ....peer import Exchanger
 
@@ -71,7 +71,7 @@ def __init__(self, name, base, bran, words, generate, strength, out, signer):
         self.org = Organizer(hby=self.hby)
         signaler = Signaler()
 
-        loadChallengingHandlers(db=self.hby.db, signaler=signaler, exc=self.exc)
+        loadHandlers(db=self.hby.db, signaler=signaler, exc=self.exc)
 
         self.mbd = MailboxDirector(hby=self.hby, topics=['/challenge'], exc=self.exc)
 
diff --git a/src/keri/cli/commands/ends/add.py b/src/keri/cli/commands/ends/add.py
index 9f44f9c99..d4ff04ae1 100644
--- a/src/keri/cli/commands/ends/add.py
+++ b/src/keri/cli/commands/ends/add.py
@@ -14,7 +14,8 @@
 from ....kering import Vrsn_1_0, ConfigurationError
 from ....app import (GroupHab, Multiplexor, MailboxDirector,
                      Poster, WitnessPublisher, Notifier,
-                     loadGroupingHandlers, multisigRpyExn)
+                     multisigRpyExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Parser
 from ....peer import Exchanger
@@ -62,7 +63,7 @@ def __init__(self, name, base, alias, bran, role, eid, timestamp=None):
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/replay"], exc=exc)
 
diff --git a/src/keri/cli/commands/ipex/admit.py b/src/keri/cli/commands/ipex/admit.py
index ef69f57b5..cb47764ed 100644
--- a/src/keri/cli/commands/ipex/admit.py
+++ b/src/keri/cli/commands/ipex/admit.py
@@ -13,7 +13,8 @@
 from ....app import (Notifier, Organizer, GroupHab,
                      Multiplexor, MailboxDirector,
                      WitnessInquisitor, StreamPoster,
-                     multisigExn, loadGroupingHandlers)
+                     multisigExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Parser, Sadder, Kevery
 from ....peer import Exchanger, cloneMessage, serializeMessage
@@ -68,7 +69,7 @@ def __init__(self, name, alias, base, bran, said, message, timestamp ):
         mux = Multiplexor(self.hby, notifier=notifier)
 
         self.exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(self.exc, mux)
+        loadHandlers(self.exc, mux)
         loadHandlersProtocoling(self.hby, exc=self.exc, notifier=notifier)
 
         mbx = MailboxDirector(hby=self.hby,
diff --git a/src/keri/cli/commands/ipex/grant.py b/src/keri/cli/commands/ipex/grant.py
index 035dc3620..e1cbf9a9d 100644
--- a/src/keri/cli/commands/ipex/grant.py
+++ b/src/keri/cli/commands/ipex/grant.py
@@ -12,13 +12,14 @@
 from ....kering import Vrsn_1_0
 from ....app import (Notifier, StreamPoster, Organizer,
                      GroupHab, Multiplexor, MailboxDirector,
-                     serialize, multisigExn, loadGroupingHandlers)
+                     serialize, multisigExn)
+from ....app.grouping import loadHandlers as loadGroupingHandlers
 
 from ....core import coring, parsing, serdering
 from ....peer import exchanging
 
 from ....vc import ipexGrantExn
-from ....vc.protocoling import loadHandlers as loadHandlersProtocoling
+from ....vc.protocoling import loadHandlers as loadProtocolingHandlers
 
 from ....vdr import credentialing
 
@@ -66,7 +67,7 @@ def __init__(self, name, alias, base, bran, said, recp, message, timestamp):
 
         self.exc = exchanging.Exchanger(hby=self.hby, handlers=[])
         loadGroupingHandlers(self.exc, mux)
-        loadHandlersProtocoling(self.hby, exc=self.exc, notifier=notifier)
+        loadProtocolingHandlers(self.hby, exc=self.exc, notifier=notifier)
 
         mbx = MailboxDirector(hby=self.hby,
                               topics=["/receipt", "/multisig", "/replay", "/credential"],
diff --git a/src/keri/cli/commands/ipex/join.py b/src/keri/cli/commands/ipex/join.py
index e3e33ec94..6509d35f7 100644
--- a/src/keri/cli/commands/ipex/join.py
+++ b/src/keri/cli/commands/ipex/join.py
@@ -15,7 +15,8 @@
 from .... import Vrsn_1_0
 from ....app import (HaberyDoer, MailboxDirector, WitnessInquisitor,
                      Notifier, Multiplexor, Organizer,
-                     Counselor, Poster, loadGroupingHandlers, multisigExn)
+                     Counselor, Poster, multisigExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Parser, Revery, SerderKERI, Sadder
 from ....peer import Exchanger, cloneMessage, serializeMessage
@@ -76,7 +77,7 @@ def __init__(self, name, base, bran, auto=False):
                                   version=Vrsn_1_0)
 
         mux = Multiplexor(hby=self.hby, notifier=self.notifier)
-        loadGroupingHandlers(exc=self.exc, mux=mux)
+        loadHandlers(exc=self.exc, mux=mux)
         self.counselor = Counselor(hby=self.hby)
 
         self.registrar = Registrar(hby=self.hby, rgy=self.rgy, counselor=self.counselor)
diff --git a/src/keri/cli/commands/ipex/spurn.py b/src/keri/cli/commands/ipex/spurn.py
index c2c3be1aa..af9bd6cf9 100644
--- a/src/keri/cli/commands/ipex/spurn.py
+++ b/src/keri/cli/commands/ipex/spurn.py
@@ -13,7 +13,8 @@
 from ....kering import Vrsn_1_0
 from ....app import (Notifier, StreamPoster, Organizer,
                      GroupHab, Multiplexor, MailboxDirector,
-                     multisigExn, loadGroupingHandlers)
+                     multisigExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Kevery, Parser
 from ....peer import Exchanger, cloneMessage
@@ -63,7 +64,7 @@ def __init__(self, name, alias, base, bran, said, message):
         mux = Multiplexor(self.hby, notifier=notifier)
 
         self.exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(self.exc, mux)
+        loadHandlers(self.exc, mux)
         loadHandlersProtocoling(self.hby, exc=self.exc, notifier=notifier)
 
         mbx = MailboxDirector(hby=self.hby,
diff --git a/src/keri/cli/commands/location/add.py b/src/keri/cli/commands/location/add.py
index b93cf045b..5bae60685 100644
--- a/src/keri/cli/commands/location/add.py
+++ b/src/keri/cli/commands/location/add.py
@@ -17,7 +17,8 @@
 
 from ....app import (GroupHab, Multiplexor, indirecting,
                      forwarding, WitnessPublisher, Notifier,
-                     loadGroupingHandlers, multisigRpyExn)
+                     multisigRpyExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Parser
 from ....peer import Exchanger
@@ -64,7 +65,7 @@ def __init__(self, name, base, alias, bran, url, eid, timestamp=None):
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         mbx = indirecting.MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/replay"], exc=exc)
 
diff --git a/src/keri/cli/commands/multisig/incept.py b/src/keri/cli/commands/multisig/incept.py
index 1ad661204..3c0313a32 100644
--- a/src/keri/cli/commands/multisig/incept.py
+++ b/src/keri/cli/commands/multisig/incept.py
@@ -17,7 +17,8 @@
 from ....kering import ConfigurationError
 from ....app import (Notifier, MailboxDirector, Multiplexor,
                      Counselor, HaberyDoer, Poster,
-                     loadGroupingHandlers, multisigInceptExn)
+                     multisigInceptExn)
+from ....app.grouping import loadHandlers
 from ...common import Parsery, setupHby, printIdentifier
 from ....core import Prefixer, Number, Diger
 from ....peer import Exchanger
@@ -90,7 +91,7 @@ def __init__(self, name, base, alias, bran, group, wait, **kwa):
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         self.mbx = MailboxDirector(hby=self.hby, topics=topics, exc=exc)
         self.counselor = Counselor(hby=self.hby)
diff --git a/src/keri/cli/commands/multisig/interact.py b/src/keri/cli/commands/multisig/interact.py
index 9c71b2c91..e56b75753 100644
--- a/src/keri/cli/commands/multisig/interact.py
+++ b/src/keri/cli/commands/multisig/interact.py
@@ -15,7 +15,8 @@
 from ....kering import ConfigurationError
 from ....app import (Notifier, Multiplexor, Counselor,
                      MailboxDirector, HaberyDoer, Poster,
-                     loadGroupingHandlers, multisigInteractExn)
+                     multisigInteractExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Prefixer, Number, Diger, SerderKERI
 from ....peer import Exchanger
@@ -79,7 +80,7 @@ def __init__(self, name, alias, aids, base, bran, data):
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         mbd = MailboxDirector(hby=self.hby, topics=['/receipt', '/multisig'], exc=exc)
         self.counselor = Counselor(hby=self.hby)
diff --git a/src/keri/cli/commands/multisig/join.py b/src/keri/cli/commands/multisig/join.py
index efe2376c3..d01c17e93 100644
--- a/src/keri/cli/commands/multisig/join.py
+++ b/src/keri/cli/commands/multisig/join.py
@@ -20,7 +20,8 @@
                      Notifier, Multiplexor, Counselor, Organizer, Poster,
                      multisigInceptExn, multisigInteractExn, multisigRotateExn,
                      multisigRpyExn, multisigRegistryInceptExn, multisigIssueExn,
-                     multisigRevokeExn, loadGroupingHandlers)
+                     multisigRevokeExn)
+from ....app.grouping import loadHandlers
 
 from ....core import (Prefixer, Number, Diger, Tholder,
                       Schemer, Parser, Revery, SerderKERI,
@@ -89,7 +90,7 @@ def __init__(self, name, base, bran, group, auto=False):
                           version=Vrsn_1_0)
 
         mux = Multiplexor(hby=self.hby, notifier=self.notifier)
-        loadGroupingHandlers(exc=self.exc, mux=mux)
+        loadHandlers(exc=self.exc, mux=mux)
         self.counselor = Counselor(hby=self.hby)
 
         self.registrar = Registrar(hby=self.hby, rgy=self.rgy, counselor=self.counselor)
diff --git a/src/keri/cli/commands/multisig/rotate.py b/src/keri/cli/commands/multisig/rotate.py
index e0808c5fa..0e4d4a4f5 100644
--- a/src/keri/cli/commands/multisig/rotate.py
+++ b/src/keri/cli/commands/multisig/rotate.py
@@ -16,7 +16,8 @@
 from ....kering import ConfigurationError
 from ....app import (Notifier, Multiplexor, Counselor,
                      MailboxDirector, HaberyDoer, Poster,
-                     loadGroupingHandlers, multisigRotateExn)
+                     multisigRotateExn)
+from ....app.grouping import loadHandlers
 
 from ....core import Prefixer, Number, Diger, SerderKERI
 from ....db import dgKey
@@ -90,7 +91,7 @@ def __init__(self, hby, alias, smids=None, rmids=None, isith=None, nsith=None,
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         mbd = MailboxDirector(hby=self.hby, topics=['/receipt', '/multisig', '/replay'], exc=exc)
         self.counselor = Counselor(hby=self.hby)
diff --git a/src/keri/cli/commands/vc/create.py b/src/keri/cli/commands/vc/create.py
index 55531d7e0..a53d12910 100644
--- a/src/keri/cli/commands/vc/create.py
+++ b/src/keri/cli/commands/vc/create.py
@@ -12,7 +12,8 @@
 
 from ....app import (MailboxDirector, HaberyDoer, GroupHab, Counselor,
                      Multiplexor, Organizer, Poster, Notifier,
-                     serialize, loadGroupingHandlers, multisigIssueExn)
+                     serialize, multisigIssueExn)
+from ....app.grouping import loadHandlers
 
 from ....core import (Prefixer, Number, Diger, SealEvent,
                       SerderKERI, SerderACDC, NumDex)
@@ -162,7 +163,7 @@ def __init__(self, name, alias, base, bran, registryName=None, schema=None, edge
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         self.verifier = Verifier(hby=self.hby, reger=self.rgy.reger)
         mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/credential"],
diff --git a/src/keri/cli/commands/vc/registry/incept.py b/src/keri/cli/commands/vc/registry/incept.py
index cd3017bd4..3a0f160d9 100644
--- a/src/keri/cli/commands/vc/registry/incept.py
+++ b/src/keri/cli/commands/vc/registry/incept.py
@@ -7,7 +7,8 @@
 
 from .....app import (GroupHab, Notifier, MailboxDirector,
                       HaberyDoer, Multiplexor, Counselor,
-                      Poster, loadGroupingHandlers, multisigRegistryInceptExn)
+                      Poster, multisigRegistryInceptExn)
+from .....app.grouping import loadHandlers
 
 from .....core import SerderKERI, SealEvent
 from .....peer import Exchanger
@@ -103,7 +104,7 @@ def __init__(self, name, base, alias, bran, registryName, nonce, estOnly, noBack
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/replay"], exc=exc)
         self.registrar = Registrar(hby=self.hby, rgy=self.rgy, counselor=counselor)
diff --git a/src/keri/cli/commands/vc/revoke.py b/src/keri/cli/commands/vc/revoke.py
index c6a61b9e1..7dc2a50f1 100644
--- a/src/keri/cli/commands/vc/revoke.py
+++ b/src/keri/cli/commands/vc/revoke.py
@@ -12,7 +12,8 @@
 from ....kering import ValidationError, Ilks
 from ....app import (MailboxDirector, HaberyDoer, Counselor,
                      Multiplexor, Poster, Organizer, Notifier,
-                     GroupHab, multisigRevokeExn, loadGroupingHandlers)
+                     GroupHab, multisigRevokeExn)
+from ....app.grouping import loadHandlers
 
 from ....core import SealEvent, Seqner, SerderKERI
 from ....peer import Exchanger
@@ -60,7 +61,7 @@ def __init__(self, name, alias, said, base, bran, registryName, send, timestamp,
         notifier = Notifier(self.hby)
         mux = Multiplexor(self.hby, notifier=notifier)
         exc = Exchanger(hby=self.hby, handlers=[])
-        loadGroupingHandlers(exc, mux)
+        loadHandlers(exc, mux)
 
         mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/credential"],
                               verifier=self.verifier, exc=exc)
diff --git a/src/keri/end/__init__.py b/src/keri/end/__init__.py
index ba449a2e5..400f6610f 100644
--- a/src/keri/end/__init__.py
+++ b/src/keri/end/__init__.py
@@ -10,7 +10,7 @@
 from .ending import (Signage, Inputage, signature,
                      designature, normalize, siginput,
                      desiginput, PointEnd, LocationEnd,
-                     AdminEnd, OOBIEnd, loadEndingEnds, setup,
+                     AdminEnd, OOBIEnd, loadEnds, setup,
                      OOBI_RE, DOOBI_RE, Mimes, KeriMimes,
                      WOOBI_RE, OOBI_AID_HEADER)
 from .priming import parseArgs
diff --git a/src/keri/end/ending.py b/src/keri/end/ending.py
index d3fde3888..b9b7f0208 100644
--- a/src/keri/end/ending.py
+++ b/src/keri/end/ending.py
@@ -21,7 +21,7 @@
 from hio.help import ogler
 
 from ..kering import Roles, Schemes
-from ..app.habbing import Habery, HaberyDoer
+
 from ..core import Cigar, Siger
 from ..help import helping
 
@@ -544,7 +544,7 @@ class OOBIEnd:
 
     """
 
-    def __init__(self, hby: Habery, default=None):
+    def __init__(self, hby, default=None):
         """  End point for responding to OOBIs
 
         Parameters:
@@ -622,7 +622,7 @@ def on_get(self, req, rep, aid=None, role=None, eid=None):
 STATIC_DIR_PATH = os.path.join(WEB_DIR_PATH, 'static')
 
 
-def loadEndingEnds(app, hby, *, tymth=None, default=None, static=False):
+def loadEnds(app, hby, *, tymth=None, default=None, static=False):
     """
     Load endpoints for app with shared resource dependencies
     This function provides the endpoint resource instances
@@ -663,6 +663,9 @@ def setup(name="who", temp=False, tymth=None, isith=None, count=1,
     """
     Setup and return doers list to run controller
     """
+
+    from ..app.habbing import Habery, HaberyDoer
+
     # setup habery with resources
     hby = Habery(name=name, base="endo", temp=True, free=True)
     hbyDoer = HaberyDoer(habery=hby)  # setup doer
@@ -684,7 +687,7 @@ def setup(name="who", temp=False, tymth=None, isith=None, count=1,
 
     # must do it here to inject into Falcon endpoint resource instances
     myapp = falcon.App(cors_enable=True)  # falcon.App instances are callable WSGI apps
-    loadEndingEnds(myapp, tymth=tymth, hby=hby)
+    loadEnds(myapp, tymth=tymth, hby=hby)
 
     webServer = http.Server(name="keri.wsgi.server", app=myapp, port=webPort, wl=wl)
     webServerDoer = http.ServerDoer(server=webServer)
diff --git a/tests/app/test_grouping.py b/tests/app/test_grouping.py
index 0679face5..b0a5daa81 100644
--- a/tests/app/test_grouping.py
+++ b/tests/app/test_grouping.py
@@ -9,7 +9,9 @@
 from keri.app import (Notifier, Counselor, Multiplexor,
                       openHab, multisigInceptExn,
                       multisigRotateExn, multisigInteractExn,
-                      multisigRegistryInceptExn, loadGroupingHandlers)
+                      multisigRegistryInceptExn)
+
+from keri.app.grouping import loadHandlers
 
 from keri.core import (Prefixer, Number, Diger, Kevery,
                        Parser, SerderKERI, Counter,
@@ -717,7 +719,7 @@ def test_multisig_incept_handler(mockHelpingNowUTC):
         notifier = Notifier(hby=hby)
         mux = Multiplexor(hby=hby, notifier=notifier)
         exc = Exchanger(hby=hby, handlers=[])
-        loadGroupingHandlers(exc=exc, mux=mux)
+        loadHandlers(exc=exc, mux=mux)
 
         ims = bytearray(exn.raw)
         ims.extend(atc)
@@ -739,7 +741,7 @@ def test_multisig_rotate_handler(mockHelpingNowUTC):
         notifier = Notifier(hby=hby1)
         mux = Multiplexor(hby=hby1, notifier=notifier)
         exc = Exchanger(hby=hby1, handlers=[])
-        loadGroupingHandlers(exc=exc, mux=mux)
+        loadHandlers(exc=exc, mux=mux)
 
         # create and send message from ghab2
         exn, atc = multisigRotateExn(ghab=ghab2, smids=ghab1.smids, rmids=ghab1.rmids,
@@ -786,7 +788,7 @@ def test_multisig_interact_handler(mockHelpingNowUTC):
         notifier = Notifier(hby=hby1)
         mux = Multiplexor(hby=hby1, notifier=notifier)
         exc = Exchanger(hby=hby1, handlers=[])
-        loadGroupingHandlers(exc=exc, mux=mux)
+        loadHandlers(exc=exc, mux=mux)
 
         ims = bytearray(exn.raw)
         ims.extend(atc)
diff --git a/tests/app/test_oobiing.py b/tests/app/test_oobiing.py
index 472e71f13..b9f7ec0e9 100644
--- a/tests/app/test_oobiing.py
+++ b/tests/app/test_oobiing.py
@@ -11,12 +11,14 @@
 from keri.kering import Vrsn_1_0, Roles, Schemes
 from keri.app import (Notifier, Oobiery, Authenticator,
                       Result, openHab, openHby,
-                      loadOobiingHandlers, oobiRequestExn, loadOobiingEnds)
+                      oobiRequestExn)
+from keri.app.oobiing import (loadHandlers as loadOobiingHandlers,
+                              loadEnds as loadOobiingEnds)
 
 from keri.core import (SerderKERI, Kevery, Parser,
                        Salter, Router, Revery)
 
-from keri.end import loadEndingEnds
+from keri.end.ending import loadEnds as loadEndingEnds
 from keri.help import helping
 from keri.peer import Exchanger
 from keri.recording import OobiRecord
diff --git a/tests/app/test_signaling.py b/tests/app/test_signaling.py
index e6925682c..c4e9a3821 100644
--- a/tests/app/test_signaling.py
+++ b/tests/app/test_signaling.py
@@ -10,7 +10,8 @@
 from falcon import testing
 from hio.base import doing, tyming
 
-from keri.app import Signal, Signaler, SignalIterable, loadSignalingEnds, signal
+from keri.app import Signal, Signaler, SignalIterable, signal
+from keri.app.signaling import loadEnds
 from keri.help import helping
 
 
@@ -113,7 +114,7 @@ def test_signal_ends():
     rid0 = signaler.signals[0].rid
     rid1 = signaler.signals[1].rid
 
-    _ = loadSignalingEnds(app, signals=signaler.signals)
+    _ = loadEnds(app, signals=signaler.signals)
 
     client = testing.TestClient(app)
     result = client.simulate_get(path="/mbx")
diff --git a/tests/end/test_ending.py b/tests/end/test_ending.py
index e71e30900..cdd36f030 100644
--- a/tests/end/test_ending.py
+++ b/tests/end/test_ending.py
@@ -19,9 +19,10 @@
 from keri.core import Salter, SerderKERI, dumps
 from keri.app import openHby, openHab
 from keri.end import (Signage, Mimes, KeriMimes,
-                      signature, designature, loadEndingEnds,
+                      signature, designature,
                       desiginput, normalize, setup)
-from keri.end.ending import siginput as sigInputEnding
+from keri.end.ending import (siginput as sigInputEnding,
+                             loadEnds)
 
 logger = ogler.getLogger()
 
@@ -234,7 +235,7 @@ def test_get_static_sink():
     tymist = tyming.Tymist(tyme=0.0)
 
     myapp = falcon.App()  # falcon.App instances are callable WSGI apps
-    loadEndingEnds(myapp, hby=None, tymth=tymist.tymen(), static=True)
+    loadEnds(myapp, hby=None, tymth=tymist.tymen(), static=True)
 
     client = testing.TestClient(app=myapp)
 
@@ -334,7 +335,7 @@ def test_seid_api():
         tymist = tyming.Tymist(tyme=0.0)
 
         app = falcon.App()  # falcon.App instances are callable WSGI apps
-        loadEndingEnds(app, tymth=tymist.tymen(), hby=hby)
+        loadEnds(app, tymth=tymist.tymen(), hby=hby)
 
         client = testing.TestClient(app=app)
 
@@ -404,7 +405,7 @@ def test_get_admin():
     tymist = tyming.Tymist(tyme=0.0)
 
     myapp = falcon.App()  # falcon.App instances are callable WSGI apps
-    loadEndingEnds(myapp, tymth=tymist.tymen(), hby=hby)
+    loadEnds(myapp, tymth=tymist.tymen(), hby=hby)
 
     client = testing.TestClient(app=myapp)
 
@@ -438,7 +439,7 @@ def test_get_oobi():
         tymist = tyming.Tymist(tyme=0.0)
 
         app = falcon.App()  # falcon.App instances are callable WSGI apps
-        loadEndingEnds(app, tymth=tymist.tymen(), hby=hby, default=hab.pre)
+        loadEnds(app, tymth=tymist.tymen(), hby=hby, default=hab.pre)
 
         client = testing.TestClient(app=app)
 
@@ -470,7 +471,7 @@ def test_get_oobi():
         tymist = tyming.Tymist(tyme=0.0)
 
         app = falcon.App()  # falcon.App instances are callable WSGI apps
-        loadEndingEnds(app, tymth=tymist.tymen(), hby=hby, default=hab.pre)
+        loadEnds(app, tymth=tymist.tymen(), hby=hby, default=hab.pre)
 
         client = testing.TestClient(app=app)