diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
index 26f67424f053e25cf15b4b39ed12136926ff846f..5d8fd4ac91359f934d29eb338128f0a6685ee2dd 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/FacePlate_AutoConf.bob
@@ -226,28 +226,68 @@
       <items>
         <item>PT-001</item>
         <item>PT-060</item>
+        <item>PT-071</item>
+        <item>TT-005</item>
+        <item>TT-006</item>
+        <item>TT-060</item>
+        <item>TT-065</item>
+        <item>PT-002</item>
+        <item>PT-003</item>
+        <item>PT-004</item>
+        <item>PT-061</item>
+        <item>LT-001</item>
+        <item>LT-002</item>
+        <item>TT-069</item>
+        <item>TT-023</item>
         <item>TT-091</item>
         <item>TT-092</item>
         <item>TT-093</item>
         <item>TT-094</item>
-        <item>TT-095</item>
-        <item>TT-096</item>
-        <item>TT-097</item>
-        <item>PT-098</item>
+        <item>TT-030</item>
+        <item>TT-049</item>
+        <item>TT-064</item>
+        <item>TT-024</item>
+        <item>TT-013</item>
+        <item>TT-041</item>
+        <item>TT-031</item>
+        <item>TT-007</item>
+        <item>TT-008</item>
+        <item>TT-009</item>
+        <item>TT-033</item>
+        <item>TT-034</item>
+        <item>TT-043</item>
+        <item>TT-044</item>
+        <item>TT-042</item>
+        <item>TT-048</item>
+        <item>TT-021</item>
+        <item>TT-057</item>
+        <item>TT-010</item>
+        <item>TT-018</item>
+        <item>TT-020</item>
+        <item>TT-029</item>
+        <item>TT-039</item>
+        <item>TT-022</item>
+        <item>TT-032</item>
+        <item>TT-038</item>
+        <item>TT-011</item>
+        <item>TT-061</item>
+        <item>TT-063</item>
+        <item>TT-019</item>
         <item>TT-001</item>
         <item>TT-002</item>
         <item>TT-003</item>
-        <item>TT-060</item>
-        <item>TT-061</item>
-        <item>LT-001</item>
-        <item>LT-002</item>
-        <item>PT-010</item>
-        <item>PT-020</item>
-        <item>PT-070</item>
-        <item>PT-071</item>
-        <item>PT-072</item>
-        <item>PT-073</item>
-        <item>TT-004</item>
+        <item>TT-028</item>
+        <item>TT-068</item>
+        <item>TT-051</item>
+        <item>TT-052</item>
+        <item>TT-053</item>
+        <item>TT-054</item>
+        <item>TT-055</item>
+        <item>TT-066</item>
+        <item>TT-045</item>
+        <item>TT-035</item>
+        <item>TT-025</item>
+        <item>TT-015</item>
       </items>
       <items_from_pv>false</items_from_pv>
     </widget>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Trend.plt b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Trend.plt
index 7ef1d4e091addc4464864db478e74654ea6608a9..908e56dbe1af6755fcf9fb2c2652d204a7ceb31b 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Trend.plt
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Trend.plt
@@ -104,9 +104,9 @@
       </archive>
     </pv>
     <pv>
-      <display_name>${WIDSecSubPID}:${Dis}-PID-${WIDIndexPID}:MAN_SP</display_name>
+      <display_name>${WIDSecSubPID}:${Dis}-PID-${WIDIndexPID}:FB_Setpoint</display_name>
       <visible>true</visible>
-      <name>${WIDSecSubPID}:${Dis}-PID-${WIDIndexPID}:MAN_SP</name>
+      <name>${WIDSecSubPID}:${Dis}-PID-${WIDIndexPID}:FB_Setpoint</name>
       <axis>1</axis>
       <color>
         <red>0</red>