MRU Callout Support Updates

Change-Id: If0e517a72c428b2cd5902900f13f6a3c17a68963
RTC:68487
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4813
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 320 insertions, 320 deletions

diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 7028fd31e..9039779cf 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -8688,19 +8688,19 @@
     </attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf0 -->
+<!-- Centaur L4 affiliated with membuf0 -->
 
 <targetInstance>
-    <id>sys0node0membuf0mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf0l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-0/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -8786,19 +8786,19 @@
     <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf1 -->
+<!-- Centaur L4 affiliated with membuf1 -->
 
 <targetInstance>
-    <id>sys0node0membuf1mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf1l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0001</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-1/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -8884,19 +8884,19 @@
     <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf2 -->
+<!-- Centaur L4 affiliated with membuf2 -->
 
 <targetInstance>
-    <id>sys0node0membuf2mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf2l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0002</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-2/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-2/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -8982,19 +8982,19 @@
     <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf3 -->
+<!-- Centaur L4 affiliated with membuf3 -->
 
 <targetInstance>
-    <id>sys0node0membuf3mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf3l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0003</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-3/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-3/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9080,19 +9080,19 @@
     <attribute><id>VPD_REC_NUM</id><default>4</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf4 -->
+<!-- Centaur L4 affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf4mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf4l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-4/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-4/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9178,19 +9178,19 @@
     <attribute><id>VPD_REC_NUM</id><default>5</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf5 -->
+<!-- Centaur L4 affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf5mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf5l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-5/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-5/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9276,19 +9276,19 @@
     <attribute><id>VPD_REC_NUM</id><default>6</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf6 -->
+<!-- Centaur L4 affiliated with membuf6 -->
 
 <targetInstance>
-    <id>sys0node0membuf6mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf6l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0006</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-6/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-6/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9374,19 +9374,19 @@
     <attribute><id>VPD_REC_NUM</id><default>7</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf7 -->
+<!-- Centaur L4 affiliated with membuf7 -->
 
 <targetInstance>
-    <id>sys0node0membuf7mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf7l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0007</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-7/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-7/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9472,19 +9472,19 @@
     <attribute><id>VPD_REC_NUM</id><default>8</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf8 -->
+<!-- Centaur L4 affiliated with membuf8 -->
 
 <targetInstance>
-    <id>sys0node0membuf8mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf8l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0008</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-8/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-8/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9570,19 +9570,19 @@
     <attribute><id>VPD_REC_NUM</id><default>9</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf9 -->
+<!-- Centaur L4 affiliated with membuf9 -->
 
 <targetInstance>
-    <id>sys0node0membuf9mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf9l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0009</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-9/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-9/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9668,19 +9668,19 @@
     <attribute><id>VPD_REC_NUM</id><default>10</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf10 -->
+<!-- Centaur L4 affiliated with membuf10 -->
 
 <targetInstance>
-    <id>sys0node0membuf10mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf10l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-10/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-10/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9766,19 +9766,19 @@
     <attribute><id>VPD_REC_NUM</id><default>11</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf11 -->
+<!-- Centaur L4 affiliated with membuf11 -->
 
 <targetInstance>
-    <id>sys0node0membuf11mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf11l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-11/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-11/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9864,19 +9864,19 @@
     <attribute><id>VPD_REC_NUM</id><default>12</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf12 -->
+<!-- Centaur L4 affiliated with membuf12 -->
 
 <targetInstance>
-    <id>sys0node0membuf12mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf12l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-12/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-12/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9962,19 +9962,19 @@
     <attribute><id>VPD_REC_NUM</id><default>13</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf13 -->
+<!-- Centaur L4 affiliated with membuf13 -->
 
 <targetInstance>
-    <id>sys0node0membuf13mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf13l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-13/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-13/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10060,19 +10060,19 @@
     <attribute><id>VPD_REC_NUM</id><default>14</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf14 -->
+<!-- Centaur L4 affiliated with membuf14 -->
 
 <targetInstance>
-    <id>sys0node0membuf14mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf14l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-14/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-14/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10158,19 +10158,19 @@
     <attribute><id>VPD_REC_NUM</id><default>15</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf15 -->
+<!-- Centaur L4 affiliated with membuf15 -->
 
 <targetInstance>
-    <id>sys0node0membuf15mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf15l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-15/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-15/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10256,19 +10256,19 @@
     <attribute><id>VPD_REC_NUM</id><default>16</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf16 -->
+<!-- Centaur L4 affiliated with membuf16 -->
 
 <targetInstance>
-    <id>sys0node0membuf16mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf16l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0010</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-16/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-16/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10354,19 +10354,19 @@
     <attribute><id>VPD_REC_NUM</id><default>17</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf17 -->
+<!-- Centaur L4 affiliated with membuf17 -->
 
 <targetInstance>
-    <id>sys0node0membuf17mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf17l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0011</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-17/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-17/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10452,19 +10452,19 @@
     <attribute><id>VPD_REC_NUM</id><default>18</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf18 -->
+<!-- Centaur L4 affiliated with membuf18 -->
 
 <targetInstance>
-    <id>sys0node0membuf18mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf18l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0012</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-18/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-18/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10550,19 +10550,19 @@
     <attribute><id>VPD_REC_NUM</id><default>19</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf19 -->
+<!-- Centaur L4 affiliated with membuf19 -->
 
 <targetInstance>
-    <id>sys0node0membuf19mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf19l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0013</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-19/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-19/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10648,19 +10648,19 @@
     <attribute><id>VPD_REC_NUM</id><default>20</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf20 -->
+<!-- Centaur L4 affiliated with membuf20 -->
 
 <targetInstance>
-    <id>sys0node0membuf20mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf20l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0014</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-20/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-20/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10746,19 +10746,19 @@
     <attribute><id>VPD_REC_NUM</id><default>21</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf21 -->
+<!-- Centaur L4 affiliated with membuf21 -->
 
 <targetInstance>
-    <id>sys0node0membuf21mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf21l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0015</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-21/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-21/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10844,19 +10844,19 @@
     <attribute><id>VPD_REC_NUM</id><default>22</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf22 -->
+<!-- Centaur L4 affiliated with membuf22 -->
 
 <targetInstance>
-    <id>sys0node0membuf22mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf22l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0016</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-22/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-22/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10942,19 +10942,19 @@
     <attribute><id>VPD_REC_NUM</id><default>23</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf23 -->
+<!-- Centaur L4 affiliated with membuf23 -->
 
 <targetInstance>
-    <id>sys0node0membuf23mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf23l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0017</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-23/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-23/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11040,19 +11040,19 @@
     <attribute><id>VPD_REC_NUM</id><default>24</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf24 -->
+<!-- Centaur L4 affiliated with membuf24 -->
 
 <targetInstance>
-    <id>sys0node0membuf24mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf24l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0018</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-24/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-24/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11138,19 +11138,19 @@
     <attribute><id>VPD_REC_NUM</id><default>25</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf25 -->
+<!-- Centaur L4 affiliated with membuf25 -->
 
 <targetInstance>
-    <id>sys0node0membuf25mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf25l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0019</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-25/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-25/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11236,19 +11236,19 @@
     <attribute><id>VPD_REC_NUM</id><default>26</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf26 -->
+<!-- Centaur L4 affiliated with membuf26 -->
 
 <targetInstance>
-    <id>sys0node0membuf26mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf26l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-26/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-26/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11334,19 +11334,19 @@
     <attribute><id>VPD_REC_NUM</id><default>27</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf27 -->
+<!-- Centaur L4 affiliated with membuf27 -->
 
 <targetInstance>
-    <id>sys0node0membuf27mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf27l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-27/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-27/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11432,19 +11432,19 @@
     <attribute><id>VPD_REC_NUM</id><default>28</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf28 -->
+<!-- Centaur L4 affiliated with membuf28 -->
 
 <targetInstance>
-    <id>sys0node0membuf28mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf28l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-28/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-28/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11530,19 +11530,19 @@
     <attribute><id>VPD_REC_NUM</id><default>29</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf29 -->
+<!-- Centaur L4 affiliated with membuf29 -->
 
 <targetInstance>
-    <id>sys0node0membuf29mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf29l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-29/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-29/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11628,19 +11628,19 @@
     <attribute><id>VPD_REC_NUM</id><default>30</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf30 -->
+<!-- Centaur L4 affiliated with membuf30 -->
 
 <targetInstance>
-    <id>sys0node0membuf30mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf30l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-30/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-30/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11726,19 +11726,19 @@
     <attribute><id>VPD_REC_NUM</id><default>31</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf31 -->
+<!-- Centaur L4 affiliated with membuf31 -->
 
 <targetInstance>
-    <id>sys0node0membuf31mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf31l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-31/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-31/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11824,19 +11824,19 @@
     <attribute><id>VPD_REC_NUM</id><default>32</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf32 -->
+<!-- Centaur L4 affiliated with membuf32 -->
 
 <targetInstance>
-    <id>sys0node0membuf32mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf32l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0020</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-32/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-32/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11922,19 +11922,19 @@
     <attribute><id>VPD_REC_NUM</id><default>33</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf33 -->
+<!-- Centaur L4 affiliated with membuf33 -->
 
 <targetInstance>
-    <id>sys0node0membuf33mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf33l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0021</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-33/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-33/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12020,19 +12020,19 @@
     <attribute><id>VPD_REC_NUM</id><default>34</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf34 -->
+<!-- Centaur L4 affiliated with membuf34 -->
 
 <targetInstance>
-    <id>sys0node0membuf34mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf34l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0022</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-34/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-34/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12118,19 +12118,19 @@
     <attribute><id>VPD_REC_NUM</id><default>35</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf35 -->
+<!-- Centaur L4 affiliated with membuf35 -->
 
 <targetInstance>
-    <id>sys0node0membuf35mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf35l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0023</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-35/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-35/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12216,19 +12216,19 @@
     <attribute><id>VPD_REC_NUM</id><default>36</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf36 -->
+<!-- Centaur L4 affiliated with membuf36 -->
 
 <targetInstance>
-    <id>sys0node0membuf36mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf36l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0024</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-36/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-36/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12314,19 +12314,19 @@
     <attribute><id>VPD_REC_NUM</id><default>37</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf37 -->
+<!-- Centaur L4 affiliated with membuf37 -->
 
 <targetInstance>
-    <id>sys0node0membuf37mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf37l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0025</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-37/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-37/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12412,19 +12412,19 @@
     <attribute><id>VPD_REC_NUM</id><default>38</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf38 -->
+<!-- Centaur L4 affiliated with membuf38 -->
 
 <targetInstance>
-    <id>sys0node0membuf38mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf38l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0026</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-38/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-38/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12510,19 +12510,19 @@
     <attribute><id>VPD_REC_NUM</id><default>39</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf39 -->
+<!-- Centaur L4 affiliated with membuf39 -->
 
 <targetInstance>
-    <id>sys0node0membuf39mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf39l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0027</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-39/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-39/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12608,19 +12608,19 @@
     <attribute><id>VPD_REC_NUM</id><default>40</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf40 -->
+<!-- Centaur L4 affiliated with membuf40 -->
 
 <targetInstance>
-    <id>sys0node0membuf40mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf40l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0028</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-40/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-40/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12706,19 +12706,19 @@
     <attribute><id>VPD_REC_NUM</id><default>41</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf41 -->
+<!-- Centaur L4 affiliated with membuf41 -->
 
 <targetInstance>
-    <id>sys0node0membuf41mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf41l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0029</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-41/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-41/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12804,19 +12804,19 @@
     <attribute><id>VPD_REC_NUM</id><default>42</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf42 -->
+<!-- Centaur L4 affiliated with membuf42 -->
 
 <targetInstance>
-    <id>sys0node0membuf42mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf42l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-42/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-42/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12902,19 +12902,19 @@
     <attribute><id>VPD_REC_NUM</id><default>43</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf43 -->
+<!-- Centaur L4 affiliated with membuf43 -->
 
 <targetInstance>
-    <id>sys0node0membuf43mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf43l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-43/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-43/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13000,19 +13000,19 @@
     <attribute><id>VPD_REC_NUM</id><default>44</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf44 -->
+<!-- Centaur L4 affiliated with membuf44 -->
 
 <targetInstance>
-    <id>sys0node0membuf44mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf44l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-44/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-44/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13098,19 +13098,19 @@
     <attribute><id>VPD_REC_NUM</id><default>45</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf45 -->
+<!-- Centaur L4 affiliated with membuf45 -->
 
 <targetInstance>
-    <id>sys0node0membuf45mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf45l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-45/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-45/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13196,19 +13196,19 @@
     <attribute><id>VPD_REC_NUM</id><default>46</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf46 -->
+<!-- Centaur L4 affiliated with membuf46 -->
 
 <targetInstance>
-    <id>sys0node0membuf46mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf46l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-46/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-46/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13294,19 +13294,19 @@
     <attribute><id>VPD_REC_NUM</id><default>47</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf47 -->
+<!-- Centaur L4 affiliated with membuf47 -->
 
 <targetInstance>
-    <id>sys0node0membuf47mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf47l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-47/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-47/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13392,19 +13392,19 @@
     <attribute><id>VPD_REC_NUM</id><default>48</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf48 -->
+<!-- Centaur L4 affiliated with membuf48 -->
 
 <targetInstance>
-    <id>sys0node0membuf48mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf48l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0030</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-48/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-48/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13490,19 +13490,19 @@
     <attribute><id>VPD_REC_NUM</id><default>49</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf49 -->
+<!-- Centaur L4 affiliated with membuf49 -->
 
 <targetInstance>
-    <id>sys0node0membuf49mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf49l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0031</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-49/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-49/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13588,19 +13588,19 @@
     <attribute><id>VPD_REC_NUM</id><default>50</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf50 -->
+<!-- Centaur L4 affiliated with membuf50 -->
 
 <targetInstance>
-    <id>sys0node0membuf50mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf50l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0032</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-50/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-50/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13686,19 +13686,19 @@
     <attribute><id>VPD_REC_NUM</id><default>51</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf51 -->
+<!-- Centaur L4 affiliated with membuf51 -->
 
 <targetInstance>
-    <id>sys0node0membuf51mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf51l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0033</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-51/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-51/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13784,19 +13784,19 @@
     <attribute><id>VPD_REC_NUM</id><default>52</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf52 -->
+<!-- Centaur L4 affiliated with membuf52 -->
 
 <targetInstance>
-    <id>sys0node0membuf52mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf52l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0034</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-52/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-52/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13882,19 +13882,19 @@
     <attribute><id>VPD_REC_NUM</id><default>53</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf53 -->
+<!-- Centaur L4 affiliated with membuf53 -->
 
 <targetInstance>
-    <id>sys0node0membuf53mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf53l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0035</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-53/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-53/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13980,19 +13980,19 @@
     <attribute><id>VPD_REC_NUM</id><default>54</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf54 -->
+<!-- Centaur L4 affiliated with membuf54 -->
 
 <targetInstance>
-    <id>sys0node0membuf54mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf54l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0036</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-54/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-54/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14078,19 +14078,19 @@
     <attribute><id>VPD_REC_NUM</id><default>55</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf55 -->
+<!-- Centaur L4 affiliated with membuf55 -->
 
 <targetInstance>
-    <id>sys0node0membuf55mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf55l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0037</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-55/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-55/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14176,19 +14176,19 @@
     <attribute><id>VPD_REC_NUM</id><default>56</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf56 -->
+<!-- Centaur L4 affiliated with membuf56 -->
 
 <targetInstance>
-    <id>sys0node0membuf56mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf56l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0038</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-56/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-56/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14274,19 +14274,19 @@
     <attribute><id>VPD_REC_NUM</id><default>57</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf57 -->
+<!-- Centaur L4 affiliated with membuf57 -->
 
 <targetInstance>
-    <id>sys0node0membuf57mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf57l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0039</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-57/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-57/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14372,19 +14372,19 @@
     <attribute><id>VPD_REC_NUM</id><default>58</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf58 -->
+<!-- Centaur L4 affiliated with membuf58 -->
 
 <targetInstance>
-    <id>sys0node0membuf58mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf58l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-58/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-58/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14470,19 +14470,19 @@
     <attribute><id>VPD_REC_NUM</id><default>59</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf59 -->
+<!-- Centaur L4 affiliated with membuf59 -->
 
 <targetInstance>
-    <id>sys0node0membuf59mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf59l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-59/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-59/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14568,19 +14568,19 @@
     <attribute><id>VPD_REC_NUM</id><default>60</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf60 -->
+<!-- Centaur L4 affiliated with membuf60 -->
 
 <targetInstance>
-    <id>sys0node0membuf60mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf60l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-60/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-60/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14666,19 +14666,19 @@
     <attribute><id>VPD_REC_NUM</id><default>61</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf61 -->
+<!-- Centaur L4 affiliated with membuf61 -->
 
 <targetInstance>
-    <id>sys0node0membuf61mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf61l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-61/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-61/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14764,19 +14764,19 @@
     <attribute><id>VPD_REC_NUM</id><default>62</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf62 -->
+<!-- Centaur L4 affiliated with membuf62 -->
 
 <targetInstance>
-    <id>sys0node0membuf62mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf62l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-62/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-62/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14862,19 +14862,19 @@
     <attribute><id>VPD_REC_NUM</id><default>63</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf63 -->
+<!-- Centaur L4 affiliated with membuf63 -->
 
 <targetInstance>
-    <id>sys0node0membuf63mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf63l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-63/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-63/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>