diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml
index 7cacb35a..afb3298e 100644
--- a/.github/workflows/ci-scripts.yml
+++ b/.github/workflows/ci-scripts.yml
@@ -108,6 +108,7 @@ jobs:
           python3 test/test_generate_dependency_report.py
           python3 test/verify_coordinate_map.py
           python3 test/validate_bob_xml.py
+          python3 test/validate_bob_prefix_macros.py
           reuse lint
           git diff --check
 
diff --git a/.gitignore b/.gitignore
index 3a3963fe..3bbb08f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,11 @@ dbd/
 include/
 .vscode/
 TemplateReadme.md
+
+# Python bytecode caches
+__pycache__/
+*.py[cod]
+
 # IOC autosave runtime data (README.md is tracked)
 iocs/tpx3IOC/iocBoot/iocTimePix/autosave/*
 !iocs/tpx3IOC/iocBoot/iocTimePix/autosave/README.md
diff --git a/test/validate_bob_prefix_macros.py b/test/validate_bob_prefix_macros.py
new file mode 100644
index 00000000..5ddf826c
--- /dev/null
+++ b/test/validate_bob_prefix_macros.py
@@ -0,0 +1,179 @@
+#!/usr/bin/env python3
+"""Static regression checks for ADTimePix3 service-prefix inheritance."""
+
+from pathlib import Path
+import sys
+import xml.etree.ElementTree as ET
+
+
+ROOT = Path(__file__).resolve().parents[1]
+BOB_ROOT = ROOT / "tpx3App" / "op" / "bob"
+LEGACY_PREFIXES = ("SERVAL-TEST:", "EMU-TEST:")
+
+CHILD_SCREENS = {
+    BOB_ROOT / "Serval/tpx3serval.bob": ("TPX3-TEST:", "Serval:"),
+    BOB_ROOT / "Emulator/emulator.bob": ("TPX3-TEST:", "Emulator:"),
+    BOB_ROOT / "Emulator/emulator_tpx3_embed.bob": ("TPX3-TEST:", "Emulator:"),
+    BOB_ROOT / "Emulator/emulator_mpx3_embed.bob": ("MPX3-TEST:", "Emulator:"),
+}
+
+ENTRY_SCREENS = {
+    BOB_ROOT / "TimePix3.bob": ("TPX3-TEST:", "profiles/tpx3/main.bob"),
+    BOB_ROOT / "MediPix3.bob": ("MPX3-TEST:", "profiles/mpx3/main.bob"),
+    BOB_ROOT / "MediPix3/MediPix3.bob": ("MPX3-TEST:", "../profiles/mpx3/main.bob"),
+}
+
+LAUNCHERS = {
+    BOB_ROOT / "profiles/tpx3/TimePix3Status.bob": "TPX3-TEST:",
+    BOB_ROOT / "profiles/tpx3/Acquire/DetectorConfig.bob": "TPX3-TEST:",
+    BOB_ROOT / "profiles/mpx3/Mpx3Status.bob": "MPX3-TEST:",
+    BOB_ROOT / "profiles/mpx3/Detector/Mpx3DetectorConfig.bob": "MPX3-TEST:",
+}
+
+TARGETS = {
+    "emulator.bob": "Emulator:",
+    "tpx3serval.bob": "Serval:",
+}
+
+STANDALONE_DEFAULT_SCREENS = {
+    BOB_ROOT / "Events/tpx3RawStream.bob",
+}
+
+
+def relative(path: Path) -> str:
+    return str(path.relative_to(ROOT))
+
+
+def main() -> int:
+    errors: list[str] = []
+    parsed: dict[Path, ET.Element] = {}
+    allowed_default_screens = (
+        set(CHILD_SCREENS)
+        | set(ENTRY_SCREENS)
+        | set(LAUNCHERS)
+        | STANDALONE_DEFAULT_SCREENS
+    )
+
+    for path in sorted(BOB_ROOT.rglob("*.bob")):
+        text = path.read_text(encoding="utf-8")
+        for prefix in LEGACY_PREFIXES:
+            if prefix in text:
+                errors.append(f"{relative(path)}: obsolete prefix {prefix}")
+        if "$(P=" in text and path not in allowed_default_screens:
+            errors.append(
+                f"{relative(path)}: P fallback belongs at a display boundary, "
+                "not in an ordinary embedded panel"
+            )
+        try:
+            parsed[path] = ET.fromstring(text)
+        except ET.ParseError as exc:
+            errors.append(f"{relative(path)}: invalid XML: {exc}")
+
+    for path, (fallback, service_r) in CHILD_SCREENS.items():
+        root = parsed.get(path)
+        if root is None:
+            errors.append(f"{relative(path)}: child screen was not parsed")
+            continue
+
+        if root.find("./macros/P") is not None:
+            errors.append(f"{relative(path)}: display-level P overrides callers")
+        if root.findtext("./macros/R") != service_r:
+            errors.append(f"{relative(path)}: expected display-level R={service_r}")
+
+        expected = f"$(P={fallback})$(R)"
+        pv_names = [node.text or "" for node in root.iter("pv_name")]
+        if not any(expected in value for value in pv_names):
+            errors.append(f"{relative(path)}: missing fallback {fallback}")
+        for value in pv_names:
+            if "$(P" in value and expected not in value:
+                errors.append(
+                    f"{relative(path)}: unexpected P expression in PV {value!r}"
+                )
+
+    for path, (fallback, profile_file) in ENTRY_SCREENS.items():
+        root = parsed.get(path)
+        if root is None:
+            errors.append(f"{relative(path)}: entry screen was not parsed")
+            continue
+
+        if root.find("./macros/P") is not None or root.find("./macros/R") is not None:
+            errors.append(f"{relative(path)}: display-level P/R overrides callers")
+
+        embedded = next(
+            (
+                widget
+                for widget in root.findall("./widget[@type='embedded']")
+                if widget.findtext("file") == profile_file
+            ),
+            None,
+        )
+        if embedded is None:
+            errors.append(f"{relative(path)}: missing embedded profile {profile_file}")
+            continue
+
+        expected_p = f"$(P={fallback})"
+        actual_p = embedded.findtext("macros/P")
+        actual_r = embedded.findtext("macros/R")
+        if actual_p != expected_p:
+            errors.append(
+                f"{relative(path)}: embedded profile passes P={actual_p!r}, "
+                f"expected {expected_p!r}"
+            )
+        if actual_r != "$(R=cam1:)":
+            errors.append(
+                f"{relative(path)}: embedded profile passes R={actual_r!r}, "
+                "expected '$(R=cam1:)'"
+            )
+
+    action_count = 0
+    for path, root in parsed.items():
+        for action in root.findall(".//action[@type='open_display']"):
+            target_file = action.findtext("file") or ""
+            matching_target = next(
+                (target for target in TARGETS if target_file.endswith(target)), None
+            )
+            if matching_target is None:
+                continue
+
+            action_count += 1
+            fallback = LAUNCHERS.get(path)
+            if fallback is None:
+                errors.append(
+                    f"{relative(path)}: unclassified launcher action for {target_file}"
+                )
+                continue
+
+            expected_p = f"$(P={fallback})"
+            expected_r = TARGETS[matching_target]
+            actual_p = action.findtext("macros/P")
+            actual_r = action.findtext("macros/R")
+            if actual_p != expected_p:
+                errors.append(
+                    f"{relative(path)}: {target_file} passes P={actual_p!r}, "
+                    f"expected {expected_p!r}"
+                )
+            if actual_r != expected_r:
+                errors.append(
+                    f"{relative(path)}: {target_file} passes R={actual_r!r}, "
+                    f"expected {expected_r!r}"
+                )
+
+    if action_count != 8:
+        errors.append(f"expected 8 Serval/emulator launcher actions, found {action_count}")
+
+    if errors:
+        print("ADTimePix3 screen checks failed:", file=sys.stderr)
+        for error in errors:
+            print(f"- {error}", file=sys.stderr)
+        return 1
+
+    print(
+        f"Validated {len(parsed)} BOB files, {len(ENTRY_SCREENS)} entry screens, "
+        f"{len(CHILD_SCREENS)} child screens, and {action_count} "
+        "Serval/emulator launcher actions."
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tpx3App/op/bob/Emulator/README.md b/tpx3App/op/bob/Emulator/README.md
index d9c57468..b74babf6 100644
--- a/tpx3App/op/bob/Emulator/README.md
+++ b/tpx3App/op/bob/Emulator/README.md
@@ -16,13 +16,13 @@ This directory contains Phoebus **Display Builder** (`.bob`) screens for the **m
 See the `.bob` files for exact widget placement. Logical sections:
 
 ### 1. Main Control Section (Top)
-- **Start/Stop Slide Button**: Controls the TPX3 emulator process (connected to `$(P)$(R)START` PV)
-- **Status LED**: Visual indicator showing if the process is running (green) or stopped (red) (connected to `$(P)$(R)STATUS` PV)
-- **Process ID Display**: Shows the current process ID when running (connected to `$(P)$(R)PROCESS_ID` PV)
-- **Error Message Display**: Shows any error messages or status updates (connected to `$(P)$(R)ERROR_MSG` PV)
+- **Start/Stop Slide Button**: Controls the TPX3 emulator process (connected to `$(P=TPX3-TEST:)$(R)START` PV)
+- **Status LED**: Visual indicator showing if the process is running (green) or stopped (red) (connected to `$(P=TPX3-TEST:)$(R)STATUS` PV)
+- **Process ID Display**: Shows the current process ID when running (connected to `$(P=TPX3-TEST:)$(R)PROCESS_ID` PV)
+- **Error Message Display**: Shows any error messages or status updates (connected to `$(P=TPX3-TEST:)$(R)ERROR_MSG` PV)
 
 ### 2. Shell configuration ( **`emulator.bob`** )
-- **`EMULATOR_TYPE`**: Choosing 0 vs 1 toggles visibility of the two embedded `.bob` files (rules use `$(P)$(R)EMULATOR_TYPE`; keep `$(P)` defined when launching the screen).
+- **`EMULATOR_TYPE`**: Choosing 0 vs 1 toggles visibility of the two embedded `.bob` files. The shell uses `$(P=TPX3-TEST:)$(R)EMULATOR_TYPE`, so caller-provided `P` wins and a direct open uses the TPX3 test fallback.
 - **Firmware / network**: Shared widgets on the shell (same PVs as the IOC DB).
 - **Embedded Timepix3 panel**: Hit rate, TDC, chipboard, JVM `-DchipMask`, and all raw replay widgets — see **`emulator_tpx3_embed.bob`**.
 - **Embedded Medipix3 panel**: MPX CLI options — see **`emulator_mpx3_embed.bob`**.
@@ -31,7 +31,7 @@ See the `.bob` files for exact widget placement. Logical sections:
 - **JAR**, **`-Xmx`**, **`-DcmdPort`**: Applicable to both emulator JAR types; replay controls are **not** here anymore (they are on the TPX embed).
 
 ### 4. Command line (bottom)
-- **Generated Command Line**: Shows the complete Java command that will be executed (connected to `$(P)$(R)COMMAND_LINE` PV)
+- **Generated Command Line**: Shows the complete Java command that will be executed (connected to `$(P=TPX3-TEST:)$(R)COMMAND_LINE` PV)
 - **Real-time Updates**: Updates automatically as parameters are changed
 
 ## Supported Widget Types
@@ -79,15 +79,14 @@ The display uses the following Phoebus Display Builder compatible widgets:
 
 ## PV Naming Convention
 
-The display uses the standard EPICS PV naming convention with predefined macros:
-- **Prefix**: `$(P)` = `EMU-TEST:` (dedicated emulator service; not the camera `TPX3-TEST:` / `MPX3-TEST:` prefix)
+The displays use the standard EPICS PV naming convention with caller-overridable macros:
+- **Prefix**: `emulator.bob` and `emulator_tpx3_embed.bob` use `$(P=TPX3-TEST:)`; `emulator_mpx3_embed.bob` uses `$(P=MPX3-TEST:)`
 - **Record**: `$(R)` = `Emulator:`
-- **Example**: The START PV becomes `EMU-TEST:Emulator:START`
+- **Example**: The TPX3 lab-default START PV is `TPX3-TEST:Emulator:START`
 
-Lab default matches `/epics/iocs/emulator/iocBoot/ioctpx3emulator/st.cmd` (`Sys=EMU-TEST:`).
-Beamline override: open with `P=EMU-$(BL):` (e.g. `EMU-BL7:`) and set the IOC `Sys` to the same value.
-**Do not inherit camera `P`** — Phoebus caller macros override display defaults, so every Emulator
-`open_display` action should pass `P`/`R` explicitly.
+No source screen defines a display-level `P`, because that would override `P` inherited from an upper beamline screen. Opening a source screen directly uses its detector-specific fallback; opening it from an upper screen uses the caller-provided `P`. `R=Emulator:` remains defined at display level.
+
+The IOC is configured independently with `DETECTOR_PREFIX`, which defaults to `TPX3-TEST:` in `iocBoot/ioctpx3emulator/st.cmd`. For beamline use, set `DETECTOR_PREFIX` to the corresponding ADTimePix3 IOC's system prefix and pass that same value as `P` from the upper screen.
 
 Sync source of truth: `/epics/iocs/emulator/tpx3emulatorApp/op/bob/` → this directory.
 
@@ -129,7 +128,7 @@ Sync source of truth: `/epics/iocs/emulator/tpx3emulatorApp/op/bob/` → this di
 
 ### **PVs Not Connecting**
 - Verify EPICS Channel Access is working
-- Check that macros `$(P)` and `$(R)` are properly defined
+- Check that caller macro `P`, or the appropriate TPX3/MPX3 fallback, matches the IOC's `DETECTOR_PREFIX`; `R` should remain `Emulator:`
 - Ensure the IOC is running and accessible
 
 ### **Text Not Updating**
diff --git a/tpx3App/op/bob/Emulator/emulator.bob b/tpx3App/op/bob/Emulator/emulator.bob
index 3278cd3a..83ed12f5 100644
--- a/tpx3App/op/bob/Emulator/emulator.bob
+++ b/tpx3App/op/bob/Emulator/emulator.bob
@@ -2,7 +2,6 @@
 <display version="2.0.0">
   <name>tpx3Emulator</name>
   <macros>
-    <P>EMU-TEST:</P>
     <R>Emulator:</R>
   </macros>
   <width>1150</width>
@@ -51,7 +50,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>StartStopButton</name>
-        <pv_name>$(P)$(R)START</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)START</pv_name>
         <label>Start/Stop</label>
         <x>20</x>
         <y>40</y>
@@ -60,7 +59,7 @@
       </widget>
       <widget type="led" version="2.0.0">
         <name>StatusLED</name>
-        <pv_name>$(P)$(R)STATUS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)STATUS</pv_name>
         <x>160</x>
         <y>40</y>
         <width>30</width>
@@ -81,7 +80,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>ErrorMessageDisplay</name>
-        <pv_name>$(P)$(R)ERROR_MSG</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)ERROR_MSG</pv_name>
         <x>540</x>
         <y>40</y>
         <width>400</width>
@@ -96,7 +95,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update</name>
-        <pv_name>$(P)$(R)PROCESS_ID</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)PROCESS_ID</pv_name>
         <x>300</x>
         <y>40</y>
         <width>120</width>
@@ -135,7 +134,7 @@
       </widget>
       <widget type="combo" version="2.0.0">
         <name>EmulatorTypeCombo</name>
-        <pv_name>$(P)$(R)EMULATOR_TYPE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)EMULATOR_TYPE</pv_name>
         <x>140</x>
         <y>36</y>
         <height>22</height>
@@ -165,7 +164,7 @@
         </widget>
         <widget type="spinner" version="2.0.0">
           <name>FirmwareSpinner</name>
-          <pv_name>$(P)$(R)FIRMWARE_VERSION</pv_name>
+          <pv_name>$(P=TPX3-TEST:)$(R)FIRMWARE_VERSION</pv_name>
           <x>20</x>
           <y>35</y>
           <width>150</width>
@@ -173,7 +172,7 @@
         </widget>
         <widget type="slide_button" version="2.0.0">
           <name>FirmwareEnable</name>
-          <pv_name>$(P)$(R)FIRMWARE_VERSION_ENABLE</pv_name>
+          <pv_name>$(P=TPX3-TEST:)$(R)FIRMWARE_VERSION_ENABLE</pv_name>
           <label>Enable</label>
           <x>160</x>
         </widget>
@@ -198,7 +197,7 @@
         </widget>
         <widget type="spinner" version="2.0.0">
           <name>NetworkSpinner</name>
-          <pv_name>$(P)$(R)NETWORK</pv_name>
+          <pv_name>$(P=TPX3-TEST:)$(R)NETWORK</pv_name>
           <x>20</x>
           <y>35</y>
           <width>150</width>
@@ -206,7 +205,7 @@
         </widget>
         <widget type="slide_button" version="2.0.0">
           <name>NetworkEnable</name>
-          <pv_name>$(P)$(R)NETWORK_ENABLE</pv_name>
+          <pv_name>$(P=TPX3-TEST:)$(R)NETWORK_ENABLE</pv_name>
           <label>Enable</label>
           <x>200</x>
           <width>80</width>
@@ -229,7 +228,7 @@
             <exp bool_exp="pv0==0">
               <value>true</value>
             </exp>
-            <pv_name>$(P)$(R)EMULATOR_TYPE</pv_name>
+            <pv_name>$(P=TPX3-TEST:)$(R)EMULATOR_TYPE</pv_name>
           </rule>
         </rules>
       </widget>
@@ -250,7 +249,7 @@
             <exp bool_exp="pv0==1">
               <value>true</value>
             </exp>
-            <pv_name>$(P)$(R)EMULATOR_TYPE</pv_name>
+            <pv_name>$(P=TPX3-TEST:)$(R)EMULATOR_TYPE</pv_name>
           </rule>
         </rules>
       </widget>
@@ -286,7 +285,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>JarFileNameInput</name>
-        <pv_name>$(P)$(R)JarFileName</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JarFileName</pv_name>
         <x>180</x>
         <y>40</y>
         <width>730</width>
@@ -294,14 +293,14 @@
       </widget>
       <widget type="fileselector" version="2.0.0">
         <name>JarFileSelector</name>
-        <pv_name>$(P)$(R)JarFileName</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JarFileName</pv_name>
         <x>920</x>
         <y>35</y>
         <height>30</height>
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>JarFileEnable</name>
-        <pv_name>$(P)$(R)JAR_FILE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JAR_FILE_ENABLE</pv_name>
         <label>Enable</label>
         <x>980</x>
         <y>35</y>
@@ -315,7 +314,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>JarFileRBV</name>
-        <pv_name>$(P)$(R)JarFile_RBV</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JarFile_RBV</pv_name>
         <x>180</x>
         <y>70</y>
         <width>880</width>
@@ -330,14 +329,14 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>JavaXmxEntry</name>
-        <pv_name>$(P)$(R)JAVA_XMX</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JAVA_XMX</pv_name>
         <x>180</x>
         <y>100</y>
         <format>6</format>
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>JavaXmxEnable</name>
-        <pv_name>$(P)$(R)JAVA_XMX_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JAVA_XMX_ENABLE</pv_name>
         <label>Enable</label>
         <x>290</x>
         <y>95</y>
@@ -351,7 +350,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>CmdPort</name>
-        <pv_name>$(P)$(R)CMD_PORT</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)CMD_PORT</pv_name>
         <x>180</x>
         <y>130</y>
         <minimum>1.0</minimum>
@@ -359,7 +358,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>CmdPortEnable</name>
-        <pv_name>$(P)$(R)CMD_PORT_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)CMD_PORT_ENABLE</pv_name>
         <label>Enable</label>
         <x>290</x>
         <y>125</y>
@@ -389,7 +388,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>CommandLineDisplay</name>
-        <pv_name>$(P)$(R)COMMAND_LINE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)COMMAND_LINE</pv_name>
         <x>20</x>
         <y>40</y>
         <width>1040</width>
diff --git a/tpx3App/op/bob/Emulator/emulator_mpx3_embed.bob b/tpx3App/op/bob/Emulator/emulator_mpx3_embed.bob
index 9b4628eb..19f36a86 100644
--- a/tpx3App/op/bob/Emulator/emulator_mpx3_embed.bob
+++ b/tpx3App/op/bob/Emulator/emulator_mpx3_embed.bob
@@ -2,7 +2,6 @@
 <display version="2.0.0">
   <name>emulator_mpx3_embed</name>
   <macros>
-    <P>EMU-TEST:</P>
     <R>Emulator:</R>
   </macros>
   <width>1060</width>
@@ -29,7 +28,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>MegapixelEn</name>
-      <pv_name>$(P)$(R)MEGAPIXEL_ENABLE</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MEGAPIXEL_ENABLE</pv_name>
       <label>megapixel</label>
       <x>20</x>
       <y>40</y>
@@ -37,7 +36,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>CornerTextEn</name>
-      <pv_name>$(P)$(R)CORNER_TEXT_ENABLE</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)CORNER_TEXT_ENABLE</pv_name>
       <label>cornerText</label>
       <x>160</x>
       <y>40</y>
@@ -52,14 +51,14 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>MpxChipMaskSp</name>
-      <pv_name>$(P)$(R)MPX_CHIP_MASK</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_CHIP_MASK</pv_name>
       <x>380</x>
       <y>45</y>
       <maximum>15.0</maximum>
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>MpxMaskEnable</name>
-      <pv_name>$(P)$(R)MPX_CHIP_MASK_ENABLE</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_CHIP_MASK_ENABLE</pv_name>
       <label>Enable</label>
       <x>485</x>
       <y>40</y>
@@ -73,7 +72,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>LossEn</name>
-      <pv_name>$(P)$(R)MPX_LOSS_ENABLE</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_LOSS_ENABLE</pv_name>
       <label>Enable</label>
       <x>785</x>
       <y>40</y>
@@ -87,7 +86,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>FracEn</name>
-      <pv_name>$(P)$(R)MPX_FRAC_ENABLE</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_FRAC_ENABLE</pv_name>
       <label>Enable</label>
       <x>165</x>
       <y>90</y>
@@ -101,26 +100,26 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>Omr0En</name>
-      <pv_name>$(P)$(R)MPX_OMR0_ENABLE</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_OMR0_ENABLE</pv_name>
       <label>En</label>
       <x>435</x>
       <y>90</y>
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>Spinner</name>
-      <pv_name>$(P)$(R)MPX_OMR0</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_OMR0</pv_name>
       <x>330</x>
       <y>95</y>
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>Spinner_1</name>
-      <pv_name>$(P)$(R)MPX_FRAC</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_FRAC</pv_name>
       <x>60</x>
       <y>95</y>
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>Spinner_2</name>
-      <pv_name>$(P)$(R)MPX_LOSS</pv_name>
+      <pv_name>$(P=MPX3-TEST:)$(R)MPX_LOSS</pv_name>
       <x>680</x>
       <y>45</y>
     </widget>
diff --git a/tpx3App/op/bob/Emulator/emulator_tpx3_embed.bob b/tpx3App/op/bob/Emulator/emulator_tpx3_embed.bob
index ca118f5c..2489c90d 100644
--- a/tpx3App/op/bob/Emulator/emulator_tpx3_embed.bob
+++ b/tpx3App/op/bob/Emulator/emulator_tpx3_embed.bob
@@ -2,7 +2,6 @@
 <display version="2.0.0">
   <name>emulator_tpx3_embed</name>
   <macros>
-    <P>EMU-TEST:</P>
     <R>Emulator:</R>
   </macros>
   <width>1060</width>
@@ -44,7 +43,7 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>HitRateSpinner</name>
-      <pv_name>$(P)$(R)HIT_RATE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)HIT_RATE</pv_name>
       <x>20</x>
       <y>35</y>
       <width>80</width>
@@ -52,7 +51,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>HitRateEnable</name>
-      <pv_name>$(P)$(R)HIT_RATE_ENABLE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)HIT_RATE_ENABLE</pv_name>
       <label>Enable</label>
       <x>180</x>
       <width>80</width>
@@ -77,13 +76,13 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>TDCSpinner</name>
-      <pv_name>$(P)$(R)TDC</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)TDC</pv_name>
       <x>20</x>
       <y>35</y>
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>TDCEnable</name>
-      <pv_name>$(P)$(R)TDC_ENABLE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)TDC_ENABLE</pv_name>
       <label>Enable</label>
       <x>140</x>
     </widget>
@@ -107,7 +106,7 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>ChipboardSpinner</name>
-      <pv_name>$(P)$(R)CHIPBOARD_ID</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)CHIPBOARD_ID</pv_name>
       <x>20</x>
       <y>35</y>
       <width>140</width>
@@ -115,7 +114,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>ChipboardEnable</name>
-      <pv_name>$(P)$(R)CHIPBOARD_ID_ENABLE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)CHIPBOARD_ID_ENABLE</pv_name>
       <label>Enable</label>
       <x>140</x>
     </widget>
@@ -145,7 +144,7 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>ChipMask</name>
-      <pv_name>$(P)$(R)CHIP_MASK</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)CHIP_MASK</pv_name>
       <x>120</x>
       <y>40</y>
       <width>80</width>
@@ -154,7 +153,7 @@
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>ChipMaskEnable</name>
-      <pv_name>$(P)$(R)CHIP_MASK_ENABLE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)CHIP_MASK_ENABLE</pv_name>
       <label>Enable</label>
       <x>220</x>
       <y>40</y>
@@ -183,7 +182,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>ReplayFileNameInput</name>
-      <pv_name>$(P)$(R)ReplayFileName</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)ReplayFileName</pv_name>
       <x>180</x>
       <y>30</y>
       <width>700</width>
@@ -191,14 +190,14 @@
     </widget>
     <widget type="fileselector" version="2.0.0">
       <name>ReplayFileSelector</name>
-      <pv_name>$(P)$(R)ReplayFileName</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)ReplayFileName</pv_name>
       <x>880</x>
       <y>25</y>
       <height>30</height>
     </widget>
     <widget type="slide_button" version="2.0.0">
       <name>ReplayFileEnable</name>
-      <pv_name>$(P)$(R)REPLAY_FILE_ENABLE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_FILE_ENABLE</pv_name>
       <label>Enable</label>
       <x>925</x>
       <y>25</y>
@@ -213,7 +212,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>ReplayFileRBV</name>
-      <pv_name>$(P)$(R)ReplayFile_RBV</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)ReplayFile_RBV</pv_name>
       <x>180</x>
       <y>60</y>
       <width>830</width>
@@ -228,7 +227,7 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>ReplayMode</name>
-      <pv_name>$(P)$(R)REPLAY_MODE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_MODE</pv_name>
       <x>180</x>
       <y>90</y>
       <width>200</width>
@@ -250,7 +249,7 @@
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>RepeatCount</name>
-      <pv_name>$(P)$(R)REPEAT_COUNT</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPEAT_COUNT</pv_name>
       <x>180</x>
       <y>120</y>
       <width>200</width>
@@ -266,7 +265,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>ReplayFileList</name>
-      <pv_name>$(P)$(R)REPLAY_FILE_LIST</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_FILE_LIST</pv_name>
       <x>180</x>
       <y>150</y>
       <width>830</width>
@@ -281,7 +280,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>ReplayCurrentFile</name>
-      <pv_name>$(P)$(R)REPLAY_CURRENT_FILE</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_CURRENT_FILE</pv_name>
       <x>180</x>
       <y>180</y>
       <width>830</width>
@@ -296,7 +295,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>ReplayIteration</name>
-      <pv_name>$(P)$(R)REPLAY_ITERATION</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_ITERATION</pv_name>
       <x>180</x>
       <y>210</y>
       <width>200</width>
@@ -310,7 +309,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>ReplayRemaining</name>
-      <pv_name>$(P)$(R)REPLAY_REMAINING</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_REMAINING</pv_name>
       <x>560</x>
       <y>210</y>
       <width>200</width>
@@ -324,7 +323,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>ReplayStatusMsg</name>
-      <pv_name>$(P)$(R)REPLAY_STATUS_MSG</pv_name>
+      <pv_name>$(P=TPX3-TEST:)$(R)REPLAY_STATUS_MSG</pv_name>
       <x>180</x>
       <y>240</y>
       <width>830</width>
diff --git a/tpx3App/op/bob/MediPix3.bob b/tpx3App/op/bob/MediPix3.bob
index f4e88059..86bf89ea 100644
--- a/tpx3App/op/bob/MediPix3.bob
+++ b/tpx3App/op/bob/MediPix3.bob
@@ -10,8 +10,8 @@
   <widget type="embedded" version="2.0.0">
     <name>MediPix3Profile</name>
     <macros>
-      <P>$(P)</P>
-      <R>$(R)</R>
+      <P>$(P=MPX3-TEST:)</P>
+      <R>$(R=cam1:)</R>
       <pathADCore>$(pathADCore)</pathADCore>
       <pathADet>$(pathADet)</pathADet>
     </macros>
diff --git a/tpx3App/op/bob/MediPix3/MediPix3.bob b/tpx3App/op/bob/MediPix3/MediPix3.bob
index 43ceb653..30bf2875 100644
--- a/tpx3App/op/bob/MediPix3/MediPix3.bob
+++ b/tpx3App/op/bob/MediPix3/MediPix3.bob
@@ -10,8 +10,8 @@
   <widget type="embedded" version="2.0.0">
     <name>MediPix3Profile</name>
     <macros>
-      <P>$(P)</P>
-      <R>$(R)</R>
+      <P>$(P=MPX3-TEST:)</P>
+      <R>$(R=cam1:)</R>
       <pathADCore>$(pathADCore)</pathADCore>
       <pathADet>$(pathADet)</pathADet>
     </macros>
diff --git a/tpx3App/op/bob/README.md b/tpx3App/op/bob/README.md
index 1358b07b..f3f9d021 100644
--- a/tpx3App/op/bob/README.md
+++ b/tpx3App/op/bob/README.md
@@ -15,24 +15,25 @@ bob/
     tpx3/                          # main.bob, TimePix3Detector, status toolbar, TPX3 acquire
     mpx3/                          # main.bob, Mpx3Status, Mpx3* acquire/detector panels
     tpx4/                          # placeholder README
-  Emulator/                        # shell + tpx3/mpx3 embed panels (EMU-TEST:)
-  Serval/                          # shared Serval process IOC panel (SERVAL-TEST:)
+  Emulator/                        # shell + tpx3/mpx3 embeds (inherited detector P)
+  Serval/                          # shared Serval panel (inherited detector P)
 ```
 
 ## Launch
 
-| Entry screen | Default prefix | Profile body |
-|--------------|----------------|--------------|
-| `TimePix3.bob` | *(from launcher)* | `profiles/tpx3/main.bob` |
-| `MediPix3.bob` | *(from launcher)* | `profiles/mpx3/main.bob` |
-| `MediPix3/MediPix3.bob` | *(from launcher)* | same (legacy path) |
-| `Emulator/emulator.bob` | `EMU-TEST:` | shared TPX3/MPX3 emulator shell |
-| `Serval/tpx3serval.bob` | `SERVAL-TEST:` | shared Serval process IOC |
+| Entry screen | Direct-open macros | Profile body |
+|--------------|--------------------|--------------|
+| `TimePix3.bob` | `P=TPX3-TEST:`, `R=cam1:` | `profiles/tpx3/main.bob` |
+| `MediPix3.bob` | `P=MPX3-TEST:`, `R=cam1:` | `profiles/mpx3/main.bob` |
+| `MediPix3/MediPix3.bob` | `P=MPX3-TEST:`, `R=cam1:` | same (legacy path) |
+| `Emulator/emulator.bob` | `P=TPX3-TEST:`, `R=Emulator:` | shared TPX3/MPX3 emulator shell |
+| `Serval/tpx3serval.bob` | `P=TPX3-TEST:`, `R=Serval:` | shared Serval process IOC |
 
-Set macros **`P`**, **`R`** (`cam1:`), and **`pathADCore`** at launch or edit defaults in the root launcher (`TimePix3.bob` / `MediPix3.bob`). Profile `main.bob` files inherit **`P`/`R`** from the launcher; do not hardcode beamline prefixes there.
+Callers may override **`P`**, **`R`**, and **`pathADCore`** at launch. The root launchers use fallback syntax so caller values win while direct opens use the defaults shown above. Profile `main.bob` files inherit **`P`/`R`** from the launcher; do not hardcode beamline prefixes there.
 Mask image / PixelConfig panels use **`$(P)$(R)`** (same as `MaskStatus`); do not pass `Sys`/`Dev`/`Cam`.
-Emulator opens with explicit **`P=EMU-TEST:`** / **`R=Emulator:`** (not camera `P`); override with `EMU-$(BL):` to match a beamline IOC.
-Serval opens with explicit **`P=SERVAL-TEST:`** / **`R=Serval:`**; override with `SERVAL-$(BL):`.
+ADTimePix3, Serval, and emulator IOCs are configured independently but use the same detector system prefix. TPX3 launch actions pass **`P=$(P=TPX3-TEST:)`**; MPX3 actions pass **`P=$(P=MPX3-TEST:)`**. The caller's `P` therefore wins, while a directly opened family screen retains a useful test fallback. Service identity remains in **`R=Serval:`** or **`R=Emulator:`**.
+
+The emulator shell and TPX3 embed use the TPX3 fallback when opened directly; the MPX3 embed uses the MPX3 fallback. No Serval or emulator child display defines a display-level `P`, because that would override an incoming caller macro.
 
 ## Profile contract
 
@@ -50,6 +51,10 @@ Serval opens with explicit **`P=SERVAL-TEST:`** / **`R=Serval:`**; override with
 
 Legacy CS-Studio **`.opi`**: **`tpx3App/op/opi/`** (not updated in R1-7-2).
 
+## Validation
+
+Run `python3 test/validate_bob_prefix_macros.py` from the repository root to verify every entry screen, Serval/emulator child, and launcher macro contract.
+
 ## Site overlays
 
 Beamline-specific display forks: gitignored `*_site.bob` or local Phoebus paths — do not fork whole profiles in git.
diff --git a/tpx3App/op/bob/Serval/README.md b/tpx3App/op/bob/Serval/README.md
index b60fa44f..ad03bbf6 100644
--- a/tpx3App/op/bob/Serval/README.md
+++ b/tpx3App/op/bob/Serval/README.md
@@ -1,6 +1,6 @@
 # Serval IOC Phoebus display
 
-Shared **Serval** process control for Timepix3 / Medipix3 (not camera `cam1:` PVs).
+Shared **Serval** process control for Timepix3 / Medipix3 (service identity is `R=Serval:`, not camera `R=cam1:`).
 
 | File | Role |
 |------|------|
@@ -8,10 +8,11 @@ Shared **Serval** process control for Timepix3 / Medipix3 (not camera `cam1:` PV
 
 ## PV macros
 
-- **Default**: `P=SERVAL-TEST:`, `R=Serval:` → e.g. `SERVAL-TEST:Serval:START`
-- Matches `/epics/iocs/serval/iocBoot/ioctpx3serval/st.cmd` (`Sys=SERVAL-TEST:`)
-- Beamline override: open with `P=SERVAL-$(BL):` (e.g. `SERVAL-BL7:`) and set IOC `Sys` to match
-- **Do not inherit camera `P`** — every Serval `open_display` should pass `P`/`R` explicitly
+- **Prefix**: `$(P=TPX3-TEST:)` inherits `P` from the calling display and uses `TPX3-TEST:` only when `P` is undefined
+- **Record**: `R=Serval:` → the direct-open lab default START PV is `TPX3-TEST:Serval:START`
+- The fallback matches the IOC's `TPX3_PREFIX=TPX3-TEST:` default
+- For beamline use, configure the Serval IOC with the ADTimePix3 system prefix and pass that same prefix as `P`; TPX3 launchers use `$(P=TPX3-TEST:)` and MPX3 launchers use `$(P=MPX3-TEST:)`
+- The child screen deliberately has no display-level `P`, so an incoming caller macro is not overridden
 
 ## Sync
 
@@ -20,4 +21,6 @@ Source of truth: `/epics/iocs/serval/tpx3servalApp/op/bob/tpx3serval.bob` → th
 ## Opened from
 
 - `profiles/tpx3/Acquire/DetectorConfig.bob` (Vendor SW)
+- `profiles/tpx3/TimePix3Status.bob`
 - `profiles/mpx3/Mpx3Status.bob`
+- `profiles/mpx3/Detector/Mpx3DetectorConfig.bob`
diff --git a/tpx3App/op/bob/Serval/tpx3serval.bob b/tpx3App/op/bob/Serval/tpx3serval.bob
index deaa294e..3bb78fa7 100644
--- a/tpx3App/op/bob/Serval/tpx3serval.bob
+++ b/tpx3App/op/bob/Serval/tpx3serval.bob
@@ -2,7 +2,6 @@
 <display version="2.0.0">
   <name>tpx3Serval</name>
   <macros>
-    <P>SERVAL-TEST:</P>
     <R>Serval:</R>
   </macros>
   <widget type="group" version="3.0.0">
@@ -49,7 +48,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>StartStopButton</name>
-        <pv_name>$(P)$(R)START</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)START</pv_name>
         <label>Start/Stop</label>
         <x>20</x>
         <y>40</y>
@@ -58,7 +57,7 @@
       </widget>
       <widget type="led" version="2.0.0">
         <name>StatusLED</name>
-        <pv_name>$(P)$(R)STATUS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)STATUS</pv_name>
         <x>160</x>
         <y>40</y>
         <width>30</width>
@@ -85,7 +84,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>ErrorMessageDisplay</name>
-        <pv_name>$(P)$(R)ERROR_MSG</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)ERROR_MSG</pv_name>
         <x>650</x>
         <y>40</y>
         <width>600</width>
@@ -103,7 +102,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>Text Update</name>
-        <pv_name>$(P)$(R)PROCESS_ID</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)PROCESS_ID</pv_name>
         <x>300</x>
         <y>40</y>
         <width>120</width>
@@ -118,7 +117,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>ReleaseVersionDisplay</name>
-        <pv_name>$(P)$(R)RELEASE_VERSION</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)RELEASE_VERSION</pv_name>
         <x>300</x>
         <y>5</y>
         <width>80</width>
@@ -157,7 +156,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>HTTPPortSpinner</name>
-        <pv_name>$(P)$(R)HTTP_PORT</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)HTTP_PORT</pv_name>
         <x>110</x>
         <y>35</y>
         <height>30</height>
@@ -166,7 +165,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>HTTPPortEnableButton</name>
-        <pv_name>$(P)$(R)HTTP_PORT_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)HTTP_PORT_ENABLE</pv_name>
         <label>Enable</label>
         <x>220</x>
         <y>35</y>
@@ -181,14 +180,14 @@
       </widget>
       <widget type="fileselector" version="2.0.0">
         <name>HTTPLogInput</name>
-        <pv_name>$(P)$(R)HTTP_LOG</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)HTTP_LOG</pv_name>
         <x>1010</x>
         <y>35</y>
         <height>30</height>
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>HTTPLogEnableButton</name>
-        <pv_name>$(P)$(R)HTTP_LOG_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)HTTP_LOG_ENABLE</pv_name>
         <label>Enable</label>
         <x>1060</x>
         <y>35</y>
@@ -196,7 +195,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Text Entry_1</name>
-        <pv_name>$(P)$(R)HTTP_LOG</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)HTTP_LOG</pv_name>
         <x>440</x>
         <y>35</y>
         <width>570</width>
@@ -235,7 +234,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>SPIDRNetInput</name>
-        <pv_name>$(P)$(R)SPIDR_NET</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)SPIDR_NET</pv_name>
         <x>110</x>
         <y>35</y>
         <width>200</width>
@@ -253,7 +252,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>SPIDRNetEnableButton</name>
-        <pv_name>$(P)$(R)SPIDR_NET_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)SPIDR_NET_ENABLE</pv_name>
         <label>Enable</label>
         <x>320</x>
         <y>35</y>
@@ -268,7 +267,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>TCPIPInput</name>
-        <pv_name>$(P)$(R)TCP_IP</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_IP</pv_name>
         <x>510</x>
         <y>35</y>
         <width>200</width>
@@ -286,7 +285,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>TCPIPEnableButton</name>
-        <pv_name>$(P)$(R)TCP_IP_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_IP_ENABLE</pv_name>
         <label>Enable</label>
         <x>720</x>
         <y>35</y>
@@ -301,7 +300,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>TCPPortSpinner</name>
-        <pv_name>$(P)$(R)TCP_PORT</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_PORT</pv_name>
         <x>950</x>
         <y>35</y>
         <height>30</height>
@@ -310,7 +309,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>TCPPortEnableButton</name>
-        <pv_name>$(P)$(R)TCP_PORT_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_PORT_ENABLE</pv_name>
         <label>Enable</label>
         <x>1060</x>
         <y>35</y>
@@ -347,7 +346,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>UDPReceiversSpinner</name>
-        <pv_name>$(P)$(R)UDP_RECEIVERS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)UDP_RECEIVERS</pv_name>
         <x>130</x>
         <y>35</y>
         <width>140</width>
@@ -355,7 +354,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>UDPReceiversEnableButton</name>
-        <pv_name>$(P)$(R)UDP_RECEIVERS_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)UDP_RECEIVERS_ENABLE</pv_name>
         <label>Enable</label>
         <x>320</x>
         <y>35</y>
@@ -369,7 +368,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>FrameAssemblersSpinner</name>
-        <pv_name>$(P)$(R)FRAME_ASSEMBLERS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)FRAME_ASSEMBLERS</pv_name>
         <x>520</x>
         <y>35</y>
         <width>130</width>
@@ -377,7 +376,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>FrameAssemblersEnableButton</name>
-        <pv_name>$(P)$(R)FRAME_ASSEMBLERS_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)FRAME_ASSEMBLERS_ENABLE</pv_name>
         <label>Enable</label>
         <x>660</x>
         <y>35</y>
@@ -392,7 +391,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>RingBufferSizeSpinner</name>
-        <pv_name>$(P)$(R)RING_BUFFER_SIZE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)RING_BUFFER_SIZE</pv_name>
         <x>900</x>
         <y>35</y>
         <width>140</width>
@@ -401,7 +400,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>RingBufferSizeEnableButton</name>
-        <pv_name>$(P)$(R)RING_BUFFER_SIZE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)RING_BUFFER_SIZE_ENABLE</pv_name>
         <label>Enable</label>
         <x>1050</x>
         <y>35</y>
@@ -415,7 +414,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>NetworkBufferSizeSpinner</name>
-        <pv_name>$(P)$(R)NETWORK_BUFFER_SIZE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)NETWORK_BUFFER_SIZE</pv_name>
         <x>130</x>
         <y>75</y>
         <width>140</width>
@@ -424,7 +423,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>NetworkBufferSizeEnableButton</name>
-        <pv_name>$(P)$(R)NETWORK_BUFFER_SIZE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)NETWORK_BUFFER_SIZE_ENABLE</pv_name>
         <label>Enable</label>
         <x>320</x>
         <y>75</y>
@@ -438,7 +437,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>FileWritersSpinner</name>
-        <pv_name>$(P)$(R)FILE_WRITERS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)FILE_WRITERS</pv_name>
         <x>520</x>
         <y>75</y>
         <width>130</width>
@@ -446,7 +445,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>FileWritersEnableButton</name>
-        <pv_name>$(P)$(R)FILE_WRITERS_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)FILE_WRITERS_ENABLE</pv_name>
         <label>Enable</label>
         <x>660</x>
         <y>75</y>
@@ -461,7 +460,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>CorrectionHandlersSpinner</name>
-        <pv_name>$(P)$(R)CORRECTION_HANDLERS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)CORRECTION_HANDLERS</pv_name>
         <x>900</x>
         <y>75</y>
         <width>140</width>
@@ -469,7 +468,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>CorrectionHandlersEnableButton</name>
-        <pv_name>$(P)$(R)CORRECTION_HANDLERS_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)CORRECTION_HANDLERS_ENABLE</pv_name>
         <label>Enable</label>
         <x>1050</x>
         <y>75</y>
@@ -484,7 +483,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>ProcessingHandlersSpinner</name>
-        <pv_name>$(P)$(R)PROCESSING_HANDLERS</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)PROCESSING_HANDLERS</pv_name>
         <x>170</x>
         <y>115</y>
         <width>140</width>
@@ -492,7 +491,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>ProcessingHandlersEnableButton</name>
-        <pv_name>$(P)$(R)PROCESSING_HANDLERS_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)PROCESSING_HANDLERS_ENABLE</pv_name>
         <label>Enable</label>
         <x>320</x>
         <y>115</y>
@@ -506,7 +505,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>DeviceMaskSpinner</name>
-        <pv_name>$(P)$(R)DEVICE_MASK</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)DEVICE_MASK</pv_name>
         <x>520</x>
         <y>115</y>
         <width>130</width>
@@ -515,7 +514,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>DeviceMaskEnableButton</name>
-        <pv_name>$(P)$(R)DEVICE_MASK_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)DEVICE_MASK_ENABLE</pv_name>
         <label>Enable</label>
         <x>660</x>
         <y>115</y>
@@ -553,7 +552,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>ResourcePoolSizeSpinner</name>
-        <pv_name>$(P)$(R)RESOURCE_POOL_SIZE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)RESOURCE_POOL_SIZE</pv_name>
         <x>160</x>
         <y>35</y>
         <width>120</width>
@@ -563,7 +562,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>ResourcePoolSizeEnableButton</name>
-        <pv_name>$(P)$(R)RESOURCE_POOL_SIZE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)RESOURCE_POOL_SIZE_ENABLE</pv_name>
         <label>Enable</label>
         <x>290</x>
         <y>35</y>
@@ -578,7 +577,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>ImagePoolSizeSpinner</name>
-        <pv_name>$(P)$(R)IMAGE_POOL_SIZE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)IMAGE_POOL_SIZE</pv_name>
         <x>520</x>
         <y>35</y>
         <width>120</width>
@@ -587,7 +586,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>ImagePoolSizeEnableButton</name>
-        <pv_name>$(P)$(R)IMAGE_POOL_SIZE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)IMAGE_POOL_SIZE_ENABLE</pv_name>
         <label>Enable</label>
         <x>650</x>
         <y>35</y>
@@ -602,7 +601,7 @@
       </widget>
       <widget type="spinner" version="2.0.0">
         <name>IntegrationPoolSizeSpinner</name>
-        <pv_name>$(P)$(R)INTEGRATION_POOL_SIZE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)INTEGRATION_POOL_SIZE</pv_name>
         <x>900</x>
         <y>35</y>
         <width>120</width>
@@ -611,7 +610,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>IntegrationPoolSizeEnableButton</name>
-        <pv_name>$(P)$(R)INTEGRATION_POOL_SIZE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)INTEGRATION_POOL_SIZE_ENABLE</pv_name>
         <label>Enable</label>
         <x>1030</x>
         <y>35</y>
@@ -649,14 +648,14 @@
       </widget>
       <widget type="fileselector" version="2.0.0">
         <name>TCPDebugInput</name>
-        <pv_name>$(P)$(R)TCP_DEBUG</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_DEBUG</pv_name>
         <x>1150</x>
         <y>35</y>
         <height>30</height>
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>TCPDebugEnableButton</name>
-        <pv_name>$(P)$(R)TCP_DEBUG_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_DEBUG_ENABLE</pv_name>
         <label>Enable</label>
         <x>1200</x>
         <y>35</y>
@@ -664,7 +663,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>ReleaseResourcesButton</name>
-        <pv_name>$(P)$(R)RELEASE_RESOURCES</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)RELEASE_RESOURCES</pv_name>
         <label>Release Resources</label>
         <x>450</x>
         <y>5</y>
@@ -672,7 +671,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>ExperimentalButton</name>
-        <pv_name>$(P)$(R)EXPERIMENTAL</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)EXPERIMENTAL</pv_name>
         <label>Experimental</label>
         <x>660</x>
         <y>5</y>
@@ -680,7 +679,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Text Entry_4</name>
-        <pv_name>$(P)$(R)TCP_DEBUG</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)TCP_DEBUG</pv_name>
         <x>100</x>
         <y>35</y>
         <width>1050</width>
@@ -718,14 +717,14 @@
       </widget>
       <widget type="fileselector" version="2.0.0">
         <name>JarFileNameInput</name>
-        <pv_name>$(P)$(R)JarFileName</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JarFileName</pv_name>
         <x>1000</x>
         <y>35</y>
         <height>30</height>
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>JarFileEnableButton</name>
-        <pv_name>$(P)$(R)JAR_FILE_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JAR_FILE_ENABLE</pv_name>
         <label>Enable</label>
         <x>1060</x>
         <y>35</y>
@@ -740,7 +739,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>JarFileRBV</name>
-        <pv_name>$(P)$(R)JarFile_RBV</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JarFile_RBV</pv_name>
         <x>380</x>
         <width>900</width>
         <height>30</height>
@@ -752,7 +751,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>Text Entry_2</name>
-        <pv_name>$(P)$(R)JarFileName</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JarFileName</pv_name>
         <x>130</x>
         <y>35</y>
         <width>870</width>
@@ -768,7 +767,7 @@
       </widget>
       <widget type="textentry" version="3.0.0">
         <name>JavaXmxEntry</name>
-        <pv_name>$(P)$(R)JAVA_XMX</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JAVA_XMX</pv_name>
         <x>140</x>
         <y>73</y>
         <width>80</width>
@@ -777,7 +776,7 @@
       </widget>
       <widget type="slide_button" version="2.0.0">
         <name>JavaXmxEnableButton</name>
-        <pv_name>$(P)$(R)JAVA_XMX_ENABLE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)JAVA_XMX_ENABLE</pv_name>
         <label>Enable</label>
         <x>240</x>
         <y>73</y>
@@ -808,7 +807,7 @@
       </widget>
       <widget type="textupdate" version="2.0.0">
         <name>ErrorMessageDisplay_1</name>
-        <pv_name>$(P)$(R)COMMAND_LINE</pv_name>
+        <pv_name>$(P=TPX3-TEST:)$(R)COMMAND_LINE</pv_name>
         <x>20</x>
         <y>40</y>
         <width>1300</width>
diff --git a/tpx3App/op/bob/TimePix3.bob b/tpx3App/op/bob/TimePix3.bob
index e7029eb1..fff9cdab 100644
--- a/tpx3App/op/bob/TimePix3.bob
+++ b/tpx3App/op/bob/TimePix3.bob
@@ -10,8 +10,8 @@
   <widget type="embedded" version="2.0.0">
     <name>TimePix3Profile</name>
     <macros>
-      <P>$(P)</P>
-      <R>$(R)</R>
+      <P>$(P=TPX3-TEST:)</P>
+      <R>$(R=cam1:)</R>
       <pathADCore>$(pathADCore)</pathADCore>
       <pathADet>$(pathADet)</pathADet>
     </macros>
diff --git a/tpx3App/op/bob/profiles/mpx3/Detector/Mpx3DetectorConfig.bob b/tpx3App/op/bob/profiles/mpx3/Detector/Mpx3DetectorConfig.bob
index 04e68a7d..e6721a62 100644
--- a/tpx3App/op/bob/profiles/mpx3/Detector/Mpx3DetectorConfig.bob
+++ b/tpx3App/op/bob/profiles/mpx3/Detector/Mpx3DetectorConfig.bob
@@ -1014,7 +1014,7 @@
         <description>Emulator</description>
         <file>../../../Emulator/emulator.bob</file>
         <macros>
-          <P>EMU-TEST:</P>
+          <P>$(P=MPX3-TEST:)</P>
           <R>Emulator:</R>
         </macros>
         <target>tab</target>
@@ -1029,7 +1029,7 @@
       <color red="115" green="223" blue="255">
       </color>
     </background_color>
-    <tooltip>EMU-TEST:Emulator: — not camera P</tooltip>
+    <tooltip>Inherited detector P (MPX3-TEST: fallback), R=Emulator:</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -1039,7 +1039,7 @@
         <description>Serval</description>
         <file>../../../Serval/tpx3serval.bob</file>
         <macros>
-          <P>SERVAL-TEST:</P>
+          <P>$(P=MPX3-TEST:)</P>
           <R>Serval:</R>
         </macros>
         <target>tab</target>
@@ -1054,7 +1054,7 @@
       <color red="115" green="223" blue="255">
       </color>
     </background_color>
-    <tooltip>SERVAL-TEST:Serval: — not camera P</tooltip>
+    <tooltip>Inherited detector P (MPX3-TEST: fallback), R=Serval:</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
 </display>
diff --git a/tpx3App/op/bob/profiles/mpx3/Mpx3Status.bob b/tpx3App/op/bob/profiles/mpx3/Mpx3Status.bob
index 052d2a81..3d03f626 100644
--- a/tpx3App/op/bob/profiles/mpx3/Mpx3Status.bob
+++ b/tpx3App/op/bob/profiles/mpx3/Mpx3Status.bob
@@ -192,7 +192,7 @@
         <description>Medipix3 emulator</description>
         <file>../../Emulator/emulator.bob</file>
         <macros>
-          <P>EMU-TEST:</P>
+          <P>$(P=MPX3-TEST:)</P>
           <R>Emulator:</R>
         </macros>
         <target>tab</target>
@@ -215,7 +215,7 @@
         <description>Serval IOC control</description>
         <file>../../Serval/tpx3serval.bob</file>
         <macros>
-          <P>SERVAL-TEST:</P>
+          <P>$(P=MPX3-TEST:)</P>
           <R>Serval:</R>
         </macros>
         <target>tab</target>
diff --git a/tpx3App/op/bob/profiles/tpx3/Acquire/DetectorConfig.bob b/tpx3App/op/bob/profiles/tpx3/Acquire/DetectorConfig.bob
index d430548e..2bf2c3c6 100644
--- a/tpx3App/op/bob/profiles/tpx3/Acquire/DetectorConfig.bob
+++ b/tpx3App/op/bob/profiles/tpx3/Acquire/DetectorConfig.bob
@@ -1704,7 +1704,7 @@ $(pv_value)</tooltip>
         <description>Serval</description>
         <file>../../../Serval/tpx3serval.bob</file>
         <macros>
-          <P>SERVAL-TEST:</P>
+          <P>$(P=TPX3-TEST:)</P>
           <R>Serval:</R>
         </macros>
         <target>tab</target>
@@ -1729,7 +1729,7 @@ $(pv_value)</tooltip>
         <description>Emulator</description>
         <file>../../../Emulator/emulator.bob</file>
         <macros>
-          <P>EMU-TEST:</P>
+          <P>$(P=TPX3-TEST:)</P>
           <R>Emulator:</R>
         </macros>
         <target>tab</target>
diff --git a/tpx3App/op/bob/profiles/tpx3/TimePix3Status.bob b/tpx3App/op/bob/profiles/tpx3/TimePix3Status.bob
index 154069c0..45e2ef0e 100644
--- a/tpx3App/op/bob/profiles/tpx3/TimePix3Status.bob
+++ b/tpx3App/op/bob/profiles/tpx3/TimePix3Status.bob
@@ -153,7 +153,7 @@
         <description>Timepix3 emulator</description>
         <file>../../Emulator/emulator.bob</file>
         <macros>
-          <P>EMU-TEST:</P>
+          <P>$(P=TPX3-TEST:)</P>
           <R>Emulator:</R>
         </macros>
         <target>tab</target>
@@ -218,7 +218,7 @@
         <description>Serval IOC control</description>
         <file>../../Serval/tpx3serval.bob</file>
         <macros>
-          <P>SERVAL-TEST:</P>
+          <P>$(P=TPX3-TEST:)</P>
           <R>Serval:</R>
         </macros>
         <target>tab</target>