diff --git a/app/ai/agent_loop.py b/app/ai/agent_loop.py
index c9cf5bb..c3c3197 100644
--- a/app/ai/agent_loop.py
+++ b/app/ai/agent_loop.py
@@ -495,7 +495,7 @@ async def run_react_loop(
                     if agent_run_id:
                         try:
                             from app.plugins.builtins.contracts import get_contract_registry
-                            komm = get_contract_registry().get("kommunikation")
+                            komm = get_contract_registry().get_contract("kommunikation")
                             if komm:
                                 agent_id = getattr(agent_definition, "id", uuid.uuid4())
                                 room_title = f"Agent: {getattr(agent_definition, 'name', 'Agent')}"
diff --git a/app/ai/miniapp_tools.py b/app/ai/miniapp_tools.py
index 2dcf6dc..6fd1e9e 100644
--- a/app/ai/miniapp_tools.py
+++ b/app/ai/miniapp_tools.py
@@ -23,7 +23,7 @@ def _get_komm_contract() -> Any | None:
     """Resolve the kommunikation contract (None when plugin inactive)."""
     from app.plugins.builtins.contracts import get_contract_registry
 
-    return get_contract_registry().get("kommunikation")
+    return get_contract_registry().get_contract("kommunikation")
 
 
 async def _send_miniapp_handler(arguments: dict[str, Any], context: dict[str, Any]) -> str:
diff --git a/app/plugins/builtins/ai_proactive/services.py b/app/plugins/builtins/ai_proactive/services.py
index 486a964..7dd2881 100644
--- a/app/plugins/builtins/ai_proactive/services.py
+++ b/app/plugins/builtins/ai_proactive/services.py
@@ -75,7 +75,7 @@ async def push_suggestion(user_id: str, suggestion: dict[str, Any]) -> None:
         from app.core.db import get_worker_session_factory
         from app.plugins.builtins.contracts import get_contract_registry
         from app.plugins.builtins.kommunikation.models import CommConversation
-        komm = get_contract_registry().get("kommunikation")
+        komm = get_contract_registry().get_contract("kommunikation")
         if komm:
             factory = get_worker_session_factory()
             async with factory() as db:
diff --git a/app/plugins/builtins/automation/agent_runner.py b/app/plugins/builtins/automation/agent_runner.py
index 41af1d6..642ef5b 100644
--- a/app/plugins/builtins/automation/agent_runner.py
+++ b/app/plugins/builtins/automation/agent_runner.py
@@ -113,7 +113,7 @@ async def run_agent(
             mail_contract = get_contract("mail")
             if mail_contract and hasattr(mail_contract, "Mail"):
                 from sqlalchemy import select as _select
-                Mail = mail_contract.Mail
+                Mail = mail_contract.Mail  # noqa: N806 — class alias
                 async with factory() as db:
                     mail_q = await db.execute(
                         _select(Mail)
@@ -378,7 +378,7 @@ async def run_agent(
     # ── Post agent result to Communication (F-COMM) ──
     try:
         from app.plugins.builtins.contracts import get_contract_registry
-        komm = get_contract_registry().get("kommunikation")
+        komm = get_contract_registry().get_contract("kommunikation")
         if komm:
             async with factory() as db:
                 # Find or create agent conversation room via contract
diff --git a/app/plugins/builtins/report_generator/jobs.py b/app/plugins/builtins/report_generator/jobs.py
index 6110422..1fdf95d 100644
--- a/app/plugins/builtins/report_generator/jobs.py
+++ b/app/plugins/builtins/report_generator/jobs.py
@@ -77,7 +77,7 @@ async def generate_report_job(
     import hashlib
 
     from app.plugins.builtins.contracts import get_contract_registry
-    _dms_contract = get_contract_registry().get("dms")
+    _dms_contract = get_contract_registry().get_contract("dms")
     dms_file = _dms_contract.dms_file
 
     async with create_db_session() as db:
diff --git a/app/workflows/engine.py b/app/workflows/engine.py
index 217ba3b..78e1494 100644
--- a/app/workflows/engine.py
+++ b/app/workflows/engine.py
@@ -92,7 +92,7 @@ class WorkflowEngine:
             # Post workflow completion to Communication (G-WORK)
             try:
                 from app.plugins.builtins.contracts import get_contract_registry
-                komm = get_contract_registry().get("kommunikation")
+                komm = get_contract_registry().get_contract("kommunikation")
                 if komm and instance.initiated_by:
                     room_title = f"Workflow: {workflow.name if hasattr(workflow, 'name') else str(instance.workflow_id)}"
                     conv_id = await komm.find_locked_room_id(