diff --git a/src/techui_builder/generate.py b/src/techui_builder/generate.py
index cb3625a..7ea36f1 100644
--- a/src/techui_builder/generate.py
+++ b/src/techui_builder/generate.py
@@ -228,9 +228,7 @@ def _allocate_widget(
             # Add macros to the widgets
             new_widget.macro(self.P, component.P)
             if suffix_label != "":
-                new_widget.macro(
-                    f"{suffix_label}", suffix.removeprefix(":").removesuffix(":")
-                )
+                new_widget.macro(f"{suffix_label}", suffix)
                 new_widget.macro("label", name.removeprefix(":").removesuffix(":"))
             # TODO: Change this to pvi_button
             if True:
diff --git a/tests/test_files/motor_embed.bob b/tests/test_files/motor_embed.bob
index 5c76313..01db8f0 100644
--- a/tests/test_files/motor_embed.bob
+++ b/tests/test_files/motor_embed.bob
@@ -24,7 +24,7 @@
           <description>$(name)</description>
         </action>
       </actions>
-      <pv_name>$(P):$(M).TWR</pv_name>
+      <pv_name>$(P)$(M).TWR</pv_name>
       <text>-</text>
       <y>10</y>
       <width>30</width>
@@ -52,7 +52,7 @@
           <description>$(name)</description>
         </action>
       </actions>
-      <pv_name>$(P):$(M).TWF</pv_name>
+      <pv_name>$(P)$(M).TWF</pv_name>
       <text>+</text>
       <x>140</x>
       <y>10</y>
@@ -78,7 +78,7 @@
         <action type="open_display">
           <file>$(IOC)/pmacAxis.pvi.bob</file>
           <macros>
-            <M>:$(M)</M>
+            <M>$(M)</M>
             <P>$(P)</P>
           </macros>
           <target>tab</target>
@@ -112,7 +112,7 @@
           <description>$(name)</description>
         </action>
       </actions>
-      <pv_name>$(P):$(M).STOP</pv_name>
+      <pv_name>$(P)$(M).STOP</pv_name>
       <text>STOP</text>
       <x>130</x>
       <y>60</y>
@@ -134,7 +134,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry_27</name>
-      <pv_name>$(P):$(M).TWV</pv_name>
+      <pv_name>$(P)$(M).TWV</pv_name>
       <x>45</x>
       <y>60</y>
       <width>80</width>
@@ -155,7 +155,7 @@
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Moving</name>
-      <pv_name>$(P):$(M).DMOV</pv_name>
+      <pv_name>$(P)$(M).DMOV</pv_name>
       <x>150</x>
       <y>35</y>
       <width>20</width>
@@ -175,7 +175,7 @@
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Serverity</name>
-      <pv_name>$(P):$(M).SEVR</pv_name>
+      <pv_name>$(P)$(M).SEVR</pv_name>
       <y>35</y>
       <width>20</width>
       <numBits>1</numBits>
@@ -194,7 +194,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>PV</name>
-      <pv_name>$(P):$(M)</pv_name>
+      <pv_name>$(P)$(M)</pv_name>
       <x>35</x>
       <y>10</y>
       <font>
@@ -214,7 +214,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Readback PV</name>
-      <pv_name>$(P):$(M).RBV</pv_name>
+      <pv_name>$(P)$(M).RBV</pv_name>
       <x>25</x>
       <y>35</y>
       <width>120</width>
diff --git a/tests/test_files/widget.xml b/tests/test_files/widget.xml
index 63cb651..d0d7ac0 100644
--- a/tests/test_files/widget.xml
+++ b/tests/test_files/widget.xml
@@ -8,7 +8,7 @@
   <file>techui-support/bob/ADAravis/ADAravis_summary.bob</file>
   <macros>
     <P>BL01T-DI-IOC-01</P>
-    <R>CAM</R>
+    <R>:CAM:</R>
     <label>CAM</label>
     <IOC>test_url/bl01t-di-ioc-01</IOC>
   </macros>
diff --git a/tests/test_generate.py b/tests/test_generate.py
index fc70db9..18f742a 100644
--- a/tests/test_generate.py
+++ b/tests/test_generate.py
@@ -115,7 +115,7 @@ def test_generator_create_widget_keyerror(generator, caplog):
         P="BL01T-DI-IOC-01",
         desc=None,
         M=None,
-        R="CAM:",
+        R=":CAM:",
     )
 
     result = generator._create_widget(name=screen_name, component=component)
@@ -142,7 +142,7 @@ def test_generator_create_widget_is_list_of_dicts(generator):
         P="BL01T-DI-IOC-01",
         desc=None,
         M=None,
-        R="CAM:",
+        R=":CAM:",
     )
     widget = generator._create_widget(name=screen_name, component=component)
     for value in widget:
@@ -160,7 +160,7 @@ def test_generator_create_widget_embedded(generator):
         P="BL01T-DI-IOC-01",
         desc=None,
         M=None,
-        R="CAM:",
+        R=":CAM:",
     )
 
     widget = generator._create_widget(
@@ -254,7 +254,7 @@ def test_generator_allocate_widget(generator):
         P="BL01T-DI-IOC-01",
         desc=None,
         M=None,
-        R="CAM:",
+        R=":CAM:",
     )
     widget = generator._allocate_widget(scrn_mapping, component)
     control_widget = Path("tests/test_files/widget.xml")