Preload PNOR VPD correctly

- Handle Venice, Murano, Tuleta - Change SPD code to use VPD_REC_NUM attribute - Modify FAPI/HWPF tests to use present DIMM targets Change-Id: I2348a2da90ea85a966f3724f8b3694a0b8f03916 RTC: 40774 Depends-on: I7d1b41c9f9e87baa9d42b78bf4351e3b6d774cb5 RTC: 39133 Depends-on: Ia0f22c87f8bc3959324fa8347e191f2b47b4325c RTC: 35835 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/950 Tested-by: Jenkins Server Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
author: Terry J. Opie <opiet@us.ibm.com> 2012-04-25 11:39:05 -0500
committer: A. Patrick Williams III <iawillia@us.ibm.com> 2012-06-18 16:38:55 -0500
commit: e9de3b17d17a3c230ae9db3ed7d4139950cd4963 (patch)
tree: d71fec7cbd502e07d94c64590cff1401c9f3b155
parent: e14f34f3648159c2fd5d62900ee5568ca2b78af3 (diff)
download: talos-hostboot-e9de3b17d17a3c230ae9db3ed7d4139950cd4963.tar.gz
talos-hostboot-e9de3b17d17a3c230ae9db3ed7d4139950cd4963.zip
14 files changed, 1108 insertions, 928 deletions
diff --git a/src/build/simics/hb-pnor-mvpd-preload.pl b/src/build/simics/hb-pnor-mvpd-preload.pl
index 503064e1b..54a144965 100755
--- a/src/build/simics/hb-pnor-mvpd-preload.pl
+++ b/src/build/simics/hb-pnor-mvpd-preload.pl
@@ -30,6 +30,7 @@ my $numProcs;
 my $numCentPerProc;
 my $dataPath = ".";
 my $outputPath = ".";
+my $machine = "MURANO";
 
 # Create temp file for MVPD
 my $emptyMVPDfh;
@@ -49,6 +50,7 @@ my $sysSPD = "sysspd.dat";
 my $MAX_PROCS = 8;
 my $MAX_CENT_PER_PROC = 8;
 my $MAX_DIMMS_PER_CENT = 8;
+my $MAX_MCS = 8;
 
 
 while( $ARGV = shift )
@@ -57,16 +59,25 @@ while( $ARGV = shift )
         $ARGV =~ m/-np/ )
     {
         $numProcs = shift;
+        debugMsg( "Num Procs: $numProcs" );
     }
     elsif( $ARGV =~ m/--numCentPerProc/ ||
            $ARGV =~ m/-ncpp/ )
     {
         $numCentPerProc = shift;
+        debugMsg( "Num Centaurs Per Proc: $numCentPerProc" );
     }
     elsif( $ARGV =~ m/--dataPath/ ||
-           $ARGV =~ m/-dp/ )
+        $ARGV =~ m/-dp/ )
     {
         $dataPath = shift;
+        debugMsg( "Data Path: $dataPath" );
+    }
+    elsif( $ARGV =~ m/--machine/ ||
+        $ARGV =~ m/-m/ )
+    {
+        $machine = shift;
+        debugMsg( "Machine: $machine" );
     }
     elsif( $ARGV =~ m/--outputPath/ ||
            $ARGV =~ m/-op/ )
@@ -79,9 +90,6 @@ while( $ARGV = shift )
     }
 }
 
-debugMsg( "numProcs: $numProcs" );
-debugMsg( "numCentPerProc: $numCentPerProc" );
-
 createMVPDData();
 createSPDData();
 cleanup();
@@ -99,10 +107,12 @@ exit 0;
 sub usage
 {
     print "Usage: $0 -numProcs <value> -numCentPerProc <value> [-dataPath]\n";
-    print "         [-h | --help]\n";
+    print "         [-m | --machine <value>] [-h | --help]\n";
     print "\n";
     print "  -np    --numProcs        Number of Processors in the drawer.\n";
     print "  -ncpp  --numCentPerProc  Number of Centaurs per Processor.\n";
+    print "  -m     --machine         Text machine to build data for.\n";
+    print "                              Default: MURANO\n";
     print "  -dp    --dataPath        Path to where VPD data files are located.\n";
     print "  -op    --outputPath      Path where VPD files should end up.\n";
     print "                              Default: ./\n";
@@ -151,6 +161,12 @@ sub createMVPDData
         system( "rm -rf $sysMVPDFile" );
     }
 
+    # Currently it looks like all processors are populated in the order that
+    # they are numbered.  The following logic should work for every platform.
+    # If this ever changes, building the MVPD data and SPD data will need to
+    # be combined to not duplicate the logic for determining which processors
+    # have which DIMMs.
+    
     # Create empty processor MVPD chunk.
     $cmd = "echo \"00FFFF: 00\" \| xxd -r \> $emptyMVPD";
     system( $cmd ) == 0 or die "Creating $emptyMVPD failed!";
@@ -194,6 +210,7 @@ sub createSPDData
     my $result;
     my $sourceFile;
     my $sysSPDFile = "$outputPath/$sysSPD";
+    my @mcsArray = ( 0,0,0,0,0,0,0,0 );
 
     if( -e $sysSPDFile )
     {
@@ -205,20 +222,83 @@ sub createSPDData
     $cmd = " echo \"0001FF: 00\" \| xxd -r \> $emptySPD";
     system( $cmd ) == 0 or die "Creating $emptySPD failed!";
 
+    # Populating DIMMs is different across every system.  The following case
+    # statement will handle populating DIMMs based on the system type
+    debugMsg( "Preload DIMMs for $machine" );
+    for( my $mcs = 0; $mcs < $MAX_MCS; $mcs++ )
+    {
+        debugMsg( "Mcs: $mcs" );
+        if( $machine eq "MURANO" )
+        {
+            # Plugging order is:
+            #   Processor 0 - 3
+            #   MCS 4 - 7 (1 Centaur/MCS)
+            if( $mcs >= 4 &&
+                $mcs <= (4 + ($numCentPerProc - 1)) )
+            {
+                $mcsArray[$mcs] = 1;
+            }
+        }
+        elsif( $machine eq "VENICE" )
+        {
+            # Plugging order is:
+            #   Processor 0 - 7
+            #   MCS 4 - 7, then 0 - 3
+            if( ($numCentPerProc <= 4) &&
+                ($mcs >= 4) &&
+                ($mcs <= (4 + ($numCentPerProc - 1))) )
+            {
+                $mcsArray[$mcs] = 1;
+            }
+            elsif( $numCentPerProc > 4 )
+            {
+                if( $mcs >= 4 &&
+                    $mcs <= 7 )
+                {
+                    $mcsArray[$mcs] = 1;
+                }
+                elsif( $mcs >= 0 &&
+                       $mcs < ($numCentPerProc - 4) )
+                   {
+                       $mcsArray[$mcs] = 1;
+                   }
+            }
+        }
+        elsif( $machine eq "TULETA" )
+        {
+            # Plugging order is:
+            #   Processor 0 - 3
+            #   MCS 7 - 4 (1 Centaury/MCS)
+            if( $mcs >= (7 - ($numCentPerProc - 1)) &&
+                $mcs <= 7 )
+            {
+                $mcsArray[$mcs] = 1;
+            }
+        }
+        else
+        {
+            die "Invalid machine ($machine)!!!  Cannot preload DIMM VPD \
+            data...exiting.";
+        }
+    }
+
+    debugMsg( "@mcsArray" );
     for( my $proc = 0; $proc < $MAX_PROCS; $proc++ )
     {
         for( my $cent = 0; $cent < $MAX_CENT_PER_PROC; $cent++ )
         {
             for( my $dimm = 0; $dimm < $MAX_DIMMS_PER_CENT; $dimm++ )
             {
-                if( ($cent < $numCentPerProc) &&
+                if( ($mcsArray[$cent] == 1) &&
                     ($proc < $numProcs) )
                 {
+                    debugMsg( "$machine( $proc, $cent, $dimm ): Real File" );
                     # Use the real data to the full image
                     $sourceFile = "$dataPath/$spdFile";
                 }
                 else
                 {
+                    debugMsg( "$machine( $proc, $cent, $dimm ): Empty file" );
                     # No dimm, use empty data chunk
                     $sourceFile = $emptySPD;
                 }
@@ -232,6 +312,7 @@ sub createSPDData
         }
     }
 
+
     if( -e $sysSPDFile )
     {
         system( "chmod 775 $sysSPDFile" );
diff --git a/src/build/simics/hb-pnor-mvpd-preload.py b/src/build/simics/hb-pnor-mvpd-preload.py
index 4e5c0c0c7..67c926a3f 100755
--- a/src/build/simics/hb-pnor-mvpd-preload.py
+++ b/src/build/simics/hb-pnor-mvpd-preload.py
@@ -31,7 +31,7 @@ toolLoc = os.environ.get("HB_TOOLPATH");
 thisSys = os.environ.get("HB_MACHINE").upper();
 numProcs = os.environ.get( "GFW_P8_%s_NUM_PROCS" % thisSys );
 numCentaurPerProc = os.environ.get( "GFW_P8_%s_CENTAURS_PER_PROC" % thisSys );
-cmd = toolLoc + "/hb-pnor-mvpd-preload.pl --numProcs " + numProcs + " --numCentPerProc " + numCentaurPerProc + " --dataPath " + toolLoc
+cmd = toolLoc + "/hb-pnor-mvpd-preload.pl --numProcs " + numProcs + " --numCentPerProc " + numCentaurPerProc + " --machine " + thisSys + " --dataPath " + toolLoc
 print "Generate PNOR VPD for " + numProcs + " processor(s), and " + numCentaurPerProc + " Centaur(s) per Processor.";
 args = shlex.split( cmd );
 subprocess.call( args );
diff --git a/src/include/usr/targeting/common/utilFilter.H b/src/include/usr/targeting/common/utilFilter.H
index bcb13afef..9b58b2fdb 100644
--- a/src/include/usr/targeting/common/utilFilter.H
+++ b/src/include/usr/targeting/common/utilFilter.H
@@ -47,7 +47,7 @@ namespace TARGETING
  * @parm[in]  i_type, the type of the chip targets to be obtained
  * @parm[in]  i_functional, set to true to return only functional targets
  *
- * @return N/A 
+ * @return N/A
  */
 void getAllChips(TARGETING::TargetHandleList & o_vector,
                       TYPE i_type, bool i_functional = true );
@@ -60,7 +60,7 @@ void getAllChips(TARGETING::TargetHandleList & o_vector,
  * @parm[in]  i_type, the type of the chiplet targets to be obtained
  * @parm[in]  i_functional, set to true to return only functional targets
  *
- * @return N/A 
+ * @return N/A
  */
 void getAllChiplets(TARGETING::TargetHandleList & o_vector,
                       TYPE i_type, bool i_functional = true );
@@ -74,7 +74,7 @@ void getAllChiplets(TARGETING::TargetHandleList & o_vector,
  * @parm[in]  i_type, the type of the chiplet targets to be obtained
  * @parm[in]  i_functional, set to true to return only functional targets
  *
- * @return N/A 
+ * @return N/A
  */
 void getChildChiplets(TARGETING::TargetHandleList & o_vector,
                const Target * i_chip, TYPE i_type, bool i_functional = true );
@@ -88,7 +88,7 @@ void getChildChiplets(TARGETING::TargetHandleList & o_vector,
  * @parm[in]  i_type, the type of the chip target to be obtained
  * @parm[in]  i_functional, set to true to return only functional targets
  *
- * @return N/A 
+ * @return N/A
  */
 void getAffinityChips( TARGETING::TargetHandleList& o_vector,
            const Target * i_chiplet, TYPE i_type, bool i_functional = true );
@@ -102,6 +102,35 @@ void getAffinityChips( TARGETING::TargetHandleList& o_vector,
  */
 const Target * getParentChip( const Target * i_pChiplet );
 
+
+/**
+ * @brief Return a list of all cards in a system
+ *
+ * @param[out] o_vector - Vector of the matching targets.
+ * @param[in] i_cardType - The Targeting type.
+ * @param[in] i_function - Return only Functional cards, default = true
+ *
+ * @return NONE
+ */
+void getAllCards( TARGETING::TargetHandleList & o_vector,
+                  TYPE i_cardType,
+                  bool i_functional = true );
+
+
+/**
+ * @brief Return a list of all cards in a system
+ *
+ * @param[out] o_vector - Vector of the matching targets.
+ * @param[in] i_cardType - The Targeting type.
+ * @param[in] i_function - Return only Functional cards, default = true
+ *
+ * @return NONE
+ */
+
+void getAllLogicalCards( TARGETING::TargetHandleList & o_vector,
+                         TYPE i_cardType,
+                         bool i_functional = true );
+
 }
 
 #endif // __TARGETING_COMMON_UTIL_H
diff --git a/src/usr/hwpf/hwp/fapiTestHwpDq.C b/src/usr/hwpf/hwp/fapiTestHwpDq.C
index d3de5e1eb..746a30a6e 100644
--- a/src/usr/hwpf/hwp/fapiTestHwpDq.C
+++ b/src/usr/hwpf/hwp/fapiTestHwpDq.C
@@ -1,25 +1,26 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/hwpf/hwp/fapiTestHwpDq.C $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2012
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/*  IBM_PROLOG_BEGIN_TAG
+ *  This is an automatically generated prolog.
+ *
+ *  $Source: src/usr/hwpf/hwp/fapiTestHwpDq.C $
+ *
+ *  IBM CONFIDENTIAL
+ *
+ *  COPYRIGHT International Business Machines Corp. 2012
+ *
+ *  p1
+ *
+ *  Object Code Only (OCO) source materials
+ *  Licensed Internal Code Source Materials
+ *  IBM HostBoot Licensed Internal Code
+ *
+ *  The source code for this program is not published or other-
+ *  wise divested of its trade secrets, irrespective of what has
+ *  been deposited with the U.S. Copyright Office.
+ *
+ *  Origin: 30
+ *
+ *  IBM_PROLOG_END_TAG
+ */
 /**
  *  @file fapiTestHwpDq.C
  *
@@ -31,6 +32,7 @@
  * Flag     Defect/Feature  User        Date        Description
  * ------   --------------  ----------  ----------- ----------------------------
  *                          mjjones     02/21/2012  Created
+ *                          mjjones     06/14/2012  Test functional DIMM
  */
 
 #include <fapiTestHwpDq.H>
@@ -62,8 +64,44 @@ fapi::ReturnCode fapiTestHwpDq(const fapi::Target & i_mba)
         FAPI_INF("fapiTestHwpDq: Got expected error from dimmGetBadDqBitmap");
         l_rc = fapi::FAPI_RC_SUCCESS;
 
-        // Get the bad DQ Bitmap for port1, dimm0, rank3
-        l_rc = dimmGetBadDqBitmap(i_mba, 1, 0, 3, l_dqBitmap);
+        // Get associated functional DIMMs
+        std::vector<fapi::Target> l_dimms;
+        l_rc = fapiGetAssociatedDimms(i_mba, l_dimms);
+
+        if (l_rc)
+        {
+            FAPI_ERR("fapiTestHwpDq: Error from fapiGetAssociatedDimms");
+            break;
+        }
+
+        if (l_dimms.size() == 0)
+        {
+            FAPI_ERR("fapiTestHwpDq: Did not find any functional DIMMs, skipping");
+            break;
+        }
+
+        // Get the first DIMM's port and dimm number
+        uint8_t l_port = 0;
+        uint8_t l_dimm = 0;
+
+        l_rc = FAPI_ATTR_GET(ATTR_MBA_PORT, &(l_dimms[0]), l_port);
+
+        if (l_rc)
+        {
+            FAPI_ERR("fapiTestHwpDq: Error getting ATTR_MBA_PORT");
+            break;
+        }
+
+        l_rc = FAPI_ATTR_GET(ATTR_MBA_DIMM, &(l_dimms[0]), l_dimm);
+
+        if (l_rc)
+        {
+            FAPI_ERR("fapiTestHwpDq: Error getting ATTR_MBA_DIMM");
+            break;
+        }
+
+        // Get the bad DQ Bitmap for the DIMM, rank 3
+        l_rc = dimmGetBadDqBitmap(i_mba, l_port, l_dimm, 3, l_dqBitmap);
 
         if (l_rc)
         {
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index 772ad53eb..49dc4321f 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -1,25 +1,26 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/hwpf/test/hwpftest.H $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/*  IBM_PROLOG_BEGIN_TAG
+ *  This is an automatically generated prolog.
+ *
+ *  $Source: src/usr/hwpf/test/hwpftest.H $
+ *
+ *  IBM CONFIDENTIAL
+ *
+ *  COPYRIGHT International Business Machines Corp. 2011-2012
+ *
+ *  p1
+ *
+ *  Object Code Only (OCO) source materials
+ *  Licensed Internal Code Source Materials
+ *  IBM HostBoot Licensed Internal Code
+ *
+ *  The source code for this program is not published or other-
+ *  wise divested of its trade secrets, irrespective of what has
+ *  been deposited with the U.S. Copyright Office.
+ *
+ *  Origin: 30
+ *
+ *  IBM_PROLOG_END_TAG
+ */
 #ifndef __HWPFTEST_H
 #define __HWPFTEST_H
 
@@ -35,6 +36,7 @@
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <targeting/common/commontargeting.H>
+#include <targeting/common/utilFilter.H>
 #include <fapiHwpExecInitFile.H>
 #include <spd/spdenums.H>
 
@@ -524,7 +526,7 @@ public:
 
             //Call Hwp to execute the initfile
             FAPI_EXEC_HWP(l_rc, fapiHwpExecInitFile, l_target, "sample.if");
-            
+
             if (l_rc != fapi::FAPI_RC_SUCCESS)
             {
                 TS_FAIL("testHwpf5: Error from fapiHwpExecInitFile");
@@ -720,28 +722,11 @@ public:
 
         do
         {
-            // Get top level system target
-            TARGETING::TargetService& tS = TARGETING::targetService();
-            TARGETING::Target * sysTarget = NULL;
-            tS.getTopLevelTarget( sysTarget );
-
-            if (sysTarget == NULL)
-            {
-                FAPI_ERR("testHwpf8: Can't obtain system target");
-                break;
-            }
-
             // Get a DIMM Target
-            TARGETING::PredicateCTM predDimm( TARGETING::CLASS_LOGICAL_CARD,
-                                              TARGETING::TYPE_DIMM );
             TargetHandleList dimmList;
+            getAllLogicalCards( dimmList,
+                                TARGETING::TYPE_DIMM );
 
-            tS.getAssociated( dimmList,
-                              sysTarget,
-                              TARGETING::TargetService::CHILD,
-                              TARGETING::TargetService::ALL,
-                              &predDimm );
- 
             if (dimmList.size())
             {
                 fapi::Target l_dTarget(TARGET_TYPE_DIMM,
@@ -773,34 +758,54 @@ public:
     {
         errlHndl_t l_err = NULL;
 
-        // Look for MBA chiplets
-        TARGETING::PredicateCTM l_mbaFilter(CLASS_UNIT, TYPE_MBA);
+        // Look for functional DIMMs
+        TARGETING::PredicateIsFunctional l_functional;
+        TARGETING::PredicateCTM l_dimmFilter(CLASS_LOGICAL_CARD, TYPE_DIMM);
+        TARGETING::PredicatePostfixExpr l_functionalDimms;
+        l_functionalDimms.push(&l_dimmFilter).push(&l_functional).And();
+
         TARGETING::TargetRangeFilter l_filter(
             TARGETING::targetService().begin(),
             TARGETING::targetService().end(),
-            &l_mbaFilter);
+            &l_functionalDimms);
 
-        // Invoke the HWP on the first one
+        // Look for the first functional DIMM
         if (l_filter)
         {
-            fapi::Target l_fapiTarget(TARGET_TYPE_MBA_CHIPLET,
-                static_cast<void *> (*l_filter));
+            // Get the associated MBA
+            TARGETING::PredicateCTM l_mbaFilter(CLASS_UNIT, TYPE_MBA);
+            TARGETING::TargetHandleList l_MBAs;
 
-            FAPI_INVOKE_HWP(l_err, fapiTestHwpDq, l_fapiTarget);
+            TARGETING::targetService().getAssociated(l_MBAs, (*l_filter),
+                TARGETING::TargetService::PARENT_BY_AFFINITY,
+                TARGETING::TargetService::ALL,
+                &l_mbaFilter);
 
-            if (l_err)
+            if (l_MBAs.size() == 1)
             {
-                TS_FAIL("testHwpf9: fapiTestHwpDq failed. Error logged");
-                errlCommit(l_err, HWPF_COMP_ID);
+                fapi::Target l_fapiTarget(TARGET_TYPE_MBA_CHIPLET,
+                    static_cast<void *>(l_MBAs[0]));
+
+                FAPI_INVOKE_HWP(l_err, fapiTestHwpDq, l_fapiTarget);
+
+                if (l_err)
+                {
+                    TS_FAIL("testHwpf9: fapiTestHwpDq failed. Error logged");
+                    errlCommit(l_err, HWPF_COMP_ID);
+                }
+                else
+                {
+                    TS_TRACE("testHwpf9: Unit Test passed");
+                }
             }
             else
             {
-                TS_TRACE("testHwpf9: Unit Test passed");
+                TS_FAIL("testHwpf9: Parent MBA not found");
             }
         }
         else
         {
-            TS_TRACE("testHwpf9: No MBAs found, skipping test");
+            TS_TRACE("testHwpf9: No functional DIMMs found, skipping test");
         }
     }
 
diff --git a/src/usr/initservice/extinitsvc/extinitsvc.C b/src/usr/initservice/extinitsvc/extinitsvc.C
index f90e97651..10eacd2e4 100644
--- a/src/usr/initservice/extinitsvc/extinitsvc.C
+++ b/src/usr/initservice/extinitsvc/extinitsvc.C
@@ -1,26 +1,26 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/initservice/extinitsvc/extinitsvc.C $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
-
+/*  IBM_PROLOG_BEGIN_TAG
+ *  This is an automatically generated prolog.
+ *
+ *  $Source: src/usr/initservice/extinitsvc/extinitsvc.C $
+ *
+ *  IBM CONFIDENTIAL
+ *
+ *  COPYRIGHT International Business Machines Corp. 2011-2012
+ *
+ *  p1
+ *
+ *  Object Code Only (OCO) source materials
+ *  Licensed Internal Code Source Materials
+ *  IBM HostBoot Licensed Internal Code
+ *
+ *  The source code for this program is not published or other-
+ *  wise divested of its trade secrets, irrespective of what has
+ *  been deposited with the U.S. Copyright Office.
+ *
+ *  Origin: 30
+ *
+ *  IBM_PROLOG_END_TAG
+ */
 /**
  * @file    extinitsvc.C
  *
@@ -170,7 +170,7 @@ errlHndl_t ExtInitSvc::executeUnitTests ( void )
 {
     errlHndl_t err = NULL;
 
-    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+    TRACDCOMP( g_trac_initsvc,
                ENTER_MRK"executeUnitTests()" );
 
     do
diff --git a/src/usr/pnor/pnordd.C b/src/usr/pnor/pnordd.C
index 664efb2ca..bd610f81b 100644
--- a/src/usr/pnor/pnordd.C
+++ b/src/usr/pnor/pnordd.C
@@ -104,7 +104,7 @@ errlHndl_t ddRead(DeviceFW::OperationType i_opType,
         {
             break;
         }
- 
+
     }while(0);
 
     return l_err;
@@ -155,7 +155,7 @@ errlHndl_t ddWrite(DeviceFW::OperationType i_opType,
         {
             break;
         }
- 
+
     }while(0);
 
     return l_err;
@@ -169,7 +169,7 @@ void testRealPnor(void *io_pArgs)
 {
     //        TARGETING::Target* l_testTarget =
     //          TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL;
-    size_t l_size = sizeof(uint64_t); 
+    size_t l_size = sizeof(uint64_t);
     errlHndl_t l_err = NULL;
     uint64_t fails = 0;
     uint64_t total = 0;
@@ -269,7 +269,7 @@ errlHndl_t PnorDD::readFlash(void* o_buffer,
     do{
         //mask off chip select for now, will probably break up fake PNOR into
         //multiple fake chips eventually
-        uint64_t l_address = i_address & 0x00000000FFFFFFFF;    
+        uint64_t l_address = i_address & 0x00000000FFFFFFFF;
 
         l_err = verifyFlashAddressRange(l_address, io_buflen);
         if(l_err)
@@ -307,7 +307,7 @@ errlHndl_t PnorDD::writeFlash(void* i_buffer,
     //TRACDCOMP(g_trac_pnor, "PnorDD::writeFlash(i_address=0x%llx)> ", i_address);
     errlHndl_t l_err = NULL;
 
-    do{        
+    do{
         TRACDCOMP(g_trac_pnor,"PNOR write %.8X", i_address);
 
         //mask off chip select for now, will probably break up fake PNOR into
@@ -507,7 +507,7 @@ void PnorDD::sfcInit( )
                                     SFC_REG_CONF4,
                                     sm_erase_op);
                 if(l_err) { break; }
-                
+
 
                 l_err = writeRegSfc(SFC_CMD_SPACE,
                                     SFC_REG_CONF5,
@@ -522,7 +522,7 @@ void PnorDD::sfcInit( )
                 }
 
                 if(l_err) { break; }
-    
+
 
             }
             else
@@ -534,7 +534,7 @@ void PnorDD::sfcInit( )
                  * @reasoncode   PNOR::RC_UNSUPORTED_HARDWARE
                  * @userdata1    NOR Flash Chip ID
                  * @userdata2    <not used>
-                 * @devdesc      PnorDD::sfcInit> 
+                 * @devdesc      PnorDD::sfcInit>
                  */
                 l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                                 PNOR::MOD_PNORDD_SFCINIT,
@@ -614,7 +614,7 @@ errlHndl_t PnorDD::writeRegSfc(SfcRange i_range,
     }
 
     TRACDCOMP( g_trac_pnor, "PnorDD::writeRegSfc> lpc_addr=0x%.8x, i_data=0x%.8x",
-               lpc_addr, i_data ); 
+               lpc_addr, i_data );
     l_err = writeLPC(lpc_addr, i_data);
 
     return l_err;
@@ -639,7 +639,7 @@ errlHndl_t PnorDD::readRegSfc(SfcRange i_range,
 
     l_err = readLPC(lpc_addr, o_data);
     TRACDCOMP( g_trac_pnor, "PnorDD::readRegSfc> lpc_addr=0x%.8x, o_data=0x%.8x",
-               lpc_addr, o_data ); 
+               lpc_addr, o_data );
 
     return l_err;
 }
@@ -764,7 +764,7 @@ errlHndl_t PnorDD::loadSfcBuf(uint32_t i_addr,
 {
     errlHndl_t l_err = NULL;
     TRACDCOMP( g_trac_pnor, "PnorDD::loadSfcBuf> i_addr=0x%.8x, i_size=0x%.8x",
-               i_addr, i_size ); 
+               i_addr, i_size );
 
     do {
         //Write flash address to ADR reg
@@ -773,7 +773,7 @@ errlHndl_t PnorDD::loadSfcBuf(uint32_t i_addr,
                             i_addr);
         if(l_err) { break; }
 
-        //Issue ReadRaw command with size to read 
+        //Issue ReadRaw command with size to read
         SfcCmdReg_t sfc_cmd;
         sfc_cmd.opcode = SFC_OP_READRAW;
         sfc_cmd.length = i_size;
@@ -810,7 +810,7 @@ errlHndl_t PnorDD::flushSfcBuf(uint32_t i_addr,
                             i_addr);
         if(l_err) { break; }
 
-        //Issue WriteRaw command + size to write 
+        //Issue WriteRaw command + size to write
         SfcCmdReg_t sfc_cmd;
         sfc_cmd.opcode = SFC_OP_WRITERAW;
         sfc_cmd.length = i_size;
@@ -840,7 +840,7 @@ errlHndl_t PnorDD::bufferedSfcRead(uint32_t i_addr,
 {
     errlHndl_t l_err = NULL;
     TRACDCOMP( g_trac_pnor, "PnorDD::bufferedSfcRead> i_addr=0x%.8x, i_size=0x%.8x",
-               i_addr, i_size ); 
+               i_addr, i_size );
 
     do{
 
@@ -1005,7 +1005,7 @@ errlHndl_t PnorDD::readLPC(uint32_t i_addr,
 
     do {
 
-        //@todo (RTC:36950) - add non-master support  
+        //@todo (RTC:36950) - add non-master support
         TARGETING::Target* scom_target =
           TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL;
 
@@ -1094,19 +1094,19 @@ errlHndl_t PnorDD::writeLPC(uint32_t i_addr,
                             uint32_t i_data)
 {
     errlHndl_t l_err = NULL;
-   
+
     TRACDCOMP(g_trac_pnor, "writeLPC> %.8X = %.8X", i_addr, i_data );
 
     do {
 
-        //@todo (RTC:36950) - add non-master support  
+        //@todo (RTC:36950) - add non-master support
         TARGETING::Target* scom_target =
           TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL;
 
         // always read/write 64 bits to SCOM
         size_t scom_size = sizeof(uint64_t);
 
-        // write data register 
+        // write data register
         TRACDCOMP(g_trac_pnor, "writeLPC> Write ECCB data register");
 
         uint64_t eccb_data = static_cast<uint64_t>(i_data);
@@ -1119,10 +1119,10 @@ errlHndl_t PnorDD::writeLPC(uint32_t i_addr,
         if( l_err ) { break; }
 
         // write command register with LPC address to write
-        TRACDCOMP(g_trac_pnor, "writeLPC> Write ECCB command register, cmd=0x%.16x", eccb_cmd.data64 );
         ControlReg_t eccb_cmd;
         eccb_cmd.read_op = 0;
         eccb_cmd.address = i_addr;
+        TRACDCOMP(g_trac_pnor, "writeLPC> Write ECCB command register, cmd=0x%.16x", eccb_cmd.data64 );
         l_err = deviceOp( DeviceFW::WRITE,
                           scom_target,
                           &(eccb_cmd.data64),
@@ -1206,7 +1206,7 @@ errlHndl_t PnorDD::compareAndWriteBlock(uint32_t i_blockStart,
     TRACDCOMP(g_trac_pnor,">>compareAndWriteBlock(0x%.8X,0x%.8X,0x%.8X)", i_blockStart, i_writeStart, i_bytesToWrite);
     errlHndl_t l_err = NULL;
     uint8_t* read_data = NULL;
-    
+
     do {
 
         // remember any data we read so we don't have to reread it later
@@ -1218,7 +1218,7 @@ errlHndl_t PnorDD::compareAndWriteBlock(uint32_t i_blockStart,
 
         //STEP 1: Read data in PNOR for compares (only read section we want to write)
         //read_start needs to be uint32* for bitwise word compares later
-        uint32_t* read_start = (uint32_t*)(read_data + i_writeStart-i_blockStart); 
+        uint32_t* read_start = (uint32_t*)(read_data + i_writeStart-i_blockStart);
         l_err =  bufferedSfcRead(i_writeStart,
                                  i_bytesToWrite,
                                  (void*) read_start);
@@ -1238,7 +1238,7 @@ errlHndl_t PnorDD::compareAndWriteBlock(uint32_t i_blockStart,
                 //Can only write zeros to NOR, see if any bits changed from 0->1
                 if( (~(read_start[cword])) & (i_dataWord[cword]) )
                 {
-                    need_erase = true;                   
+                    need_erase = true;
 
                     // skip comparing the rest of the block,
                     //   just start writing it
diff --git a/src/usr/spd/spd.C b/src/usr/spd/spd.C
index 3d7f34eb3..e472d7885 100755
--- a/src/usr/spd/spd.C
+++ b/src/usr/spd/spd.C
@@ -968,15 +968,8 @@ errlHndl_t getVpdLocation ( int64_t & o_vpdLocation,
     TRACSSCOMP( g_trac_spd,
                 ENTER_MRK"getVpdLocation()" );
 
-    // TODO - Story 39133 is complete.  And thus we should be able to use the
-    // VPD_REC_NUM attribute.  But Simics is still in the process of changing
-    // their plugging order.  Thus, there are most likely tweaks that still
-    // need to be done to the VPD preload script, as well as the system
-    // attribute xml files.  Once Simics is done, then we can step back and
-    // see exactly what part(s) need to be modified to accomodate.
-//    o_vpdLocation = i_target->getAttr<TARGETING::ATTR_VPD_REC_NUM>();
-    o_vpdLocation = 0;
-    TRACFCOMP( g_trac_spd,
+    o_vpdLocation = i_target->getAttr<TARGETING::ATTR_VPD_REC_NUM>();
+    TRACUCOMP( g_trac_spd,
                INFO_MRK"Using VPD location: %d",
                o_vpdLocation );
 
diff --git a/src/usr/spd/test/spdtest.H b/src/usr/spd/test/spdtest.H
index 7caee42a7..e00abe773 100755
--- a/src/usr/spd/test/spdtest.H
+++ b/src/usr/spd/test/spdtest.H
@@ -36,6 +36,7 @@
 #include <errl/errlentry.H>
 #include <devicefw/driverif.H>
 #include <targeting/common/predicates/predicates.H>
+#include <targeting/common/utilFilter.H>
 
 #include <spd/spdreasoncodes.H>
 #include <spd/spdenums.H>
@@ -49,20 +50,9 @@ using namespace SPD;
 
 void getDIMMTargets ( TargetHandleList & o_dimmList )
 {
-    // Get top level system target
-    TARGETING::TargetService& tS = TARGETING::targetService();
-    TARGETING::Target * sysTarget = NULL;
-    tS.getTopLevelTarget( sysTarget );
-    assert( sysTarget != NULL );
-
-    // Get a DIMM Target
-    TARGETING::PredicateCTM predDimm( TARGETING::CLASS_LOGICAL_CARD,
-                                      TARGETING::TYPE_DIMM );
-    tS.getAssociated( o_dimmList,
-                      sysTarget,
-                      TARGETING::TargetService::CHILD,
-                      TARGETING::TargetService::ALL,
-                      &predDimm );
+    // Get Dimm list.
+    getAllLogicalCards( o_dimmList,
+                        TARGETING::TYPE_DIMM );
     TRACDCOMP( g_trac_spd,
                "getDIMMTargets() - found %d DIMMs",
                o_dimmList.size() );
diff --git a/src/usr/targeting/common/utilFilter.C b/src/usr/targeting/common/utilFilter.C
index 71d7b825a..f6fcc3756 100644
--- a/src/usr/targeting/common/utilFilter.C
+++ b/src/usr/targeting/common/utilFilter.C
@@ -49,7 +49,7 @@ namespace TARGETING
  * @parm[in]  i_type, the type of the targets to be obtained
  * @parm[in]  i_functional, set to true to return only functional targets
  *
- * @return N/A 
+ * @return N/A
  */
 void _getAllChipsOrChiplets( TARGETING::TargetHandleList & o_vector,
                      CLASS i_class, TYPE  i_type, bool i_functional = true )
@@ -86,6 +86,28 @@ void getAllChips( TARGETING::TargetHandleList & o_vector,
 }
 
 
+void getAllLogicalCards( TARGETING::TargetHandleList & o_vector,
+                         TYPE i_cardType,
+                         bool i_functional = true )
+{
+    _getAllChipsOrChiplets( o_vector,
+                            CLASS_LOGICAL_CARD,
+                            i_cardType,
+                            i_functional );
+}
+
+
+void getAllCards( TARGETING::TargetHandleList & o_vector,
+                  TYPE i_cardType,
+                  bool i_functional = true )
+{
+    _getAllChipsOrChiplets( o_vector,
+                            CLASS_CARD,
+                            i_cardType,
+                            i_functional );
+}
+
+
 void getAllChiplets( TARGETING::TargetHandleList & o_vector,
                      TYPE i_chipletType, bool i_functional = true )
 {
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 504258d20..31e4a795c 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -4007,7 +4007,7 @@
 
 <targetInstance>
     <id>sys0node0dimm32</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030020</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4030,7 +4030,7 @@
 
 <targetInstance>
     <id>sys0node0dimm33</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030021</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4053,7 +4053,7 @@
 
 <targetInstance>
     <id>sys0node0dimm34</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030022</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4076,7 +4076,7 @@
 
 <targetInstance>
     <id>sys0node0dimm35</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030023</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4099,7 +4099,7 @@
 
 <targetInstance>
     <id>sys0node0dimm36</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030024</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4122,7 +4122,7 @@
 
 <targetInstance>
     <id>sys0node0dimm37</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030025</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4145,7 +4145,7 @@
 
 <targetInstance>
     <id>sys0node0dimm38</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030026</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4168,7 +4168,7 @@
 
 <targetInstance>
     <id>sys0node0dimm39</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030027</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4191,7 +4191,7 @@
 
 <targetInstance>
     <id>sys0node0dimm40</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030028</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4214,7 +4214,7 @@
 
 <targetInstance>
     <id>sys0node0dimm41</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030029</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4237,7 +4237,7 @@
 
 <targetInstance>
     <id>sys0node0dimm42</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4260,7 +4260,7 @@
 
 <targetInstance>
     <id>sys0node0dimm43</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4283,7 +4283,7 @@
 
 <targetInstance>
     <id>sys0node0dimm44</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4306,7 +4306,7 @@
 
 <targetInstance>
     <id>sys0node0dimm45</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4329,7 +4329,7 @@
 
 <targetInstance>
     <id>sys0node0dimm46</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4352,7 +4352,7 @@
 
 <targetInstance>
     <id>sys0node0dimm47</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4375,7 +4375,7 @@
 
 <targetInstance>
     <id>sys0node0dimm48</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030030</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4398,7 +4398,7 @@
 
 <targetInstance>
     <id>sys0node0dimm49</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030031</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4421,7 +4421,7 @@
 
 <targetInstance>
     <id>sys0node0dimm50</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030032</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4444,7 +4444,7 @@
 
 <targetInstance>
     <id>sys0node0dimm51</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030033</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4467,7 +4467,7 @@
 
 <targetInstance>
     <id>sys0node0dimm52</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030034</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4490,7 +4490,7 @@
 
 <targetInstance>
     <id>sys0node0dimm53</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030035</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4513,7 +4513,7 @@
 
 <targetInstance>
     <id>sys0node0dimm54</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030036</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4536,7 +4536,7 @@
 
 <targetInstance>
     <id>sys0node0dimm55</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030037</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4559,7 +4559,7 @@
 
 <targetInstance>
     <id>sys0node0dimm56</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030038</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4582,7 +4582,7 @@
 
 <targetInstance>
     <id>sys0node0dimm57</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030039</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4605,7 +4605,7 @@
 
 <targetInstance>
     <id>sys0node0dimm58</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4628,7 +4628,7 @@
 
 <targetInstance>
     <id>sys0node0dimm59</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4651,7 +4651,7 @@
 
 <targetInstance>
     <id>sys0node0dimm60</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4674,7 +4674,7 @@
 
 <targetInstance>
     <id>sys0node0dimm61</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4697,7 +4697,7 @@
 
 <targetInstance>
     <id>sys0node0dimm62</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4720,7 +4720,7 @@
 
 <targetInstance>
     <id>sys0node0dimm63</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4743,7 +4743,7 @@
 
 <targetInstance>
     <id>sys0node0dimm96</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030060</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4766,7 +4766,7 @@
 
 <targetInstance>
     <id>sys0node0dimm97</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030061</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4789,7 +4789,7 @@
 
 <targetInstance>
     <id>sys0node0dimm98</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030062</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4812,7 +4812,7 @@
 
 <targetInstance>
     <id>sys0node0dimm99</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030063</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4835,7 +4835,7 @@
 
 <targetInstance>
     <id>sys0node0dimm100</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030064</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4858,7 +4858,7 @@
 
 <targetInstance>
     <id>sys0node0dimm101</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030065</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4881,7 +4881,7 @@
 
 <targetInstance>
     <id>sys0node0dimm102</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030066</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4904,7 +4904,7 @@
 
 <targetInstance>
     <id>sys0node0dimm103</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030067</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4927,7 +4927,7 @@
 
 <targetInstance>
     <id>sys0node0dimm104</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030068</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4950,7 +4950,7 @@
 
 <targetInstance>
     <id>sys0node0dimm105</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030069</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4973,7 +4973,7 @@
 
 <targetInstance>
     <id>sys0node0dimm106</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -4996,7 +4996,7 @@
 
 <targetInstance>
     <id>sys0node0dimm107</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5019,7 +5019,7 @@
 
 <targetInstance>
     <id>sys0node0dimm108</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5042,7 +5042,7 @@
 
 <targetInstance>
     <id>sys0node0dimm109</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5065,7 +5065,7 @@
 
 <targetInstance>
     <id>sys0node0dimm110</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5088,7 +5088,7 @@
 
 <targetInstance>
     <id>sys0node0dimm111</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5111,7 +5111,7 @@
 
 <targetInstance>
     <id>sys0node0dimm112</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030070</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5134,7 +5134,7 @@
 
 <targetInstance>
     <id>sys0node0dimm113</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030071</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5157,7 +5157,7 @@
 
 <targetInstance>
     <id>sys0node0dimm114</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030072</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5180,7 +5180,7 @@
 
 <targetInstance>
     <id>sys0node0dimm115</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030073</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5203,7 +5203,7 @@
 
 <targetInstance>
     <id>sys0node0dimm116</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030074</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5226,7 +5226,7 @@
 
 <targetInstance>
     <id>sys0node0dimm117</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030075</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5249,7 +5249,7 @@
 
 <targetInstance>
     <id>sys0node0dimm118</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030076</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5272,7 +5272,7 @@
 
 <targetInstance>
     <id>sys0node0dimm119</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030077</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5295,7 +5295,7 @@
 
 <targetInstance>
     <id>sys0node0dimm120</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030078</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5318,7 +5318,7 @@
 
 <targetInstance>
     <id>sys0node0dimm121</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030079</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5341,7 +5341,7 @@
 
 <targetInstance>
     <id>sys0node0dimm122</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5364,7 +5364,7 @@
 
 <targetInstance>
     <id>sys0node0dimm123</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5387,7 +5387,7 @@
 
 <targetInstance>
     <id>sys0node0dimm124</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5410,7 +5410,7 @@
 
 <targetInstance>
     <id>sys0node0dimm125</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5433,7 +5433,7 @@
 
 <targetInstance>
     <id>sys0node0dimm126</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5456,7 +5456,7 @@
 
 <targetInstance>
     <id>sys0node0dimm127</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5479,7 +5479,7 @@
 
 <targetInstance>
     <id>sys0node0dimm160</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5502,7 +5502,7 @@
 
 <targetInstance>
     <id>sys0node0dimm161</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5525,7 +5525,7 @@
 
 <targetInstance>
     <id>sys0node0dimm162</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5548,7 +5548,7 @@
 
 <targetInstance>
     <id>sys0node0dimm163</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5571,7 +5571,7 @@
 
 <targetInstance>
     <id>sys0node0dimm164</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5594,7 +5594,7 @@
 
 <targetInstance>
     <id>sys0node0dimm165</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5617,7 +5617,7 @@
 
 <targetInstance>
     <id>sys0node0dimm166</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5640,7 +5640,7 @@
 
 <targetInstance>
     <id>sys0node0dimm167</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5663,7 +5663,7 @@
 
 <targetInstance>
     <id>sys0node0dimm168</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5686,7 +5686,7 @@
 
 <targetInstance>
     <id>sys0node0dimm169</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5709,7 +5709,7 @@
 
 <targetInstance>
     <id>sys0node0dimm170</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5732,7 +5732,7 @@
 
 <targetInstance>
     <id>sys0node0dimm171</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5755,7 +5755,7 @@
 
 <targetInstance>
     <id>sys0node0dimm172</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5778,7 +5778,7 @@
 
 <targetInstance>
     <id>sys0node0dimm173</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5801,7 +5801,7 @@
 
 <targetInstance>
     <id>sys0node0dimm174</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5824,7 +5824,7 @@
 
 <targetInstance>
     <id>sys0node0dimm175</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5847,7 +5847,7 @@
 
 <targetInstance>
     <id>sys0node0dimm176</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5870,7 +5870,7 @@
 
 <targetInstance>
     <id>sys0node0dimm177</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5893,7 +5893,7 @@
 
 <targetInstance>
     <id>sys0node0dimm178</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5916,7 +5916,7 @@
 
 <targetInstance>
     <id>sys0node0dimm179</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5939,7 +5939,7 @@
 
 <targetInstance>
     <id>sys0node0dimm180</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5962,7 +5962,7 @@
 
 <targetInstance>
     <id>sys0node0dimm181</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -5985,7 +5985,7 @@
 
 <targetInstance>
     <id>sys0node0dimm182</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6008,7 +6008,7 @@
 
 <targetInstance>
     <id>sys0node0dimm183</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6031,7 +6031,7 @@
 
 <targetInstance>
     <id>sys0node0dimm184</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6054,7 +6054,7 @@
 
 <targetInstance>
     <id>sys0node0dimm185</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6077,7 +6077,7 @@
 
 <targetInstance>
     <id>sys0node0dimm186</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6100,7 +6100,7 @@
 
 <targetInstance>
     <id>sys0node0dimm187</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6123,7 +6123,7 @@
 
 <targetInstance>
     <id>sys0node0dimm188</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6146,7 +6146,7 @@
 
 <targetInstance>
     <id>sys0node0dimm189</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6169,7 +6169,7 @@
 
 <targetInstance>
     <id>sys0node0dimm190</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6192,7 +6192,7 @@
 
 <targetInstance>
     <id>sys0node0dimm191</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6215,7 +6215,7 @@
 
 <targetInstance>
     <id>sys0node0dimm224</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6238,7 +6238,7 @@
 
 <targetInstance>
     <id>sys0node0dimm225</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6261,7 +6261,7 @@
 
 <targetInstance>
     <id>sys0node0dimm226</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6284,7 +6284,7 @@
 
 <targetInstance>
     <id>sys0node0dimm227</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6307,7 +6307,7 @@
 
 <targetInstance>
     <id>sys0node0dimm228</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6330,7 +6330,7 @@
 
 <targetInstance>
     <id>sys0node0dimm229</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6353,7 +6353,7 @@
 
 <targetInstance>
     <id>sys0node0dimm230</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6376,7 +6376,7 @@
 
 <targetInstance>
     <id>sys0node0dimm231</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6399,7 +6399,7 @@
 
 <targetInstance>
     <id>sys0node0dimm232</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6422,7 +6422,7 @@
 
 <targetInstance>
     <id>sys0node0dimm233</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6445,7 +6445,7 @@
 
 <targetInstance>
     <id>sys0node0dimm234</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6468,7 +6468,7 @@
 
 <targetInstance>
     <id>sys0node0dimm235</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6491,7 +6491,7 @@
 
 <targetInstance>
     <id>sys0node0dimm236</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6514,7 +6514,7 @@
 
 <targetInstance>
     <id>sys0node0dimm237</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300ED</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6537,7 +6537,7 @@
 
 <targetInstance>
     <id>sys0node0dimm238</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6560,7 +6560,7 @@
 
 <targetInstance>
     <id>sys0node0dimm239</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6583,7 +6583,7 @@
 
 <targetInstance>
     <id>sys0node0dimm240</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6606,7 +6606,7 @@
 
 <targetInstance>
     <id>sys0node0dimm241</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6629,7 +6629,7 @@
 
 <targetInstance>
     <id>sys0node0dimm242</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6652,7 +6652,7 @@
 
 <targetInstance>
     <id>sys0node0dimm243</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6675,7 +6675,7 @@
 
 <targetInstance>
     <id>sys0node0dimm244</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6698,7 +6698,7 @@
 
 <targetInstance>
     <id>sys0node0dimm245</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6721,7 +6721,7 @@
 
 <targetInstance>
     <id>sys0node0dimm246</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6744,7 +6744,7 @@
 
 <targetInstance>
     <id>sys0node0dimm247</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6767,7 +6767,7 @@
 
 <targetInstance>
     <id>sys0node0dimm248</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6790,7 +6790,7 @@
 
 <targetInstance>
     <id>sys0node0dimm249</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6813,7 +6813,7 @@
 
 <targetInstance>
     <id>sys0node0dimm250</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6836,7 +6836,7 @@
 
 <targetInstance>
     <id>sys0node0dimm251</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6859,7 +6859,7 @@
 
 <targetInstance>
     <id>sys0node0dimm252</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6882,7 +6882,7 @@
 
 <targetInstance>
     <id>sys0node0dimm253</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6905,7 +6905,7 @@
 
 <targetInstance>
     <id>sys0node0dimm254</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -6928,7 +6928,7 @@
 
 <targetInstance>
     <id>sys0node0dimm255</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index f25bc43c5..4d17e3a9e 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -13320,7 +13320,7 @@
 
 <targetInstance>
     <id>sys0node0dimm0</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13343,7 +13343,7 @@
 
 <targetInstance>
     <id>sys0node0dimm1</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030001</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13366,7 +13366,7 @@
 
 <targetInstance>
     <id>sys0node0dimm2</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030002</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13389,7 +13389,7 @@
 
 <targetInstance>
     <id>sys0node0dimm3</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030003</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13412,7 +13412,7 @@
 
 <targetInstance>
     <id>sys0node0dimm4</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13435,7 +13435,7 @@
 
 <targetInstance>
     <id>sys0node0dimm5</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13458,7 +13458,7 @@
 
 <targetInstance>
     <id>sys0node0dimm6</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030006</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13481,7 +13481,7 @@
 
 <targetInstance>
     <id>sys0node0dimm7</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030007</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13504,7 +13504,7 @@
 
 <targetInstance>
     <id>sys0node0dimm8</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030008</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13527,7 +13527,7 @@
 
 <targetInstance>
     <id>sys0node0dimm9</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030009</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13550,7 +13550,7 @@
 
 <targetInstance>
     <id>sys0node0dimm10</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003000A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13573,7 +13573,7 @@
 
 <targetInstance>
     <id>sys0node0dimm11</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003000B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13596,7 +13596,7 @@
 
 <targetInstance>
     <id>sys0node0dimm12</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003000C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13619,7 +13619,7 @@
 
 <targetInstance>
     <id>sys0node0dimm13</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003000D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13642,7 +13642,7 @@
 
 <targetInstance>
     <id>sys0node0dimm14</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003000E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13665,7 +13665,7 @@
 
 <targetInstance>
     <id>sys0node0dimm15</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003000F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13688,7 +13688,7 @@
 
 <targetInstance>
     <id>sys0node0dimm16</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030010</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13711,7 +13711,7 @@
 
 <targetInstance>
     <id>sys0node0dimm17</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030011</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13734,7 +13734,7 @@
 
 <targetInstance>
     <id>sys0node0dimm18</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030012</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13757,7 +13757,7 @@
 
 <targetInstance>
     <id>sys0node0dimm19</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030013</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13780,7 +13780,7 @@
 
 <targetInstance>
     <id>sys0node0dimm20</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030014</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13803,7 +13803,7 @@
 
 <targetInstance>
     <id>sys0node0dimm21</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030015</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13826,7 +13826,7 @@
 
 <targetInstance>
     <id>sys0node0dimm22</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030016</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13849,7 +13849,7 @@
 
 <targetInstance>
     <id>sys0node0dimm23</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030017</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13872,7 +13872,7 @@
 
 <targetInstance>
     <id>sys0node0dimm24</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030018</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13895,7 +13895,7 @@
 
 <targetInstance>
     <id>sys0node0dimm25</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030019</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13918,7 +13918,7 @@
 
 <targetInstance>
     <id>sys0node0dimm26</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003001A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13941,7 +13941,7 @@
 
 <targetInstance>
     <id>sys0node0dimm27</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003001B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13964,7 +13964,7 @@
 
 <targetInstance>
     <id>sys0node0dimm28</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003001C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -13987,7 +13987,7 @@
 
 <targetInstance>
     <id>sys0node0dimm29</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003001D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14010,7 +14010,7 @@
 
 <targetInstance>
     <id>sys0node0dimm30</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003001E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14033,7 +14033,7 @@
 
 <targetInstance>
     <id>sys0node0dimm31</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003001F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14056,7 +14056,7 @@
 
 <targetInstance>
     <id>sys0node0dimm32</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030020</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14079,7 +14079,7 @@
 
 <targetInstance>
     <id>sys0node0dimm33</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030021</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14102,7 +14102,7 @@
 
 <targetInstance>
     <id>sys0node0dimm34</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030022</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14125,7 +14125,7 @@
 
 <targetInstance>
     <id>sys0node0dimm35</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030023</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14148,7 +14148,7 @@
 
 <targetInstance>
     <id>sys0node0dimm36</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030024</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14171,7 +14171,7 @@
 
 <targetInstance>
     <id>sys0node0dimm37</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030025</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14194,7 +14194,7 @@
 
 <targetInstance>
     <id>sys0node0dimm38</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030026</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14217,7 +14217,7 @@
 
 <targetInstance>
     <id>sys0node0dimm39</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030027</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14240,7 +14240,7 @@
 
 <targetInstance>
     <id>sys0node0dimm40</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030028</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14263,7 +14263,7 @@
 
 <targetInstance>
     <id>sys0node0dimm41</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030029</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14286,7 +14286,7 @@
 
 <targetInstance>
     <id>sys0node0dimm42</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14309,7 +14309,7 @@
 
 <targetInstance>
     <id>sys0node0dimm43</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14332,7 +14332,7 @@
 
 <targetInstance>
     <id>sys0node0dimm44</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14355,7 +14355,7 @@
 
 <targetInstance>
     <id>sys0node0dimm45</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14378,7 +14378,7 @@
 
 <targetInstance>
     <id>sys0node0dimm46</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14401,7 +14401,7 @@
 
 <targetInstance>
     <id>sys0node0dimm47</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003002F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14424,7 +14424,7 @@
 
 <targetInstance>
     <id>sys0node0dimm48</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030030</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14447,7 +14447,7 @@
 
 <targetInstance>
     <id>sys0node0dimm49</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030031</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14470,7 +14470,7 @@
 
 <targetInstance>
     <id>sys0node0dimm50</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030032</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14493,7 +14493,7 @@
 
 <targetInstance>
     <id>sys0node0dimm51</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030033</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14516,7 +14516,7 @@
 
 <targetInstance>
     <id>sys0node0dimm52</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030034</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14539,7 +14539,7 @@
 
 <targetInstance>
     <id>sys0node0dimm53</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030035</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14562,7 +14562,7 @@
 
 <targetInstance>
     <id>sys0node0dimm54</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030036</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14585,7 +14585,7 @@
 
 <targetInstance>
     <id>sys0node0dimm55</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030037</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14608,7 +14608,7 @@
 
 <targetInstance>
     <id>sys0node0dimm56</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030038</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14631,7 +14631,7 @@
 
 <targetInstance>
     <id>sys0node0dimm57</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030039</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14654,7 +14654,7 @@
 
 <targetInstance>
     <id>sys0node0dimm58</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14677,7 +14677,7 @@
 
 <targetInstance>
     <id>sys0node0dimm59</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14700,7 +14700,7 @@
 
 <targetInstance>
     <id>sys0node0dimm60</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14723,7 +14723,7 @@
 
 <targetInstance>
     <id>sys0node0dimm61</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14746,7 +14746,7 @@
 
 <targetInstance>
     <id>sys0node0dimm62</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14769,7 +14769,7 @@
 
 <targetInstance>
     <id>sys0node0dimm63</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003003F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14792,7 +14792,7 @@
 
 <targetInstance>
     <id>sys0node0dimm64</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030040</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14815,7 +14815,7 @@
 
 <targetInstance>
     <id>sys0node0dimm65</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030041</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14838,7 +14838,7 @@
 
 <targetInstance>
     <id>sys0node0dimm66</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030042</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14861,7 +14861,7 @@
 
 <targetInstance>
     <id>sys0node0dimm67</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030043</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14884,7 +14884,7 @@
 
 <targetInstance>
     <id>sys0node0dimm68</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030044</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14907,7 +14907,7 @@
 
 <targetInstance>
     <id>sys0node0dimm69</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030045</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14930,7 +14930,7 @@
 
 <targetInstance>
     <id>sys0node0dimm70</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030046</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14953,7 +14953,7 @@
 
 <targetInstance>
     <id>sys0node0dimm71</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030047</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14976,7 +14976,7 @@
 
 <targetInstance>
     <id>sys0node0dimm72</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030048</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -14999,7 +14999,7 @@
 
 <targetInstance>
     <id>sys0node0dimm73</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030049</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15022,7 +15022,7 @@
 
 <targetInstance>
     <id>sys0node0dimm74</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003004A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15045,7 +15045,7 @@
 
 <targetInstance>
     <id>sys0node0dimm75</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003004B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15068,7 +15068,7 @@
 
 <targetInstance>
     <id>sys0node0dimm76</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003004C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15091,7 +15091,7 @@
 
 <targetInstance>
     <id>sys0node0dimm77</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003004D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15114,7 +15114,7 @@
 
 <targetInstance>
     <id>sys0node0dimm78</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003004E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15137,7 +15137,7 @@
 
 <targetInstance>
     <id>sys0node0dimm79</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003004F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15160,7 +15160,7 @@
 
 <targetInstance>
     <id>sys0node0dimm80</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030050</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15183,7 +15183,7 @@
 
 <targetInstance>
     <id>sys0node0dimm81</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030051</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15206,7 +15206,7 @@
 
 <targetInstance>
     <id>sys0node0dimm82</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030052</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15229,7 +15229,7 @@
 
 <targetInstance>
     <id>sys0node0dimm83</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030053</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15252,7 +15252,7 @@
 
 <targetInstance>
     <id>sys0node0dimm84</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030054</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15275,7 +15275,7 @@
 
 <targetInstance>
     <id>sys0node0dimm85</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030055</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15298,7 +15298,7 @@
 
 <targetInstance>
     <id>sys0node0dimm86</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030056</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15321,7 +15321,7 @@
 
 <targetInstance>
     <id>sys0node0dimm87</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030057</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15344,7 +15344,7 @@
 
 <targetInstance>
     <id>sys0node0dimm88</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030058</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15367,7 +15367,7 @@
 
 <targetInstance>
     <id>sys0node0dimm89</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030059</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15390,7 +15390,7 @@
 
 <targetInstance>
     <id>sys0node0dimm90</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003005A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15413,7 +15413,7 @@
 
 <targetInstance>
     <id>sys0node0dimm91</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003005B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15436,7 +15436,7 @@
 
 <targetInstance>
     <id>sys0node0dimm92</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003005C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15459,7 +15459,7 @@
 
 <targetInstance>
     <id>sys0node0dimm93</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003005D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15482,7 +15482,7 @@
 
 <targetInstance>
     <id>sys0node0dimm94</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003005E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15505,7 +15505,7 @@
 
 <targetInstance>
     <id>sys0node0dimm95</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003005F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15528,7 +15528,7 @@
 
 <targetInstance>
     <id>sys0node0dimm96</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030060</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15551,7 +15551,7 @@
 
 <targetInstance>
     <id>sys0node0dimm97</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030061</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15574,7 +15574,7 @@
 
 <targetInstance>
     <id>sys0node0dimm98</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030062</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15597,7 +15597,7 @@
 
 <targetInstance>
     <id>sys0node0dimm99</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030063</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15620,7 +15620,7 @@
 
 <targetInstance>
     <id>sys0node0dimm100</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030064</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15643,7 +15643,7 @@
 
 <targetInstance>
     <id>sys0node0dimm101</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030065</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15666,7 +15666,7 @@
 
 <targetInstance>
     <id>sys0node0dimm102</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030066</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15689,7 +15689,7 @@
 
 <targetInstance>
     <id>sys0node0dimm103</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030067</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15712,7 +15712,7 @@
 
 <targetInstance>
     <id>sys0node0dimm104</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030068</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15735,7 +15735,7 @@
 
 <targetInstance>
     <id>sys0node0dimm105</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030069</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15758,7 +15758,7 @@
 
 <targetInstance>
     <id>sys0node0dimm106</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15781,7 +15781,7 @@
 
 <targetInstance>
     <id>sys0node0dimm107</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15804,7 +15804,7 @@
 
 <targetInstance>
     <id>sys0node0dimm108</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15827,7 +15827,7 @@
 
 <targetInstance>
     <id>sys0node0dimm109</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15850,7 +15850,7 @@
 
 <targetInstance>
     <id>sys0node0dimm110</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15873,7 +15873,7 @@
 
 <targetInstance>
     <id>sys0node0dimm111</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003006F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15896,7 +15896,7 @@
 
 <targetInstance>
     <id>sys0node0dimm112</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030070</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15919,7 +15919,7 @@
 
 <targetInstance>
     <id>sys0node0dimm113</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030071</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15942,7 +15942,7 @@
 
 <targetInstance>
     <id>sys0node0dimm114</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030072</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15965,7 +15965,7 @@
 
 <targetInstance>
     <id>sys0node0dimm115</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030073</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -15988,7 +15988,7 @@
 
 <targetInstance>
     <id>sys0node0dimm116</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030074</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16011,7 +16011,7 @@
 
 <targetInstance>
     <id>sys0node0dimm117</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030075</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16034,7 +16034,7 @@
 
 <targetInstance>
     <id>sys0node0dimm118</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030076</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16057,7 +16057,7 @@
 
 <targetInstance>
     <id>sys0node0dimm119</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030077</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16080,7 +16080,7 @@
 
 <targetInstance>
     <id>sys0node0dimm120</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030078</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16103,7 +16103,7 @@
 
 <targetInstance>
     <id>sys0node0dimm121</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030079</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16126,7 +16126,7 @@
 
 <targetInstance>
     <id>sys0node0dimm122</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16149,7 +16149,7 @@
 
 <targetInstance>
     <id>sys0node0dimm123</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16172,7 +16172,7 @@
 
 <targetInstance>
     <id>sys0node0dimm124</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16195,7 +16195,7 @@
 
 <targetInstance>
     <id>sys0node0dimm125</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16218,7 +16218,7 @@
 
 <targetInstance>
     <id>sys0node0dimm126</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16241,7 +16241,7 @@
 
 <targetInstance>
     <id>sys0node0dimm127</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003007F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16264,7 +16264,7 @@
 
 <targetInstance>
     <id>sys0node0dimm128</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030080</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16287,7 +16287,7 @@
 
 <targetInstance>
     <id>sys0node0dimm129</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030081</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16310,7 +16310,7 @@
 
 <targetInstance>
     <id>sys0node0dimm130</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030082</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16333,7 +16333,7 @@
 
 <targetInstance>
     <id>sys0node0dimm131</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030083</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16356,7 +16356,7 @@
 
 <targetInstance>
     <id>sys0node0dimm132</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030084</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16379,7 +16379,7 @@
 
 <targetInstance>
     <id>sys0node0dimm133</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030085</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16402,7 +16402,7 @@
 
 <targetInstance>
     <id>sys0node0dimm134</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030086</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16425,7 +16425,7 @@
 
 <targetInstance>
     <id>sys0node0dimm135</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030087</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16448,7 +16448,7 @@
 
 <targetInstance>
     <id>sys0node0dimm136</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030088</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16471,7 +16471,7 @@
 
 <targetInstance>
     <id>sys0node0dimm137</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030089</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16494,7 +16494,7 @@
 
 <targetInstance>
     <id>sys0node0dimm138</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003008A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16517,7 +16517,7 @@
 
 <targetInstance>
     <id>sys0node0dimm139</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003008B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16540,7 +16540,7 @@
 
 <targetInstance>
     <id>sys0node0dimm140</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003008C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16563,7 +16563,7 @@
 
 <targetInstance>
     <id>sys0node0dimm141</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003008D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16586,7 +16586,7 @@
 
 <targetInstance>
     <id>sys0node0dimm142</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003008E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16609,7 +16609,7 @@
 
 <targetInstance>
     <id>sys0node0dimm143</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003008F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16632,7 +16632,7 @@
 
 <targetInstance>
     <id>sys0node0dimm144</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030090</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16655,7 +16655,7 @@
 
 <targetInstance>
     <id>sys0node0dimm145</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030091</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16678,7 +16678,7 @@
 
 <targetInstance>
     <id>sys0node0dimm146</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030092</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16701,7 +16701,7 @@
 
 <targetInstance>
     <id>sys0node0dimm147</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030093</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16724,7 +16724,7 @@
 
 <targetInstance>
     <id>sys0node0dimm148</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030094</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16747,7 +16747,7 @@
 
 <targetInstance>
     <id>sys0node0dimm149</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030095</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16770,7 +16770,7 @@
 
 <targetInstance>
     <id>sys0node0dimm150</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030096</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16793,7 +16793,7 @@
 
 <targetInstance>
     <id>sys0node0dimm151</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030097</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16816,7 +16816,7 @@
 
 <targetInstance>
     <id>sys0node0dimm152</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030098</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16839,7 +16839,7 @@
 
 <targetInstance>
     <id>sys0node0dimm153</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030099</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16862,7 +16862,7 @@
 
 <targetInstance>
     <id>sys0node0dimm154</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003009A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16885,7 +16885,7 @@
 
 <targetInstance>
     <id>sys0node0dimm155</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003009B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16908,7 +16908,7 @@
 
 <targetInstance>
     <id>sys0node0dimm156</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003009C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16931,7 +16931,7 @@
 
 <targetInstance>
     <id>sys0node0dimm157</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003009D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16954,7 +16954,7 @@
 
 <targetInstance>
     <id>sys0node0dimm158</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003009E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -16977,7 +16977,7 @@
 
 <targetInstance>
     <id>sys0node0dimm159</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003009F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17000,7 +17000,7 @@
 
 <targetInstance>
     <id>sys0node0dimm160</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17023,7 +17023,7 @@
 
 <targetInstance>
     <id>sys0node0dimm161</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17046,7 +17046,7 @@
 
 <targetInstance>
     <id>sys0node0dimm162</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17069,7 +17069,7 @@
 
 <targetInstance>
     <id>sys0node0dimm163</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17092,7 +17092,7 @@
 
 <targetInstance>
     <id>sys0node0dimm164</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17115,7 +17115,7 @@
 
 <targetInstance>
     <id>sys0node0dimm165</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17138,7 +17138,7 @@
 
 <targetInstance>
     <id>sys0node0dimm166</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17161,7 +17161,7 @@
 
 <targetInstance>
     <id>sys0node0dimm167</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17184,7 +17184,7 @@
 
 <targetInstance>
     <id>sys0node0dimm168</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17207,7 +17207,7 @@
 
 <targetInstance>
     <id>sys0node0dimm169</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300A9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17230,7 +17230,7 @@
 
 <targetInstance>
     <id>sys0node0dimm170</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17253,7 +17253,7 @@
 
 <targetInstance>
     <id>sys0node0dimm171</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17276,7 +17276,7 @@
 
 <targetInstance>
     <id>sys0node0dimm172</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17299,7 +17299,7 @@
 
 <targetInstance>
     <id>sys0node0dimm173</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17322,7 +17322,7 @@
 
 <targetInstance>
     <id>sys0node0dimm174</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17345,7 +17345,7 @@
 
 <targetInstance>
     <id>sys0node0dimm175</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300AF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17368,7 +17368,7 @@
 
 <targetInstance>
     <id>sys0node0dimm176</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17391,7 +17391,7 @@
 
 <targetInstance>
     <id>sys0node0dimm177</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17414,7 +17414,7 @@
 
 <targetInstance>
     <id>sys0node0dimm178</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17437,7 +17437,7 @@
 
 <targetInstance>
     <id>sys0node0dimm179</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17460,7 +17460,7 @@
 
 <targetInstance>
     <id>sys0node0dimm180</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17483,7 +17483,7 @@
 
 <targetInstance>
     <id>sys0node0dimm181</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17506,7 +17506,7 @@
 
 <targetInstance>
     <id>sys0node0dimm182</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17529,7 +17529,7 @@
 
 <targetInstance>
     <id>sys0node0dimm183</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17552,7 +17552,7 @@
 
 <targetInstance>
     <id>sys0node0dimm184</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17575,7 +17575,7 @@
 
 <targetInstance>
     <id>sys0node0dimm185</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300B9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17598,7 +17598,7 @@
 
 <targetInstance>
     <id>sys0node0dimm186</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17621,7 +17621,7 @@
 
 <targetInstance>
     <id>sys0node0dimm187</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17644,7 +17644,7 @@
 
 <targetInstance>
     <id>sys0node0dimm188</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17667,7 +17667,7 @@
 
 <targetInstance>
     <id>sys0node0dimm189</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17690,7 +17690,7 @@
 
 <targetInstance>
     <id>sys0node0dimm190</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17713,7 +17713,7 @@
 
 <targetInstance>
     <id>sys0node0dimm191</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300BF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17736,7 +17736,7 @@
 
 <targetInstance>
     <id>sys0node0dimm192</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17759,7 +17759,7 @@
 
 <targetInstance>
     <id>sys0node0dimm193</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17782,7 +17782,7 @@
 
 <targetInstance>
     <id>sys0node0dimm194</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17805,7 +17805,7 @@
 
 <targetInstance>
     <id>sys0node0dimm195</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17828,7 +17828,7 @@
 
 <targetInstance>
     <id>sys0node0dimm196</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17851,7 +17851,7 @@
 
 <targetInstance>
     <id>sys0node0dimm197</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17874,7 +17874,7 @@
 
 <targetInstance>
     <id>sys0node0dimm198</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17897,7 +17897,7 @@
 
 <targetInstance>
     <id>sys0node0dimm199</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17920,7 +17920,7 @@
 
 <targetInstance>
     <id>sys0node0dimm200</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17943,7 +17943,7 @@
 
 <targetInstance>
     <id>sys0node0dimm201</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300C9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17966,7 +17966,7 @@
 
 <targetInstance>
     <id>sys0node0dimm202</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300CA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -17989,7 +17989,7 @@
 
 <targetInstance>
     <id>sys0node0dimm203</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300CB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18012,7 +18012,7 @@
 
 <targetInstance>
     <id>sys0node0dimm204</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300CC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18035,7 +18035,7 @@
 
 <targetInstance>
     <id>sys0node0dimm205</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300CD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18058,7 +18058,7 @@
 
 <targetInstance>
     <id>sys0node0dimm206</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300CE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18081,7 +18081,7 @@
 
 <targetInstance>
     <id>sys0node0dimm207</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300CF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18104,7 +18104,7 @@
 
 <targetInstance>
     <id>sys0node0dimm208</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18127,7 +18127,7 @@
 
 <targetInstance>
     <id>sys0node0dimm209</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18150,7 +18150,7 @@
 
 <targetInstance>
     <id>sys0node0dimm210</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18173,7 +18173,7 @@
 
 <targetInstance>
     <id>sys0node0dimm211</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18196,7 +18196,7 @@
 
 <targetInstance>
     <id>sys0node0dimm212</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18219,7 +18219,7 @@
 
 <targetInstance>
     <id>sys0node0dimm213</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18242,7 +18242,7 @@
 
 <targetInstance>
     <id>sys0node0dimm214</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18265,7 +18265,7 @@
 
 <targetInstance>
     <id>sys0node0dimm215</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18288,7 +18288,7 @@
 
 <targetInstance>
     <id>sys0node0dimm216</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18311,7 +18311,7 @@
 
 <targetInstance>
     <id>sys0node0dimm217</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300D9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18334,7 +18334,7 @@
 
 <targetInstance>
     <id>sys0node0dimm218</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300DA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18357,7 +18357,7 @@
 
 <targetInstance>
     <id>sys0node0dimm219</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300DB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18380,7 +18380,7 @@
 
 <targetInstance>
     <id>sys0node0dimm220</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300DC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18403,7 +18403,7 @@
 
 <targetInstance>
     <id>sys0node0dimm221</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300DD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18426,7 +18426,7 @@
 
 <targetInstance>
     <id>sys0node0dimm222</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300DE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18449,7 +18449,7 @@
 
 <targetInstance>
     <id>sys0node0dimm223</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300DF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18472,7 +18472,7 @@
 
 <targetInstance>
     <id>sys0node0dimm224</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18495,7 +18495,7 @@
 
 <targetInstance>
     <id>sys0node0dimm225</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18518,7 +18518,7 @@
 
 <targetInstance>
     <id>sys0node0dimm226</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18541,7 +18541,7 @@
 
 <targetInstance>
     <id>sys0node0dimm227</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18564,7 +18564,7 @@
 
 <targetInstance>
     <id>sys0node0dimm228</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18587,7 +18587,7 @@
 
 <targetInstance>
     <id>sys0node0dimm229</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18610,7 +18610,7 @@
 
 <targetInstance>
     <id>sys0node0dimm230</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18633,7 +18633,7 @@
 
 <targetInstance>
     <id>sys0node0dimm231</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18656,7 +18656,7 @@
 
 <targetInstance>
     <id>sys0node0dimm232</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18679,7 +18679,7 @@
 
 <targetInstance>
     <id>sys0node0dimm233</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300E9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18702,7 +18702,7 @@
 
 <targetInstance>
     <id>sys0node0dimm234</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18725,7 +18725,7 @@
 
 <targetInstance>
     <id>sys0node0dimm235</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18748,7 +18748,7 @@
 
 <targetInstance>
     <id>sys0node0dimm236</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18771,7 +18771,7 @@
 
 <targetInstance>
     <id>sys0node0dimm237</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300ED</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18794,7 +18794,7 @@
 
 <targetInstance>
     <id>sys0node0dimm238</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18817,7 +18817,7 @@
 
 <targetInstance>
     <id>sys0node0dimm239</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300EF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18840,7 +18840,7 @@
 
 <targetInstance>
     <id>sys0node0dimm240</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18863,7 +18863,7 @@
 
 <targetInstance>
     <id>sys0node0dimm241</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18886,7 +18886,7 @@
 
 <targetInstance>
     <id>sys0node0dimm242</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18909,7 +18909,7 @@
 
 <targetInstance>
     <id>sys0node0dimm243</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18932,7 +18932,7 @@
 
 <targetInstance>
     <id>sys0node0dimm244</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18955,7 +18955,7 @@
 
 <targetInstance>
     <id>sys0node0dimm245</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -18978,7 +18978,7 @@
 
 <targetInstance>
     <id>sys0node0dimm246</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19001,7 +19001,7 @@
 
 <targetInstance>
     <id>sys0node0dimm247</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19024,7 +19024,7 @@
 
 <targetInstance>
     <id>sys0node0dimm248</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19047,7 +19047,7 @@
 
 <targetInstance>
     <id>sys0node0dimm249</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300F9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19070,7 +19070,7 @@
 
 <targetInstance>
     <id>sys0node0dimm250</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19093,7 +19093,7 @@
 
 <targetInstance>
     <id>sys0node0dimm251</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19116,7 +19116,7 @@
 
 <targetInstance>
     <id>sys0node0dimm252</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19139,7 +19139,7 @@
 
 <targetInstance>
     <id>sys0node0dimm253</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19162,7 +19162,7 @@
 
 <targetInstance>
     <id>sys0node0dimm254</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19185,7 +19185,7 @@
 
 <targetInstance>
     <id>sys0node0dimm255</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000300FF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19208,7 +19208,7 @@
 
 <targetInstance>
     <id>sys0node0dimm256</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030100</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19231,7 +19231,7 @@
 
 <targetInstance>
     <id>sys0node0dimm257</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030101</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19254,7 +19254,7 @@
 
 <targetInstance>
     <id>sys0node0dimm258</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030102</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19277,7 +19277,7 @@
 
 <targetInstance>
     <id>sys0node0dimm259</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030103</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19300,7 +19300,7 @@
 
 <targetInstance>
     <id>sys0node0dimm260</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030104</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19323,7 +19323,7 @@
 
 <targetInstance>
     <id>sys0node0dimm261</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030105</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19346,7 +19346,7 @@
 
 <targetInstance>
     <id>sys0node0dimm262</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030106</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19369,7 +19369,7 @@
 
 <targetInstance>
     <id>sys0node0dimm263</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030107</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19392,7 +19392,7 @@
 
 <targetInstance>
     <id>sys0node0dimm264</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030108</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19415,7 +19415,7 @@
 
 <targetInstance>
     <id>sys0node0dimm265</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030109</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19438,7 +19438,7 @@
 
 <targetInstance>
     <id>sys0node0dimm266</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003010A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19461,7 +19461,7 @@
 
 <targetInstance>
     <id>sys0node0dimm267</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003010B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19484,7 +19484,7 @@
 
 <targetInstance>
     <id>sys0node0dimm268</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003010C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19507,7 +19507,7 @@
 
 <targetInstance>
     <id>sys0node0dimm269</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003010D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19530,7 +19530,7 @@
 
 <targetInstance>
     <id>sys0node0dimm270</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003010E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19553,7 +19553,7 @@
 
 <targetInstance>
     <id>sys0node0dimm271</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003010F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19576,7 +19576,7 @@
 
 <targetInstance>
     <id>sys0node0dimm272</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030110</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19599,7 +19599,7 @@
 
 <targetInstance>
     <id>sys0node0dimm273</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030111</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19622,7 +19622,7 @@
 
 <targetInstance>
     <id>sys0node0dimm274</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030112</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19645,7 +19645,7 @@
 
 <targetInstance>
     <id>sys0node0dimm275</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030113</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19668,7 +19668,7 @@
 
 <targetInstance>
     <id>sys0node0dimm276</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030114</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19691,7 +19691,7 @@
 
 <targetInstance>
     <id>sys0node0dimm277</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030115</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19714,7 +19714,7 @@
 
 <targetInstance>
     <id>sys0node0dimm278</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030116</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19737,7 +19737,7 @@
 
 <targetInstance>
     <id>sys0node0dimm279</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030117</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19760,7 +19760,7 @@
 
 <targetInstance>
     <id>sys0node0dimm280</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030118</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19783,7 +19783,7 @@
 
 <targetInstance>
     <id>sys0node0dimm281</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030119</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19806,7 +19806,7 @@
 
 <targetInstance>
     <id>sys0node0dimm282</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003011A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19829,7 +19829,7 @@
 
 <targetInstance>
     <id>sys0node0dimm283</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003011B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19852,7 +19852,7 @@
 
 <targetInstance>
     <id>sys0node0dimm284</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003011C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19875,7 +19875,7 @@
 
 <targetInstance>
     <id>sys0node0dimm285</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003011D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19898,7 +19898,7 @@
 
 <targetInstance>
     <id>sys0node0dimm286</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003011E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19921,7 +19921,7 @@
 
 <targetInstance>
     <id>sys0node0dimm287</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003011F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19944,7 +19944,7 @@
 
 <targetInstance>
     <id>sys0node0dimm288</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030120</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19967,7 +19967,7 @@
 
 <targetInstance>
     <id>sys0node0dimm289</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030121</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -19990,7 +19990,7 @@
 
 <targetInstance>
     <id>sys0node0dimm290</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030122</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20013,7 +20013,7 @@
 
 <targetInstance>
     <id>sys0node0dimm291</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030123</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20036,7 +20036,7 @@
 
 <targetInstance>
     <id>sys0node0dimm292</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030124</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20059,7 +20059,7 @@
 
 <targetInstance>
     <id>sys0node0dimm293</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030125</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20082,7 +20082,7 @@
 
 <targetInstance>
     <id>sys0node0dimm294</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030126</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20105,7 +20105,7 @@
 
 <targetInstance>
     <id>sys0node0dimm295</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030127</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20128,7 +20128,7 @@
 
 <targetInstance>
     <id>sys0node0dimm296</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030128</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20151,7 +20151,7 @@
 
 <targetInstance>
     <id>sys0node0dimm297</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030129</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20174,7 +20174,7 @@
 
 <targetInstance>
     <id>sys0node0dimm298</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003012A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20197,7 +20197,7 @@
 
 <targetInstance>
     <id>sys0node0dimm299</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003012B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20220,7 +20220,7 @@
 
 <targetInstance>
     <id>sys0node0dimm300</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003012C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20243,7 +20243,7 @@
 
 <targetInstance>
     <id>sys0node0dimm301</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003012D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20266,7 +20266,7 @@
 
 <targetInstance>
     <id>sys0node0dimm302</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003012E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20289,7 +20289,7 @@
 
 <targetInstance>
     <id>sys0node0dimm303</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003012F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20312,7 +20312,7 @@
 
 <targetInstance>
     <id>sys0node0dimm304</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030130</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20335,7 +20335,7 @@
 
 <targetInstance>
     <id>sys0node0dimm305</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030131</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20358,7 +20358,7 @@
 
 <targetInstance>
     <id>sys0node0dimm306</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030132</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20381,7 +20381,7 @@
 
 <targetInstance>
     <id>sys0node0dimm307</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030133</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20404,7 +20404,7 @@
 
 <targetInstance>
     <id>sys0node0dimm308</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030134</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20427,7 +20427,7 @@
 
 <targetInstance>
     <id>sys0node0dimm309</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030135</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20450,7 +20450,7 @@
 
 <targetInstance>
     <id>sys0node0dimm310</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030136</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20473,7 +20473,7 @@
 
 <targetInstance>
     <id>sys0node0dimm311</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030137</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20496,7 +20496,7 @@
 
 <targetInstance>
     <id>sys0node0dimm312</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030138</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20519,7 +20519,7 @@
 
 <targetInstance>
     <id>sys0node0dimm313</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030139</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20542,7 +20542,7 @@
 
 <targetInstance>
     <id>sys0node0dimm314</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003013A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20565,7 +20565,7 @@
 
 <targetInstance>
     <id>sys0node0dimm315</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003013B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20588,7 +20588,7 @@
 
 <targetInstance>
     <id>sys0node0dimm316</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003013C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20611,7 +20611,7 @@
 
 <targetInstance>
     <id>sys0node0dimm317</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003013D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20634,7 +20634,7 @@
 
 <targetInstance>
     <id>sys0node0dimm318</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003013E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20657,7 +20657,7 @@
 
 <targetInstance>
     <id>sys0node0dimm319</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003013F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20680,7 +20680,7 @@
 
 <targetInstance>
     <id>sys0node0dimm320</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030140</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20703,7 +20703,7 @@
 
 <targetInstance>
     <id>sys0node0dimm321</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030141</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20726,7 +20726,7 @@
 
 <targetInstance>
     <id>sys0node0dimm322</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030142</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20749,7 +20749,7 @@
 
 <targetInstance>
     <id>sys0node0dimm323</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030143</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20772,7 +20772,7 @@
 
 <targetInstance>
     <id>sys0node0dimm324</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030144</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20795,7 +20795,7 @@
 
 <targetInstance>
     <id>sys0node0dimm325</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030145</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20818,7 +20818,7 @@
 
 <targetInstance>
     <id>sys0node0dimm326</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030146</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20841,7 +20841,7 @@
 
 <targetInstance>
     <id>sys0node0dimm327</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030147</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20864,7 +20864,7 @@
 
 <targetInstance>
     <id>sys0node0dimm328</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030148</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20887,7 +20887,7 @@
 
 <targetInstance>
     <id>sys0node0dimm329</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030149</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20910,7 +20910,7 @@
 
 <targetInstance>
     <id>sys0node0dimm330</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003014A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20933,7 +20933,7 @@
 
 <targetInstance>
     <id>sys0node0dimm331</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003014B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20956,7 +20956,7 @@
 
 <targetInstance>
     <id>sys0node0dimm332</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003014C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -20979,7 +20979,7 @@
 
 <targetInstance>
     <id>sys0node0dimm333</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003014D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21002,7 +21002,7 @@
 
 <targetInstance>
     <id>sys0node0dimm334</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003014E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21025,7 +21025,7 @@
 
 <targetInstance>
     <id>sys0node0dimm335</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003014F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21048,7 +21048,7 @@
 
 <targetInstance>
     <id>sys0node0dimm336</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030150</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21071,7 +21071,7 @@
 
 <targetInstance>
     <id>sys0node0dimm337</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030151</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21094,7 +21094,7 @@
 
 <targetInstance>
     <id>sys0node0dimm338</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030152</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21117,7 +21117,7 @@
 
 <targetInstance>
     <id>sys0node0dimm339</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030153</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21140,7 +21140,7 @@
 
 <targetInstance>
     <id>sys0node0dimm340</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030154</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21163,7 +21163,7 @@
 
 <targetInstance>
     <id>sys0node0dimm341</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030155</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21186,7 +21186,7 @@
 
 <targetInstance>
     <id>sys0node0dimm342</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030156</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21209,7 +21209,7 @@
 
 <targetInstance>
     <id>sys0node0dimm343</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030157</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21232,7 +21232,7 @@
 
 <targetInstance>
     <id>sys0node0dimm344</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030158</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21255,7 +21255,7 @@
 
 <targetInstance>
     <id>sys0node0dimm345</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030159</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21278,7 +21278,7 @@
 
 <targetInstance>
     <id>sys0node0dimm346</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003015A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21301,7 +21301,7 @@
 
 <targetInstance>
     <id>sys0node0dimm347</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003015B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21324,7 +21324,7 @@
 
 <targetInstance>
     <id>sys0node0dimm348</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003015C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21347,7 +21347,7 @@
 
 <targetInstance>
     <id>sys0node0dimm349</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003015D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21370,7 +21370,7 @@
 
 <targetInstance>
     <id>sys0node0dimm350</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003015E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21393,7 +21393,7 @@
 
 <targetInstance>
     <id>sys0node0dimm351</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003015F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21416,7 +21416,7 @@
 
 <targetInstance>
     <id>sys0node0dimm352</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030160</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21439,7 +21439,7 @@
 
 <targetInstance>
     <id>sys0node0dimm353</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030161</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21462,7 +21462,7 @@
 
 <targetInstance>
     <id>sys0node0dimm354</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030162</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21485,7 +21485,7 @@
 
 <targetInstance>
     <id>sys0node0dimm355</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030163</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21508,7 +21508,7 @@
 
 <targetInstance>
     <id>sys0node0dimm356</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030164</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21531,7 +21531,7 @@
 
 <targetInstance>
     <id>sys0node0dimm357</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030165</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21554,7 +21554,7 @@
 
 <targetInstance>
     <id>sys0node0dimm358</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030166</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21577,7 +21577,7 @@
 
 <targetInstance>
     <id>sys0node0dimm359</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030167</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21600,7 +21600,7 @@
 
 <targetInstance>
     <id>sys0node0dimm360</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030168</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21623,7 +21623,7 @@
 
 <targetInstance>
     <id>sys0node0dimm361</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030169</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21646,7 +21646,7 @@
 
 <targetInstance>
     <id>sys0node0dimm362</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003016A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21669,7 +21669,7 @@
 
 <targetInstance>
     <id>sys0node0dimm363</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003016B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21692,7 +21692,7 @@
 
 <targetInstance>
     <id>sys0node0dimm364</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003016C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21715,7 +21715,7 @@
 
 <targetInstance>
     <id>sys0node0dimm365</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003016D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21738,7 +21738,7 @@
 
 <targetInstance>
     <id>sys0node0dimm366</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003016E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21761,7 +21761,7 @@
 
 <targetInstance>
     <id>sys0node0dimm367</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003016F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21784,7 +21784,7 @@
 
 <targetInstance>
     <id>sys0node0dimm368</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030170</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21807,7 +21807,7 @@
 
 <targetInstance>
     <id>sys0node0dimm369</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030171</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21830,7 +21830,7 @@
 
 <targetInstance>
     <id>sys0node0dimm370</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030172</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21853,7 +21853,7 @@
 
 <targetInstance>
     <id>sys0node0dimm371</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030173</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21876,7 +21876,7 @@
 
 <targetInstance>
     <id>sys0node0dimm372</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030174</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21899,7 +21899,7 @@
 
 <targetInstance>
     <id>sys0node0dimm373</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030175</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21922,7 +21922,7 @@
 
 <targetInstance>
     <id>sys0node0dimm374</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030176</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21945,7 +21945,7 @@
 
 <targetInstance>
     <id>sys0node0dimm375</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030177</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21968,7 +21968,7 @@
 
 <targetInstance>
     <id>sys0node0dimm376</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030178</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -21991,7 +21991,7 @@
 
 <targetInstance>
     <id>sys0node0dimm377</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030179</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22014,7 +22014,7 @@
 
 <targetInstance>
     <id>sys0node0dimm378</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003017A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22037,7 +22037,7 @@
 
 <targetInstance>
     <id>sys0node0dimm379</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003017B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22060,7 +22060,7 @@
 
 <targetInstance>
     <id>sys0node0dimm380</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003017C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22083,7 +22083,7 @@
 
 <targetInstance>
     <id>sys0node0dimm381</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003017D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22106,7 +22106,7 @@
 
 <targetInstance>
     <id>sys0node0dimm382</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003017E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22129,7 +22129,7 @@
 
 <targetInstance>
     <id>sys0node0dimm383</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003017F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22152,7 +22152,7 @@
 
 <targetInstance>
     <id>sys0node0dimm384</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030180</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22175,7 +22175,7 @@
 
 <targetInstance>
     <id>sys0node0dimm385</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030181</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22198,7 +22198,7 @@
 
 <targetInstance>
     <id>sys0node0dimm386</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030182</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22221,7 +22221,7 @@
 
 <targetInstance>
     <id>sys0node0dimm387</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030183</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22244,7 +22244,7 @@
 
 <targetInstance>
     <id>sys0node0dimm388</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030184</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22267,7 +22267,7 @@
 
 <targetInstance>
     <id>sys0node0dimm389</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030185</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22290,7 +22290,7 @@
 
 <targetInstance>
     <id>sys0node0dimm390</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030186</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22313,7 +22313,7 @@
 
 <targetInstance>
     <id>sys0node0dimm391</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030187</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22336,7 +22336,7 @@
 
 <targetInstance>
     <id>sys0node0dimm392</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030188</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22359,7 +22359,7 @@
 
 <targetInstance>
     <id>sys0node0dimm393</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030189</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22382,7 +22382,7 @@
 
 <targetInstance>
     <id>sys0node0dimm394</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003018A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22405,7 +22405,7 @@
 
 <targetInstance>
     <id>sys0node0dimm395</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003018B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22428,7 +22428,7 @@
 
 <targetInstance>
     <id>sys0node0dimm396</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003018C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22451,7 +22451,7 @@
 
 <targetInstance>
     <id>sys0node0dimm397</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003018D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22474,7 +22474,7 @@
 
 <targetInstance>
     <id>sys0node0dimm398</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003018E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22497,7 +22497,7 @@
 
 <targetInstance>
     <id>sys0node0dimm399</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003018F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22520,7 +22520,7 @@
 
 <targetInstance>
     <id>sys0node0dimm400</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030190</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22543,7 +22543,7 @@
 
 <targetInstance>
     <id>sys0node0dimm401</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030191</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22566,7 +22566,7 @@
 
 <targetInstance>
     <id>sys0node0dimm402</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030192</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22589,7 +22589,7 @@
 
 <targetInstance>
     <id>sys0node0dimm403</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030193</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22612,7 +22612,7 @@
 
 <targetInstance>
     <id>sys0node0dimm404</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030194</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22635,7 +22635,7 @@
 
 <targetInstance>
     <id>sys0node0dimm405</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030195</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22658,7 +22658,7 @@
 
 <targetInstance>
     <id>sys0node0dimm406</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030196</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22681,7 +22681,7 @@
 
 <targetInstance>
     <id>sys0node0dimm407</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030197</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22704,7 +22704,7 @@
 
 <targetInstance>
     <id>sys0node0dimm408</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030198</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22727,7 +22727,7 @@
 
 <targetInstance>
     <id>sys0node0dimm409</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x00030199</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22750,7 +22750,7 @@
 
 <targetInstance>
     <id>sys0node0dimm410</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003019A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22773,7 +22773,7 @@
 
 <targetInstance>
     <id>sys0node0dimm411</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003019B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22796,7 +22796,7 @@
 
 <targetInstance>
     <id>sys0node0dimm412</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003019C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22819,7 +22819,7 @@
 
 <targetInstance>
     <id>sys0node0dimm413</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003019D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22842,7 +22842,7 @@
 
 <targetInstance>
     <id>sys0node0dimm414</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003019E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22865,7 +22865,7 @@
 
 <targetInstance>
     <id>sys0node0dimm415</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x0003019F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22888,7 +22888,7 @@
 
 <targetInstance>
     <id>sys0node0dimm416</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22911,7 +22911,7 @@
 
 <targetInstance>
     <id>sys0node0dimm417</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22934,7 +22934,7 @@
 
 <targetInstance>
     <id>sys0node0dimm418</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22957,7 +22957,7 @@
 
 <targetInstance>
     <id>sys0node0dimm419</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -22980,7 +22980,7 @@
 
 <targetInstance>
     <id>sys0node0dimm420</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23003,7 +23003,7 @@
 
 <targetInstance>
     <id>sys0node0dimm421</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23026,7 +23026,7 @@
 
 <targetInstance>
     <id>sys0node0dimm422</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23049,7 +23049,7 @@
 
 <targetInstance>
     <id>sys0node0dimm423</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23072,7 +23072,7 @@
 
 <targetInstance>
     <id>sys0node0dimm424</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23095,7 +23095,7 @@
 
 <targetInstance>
     <id>sys0node0dimm425</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301A9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23118,7 +23118,7 @@
 
 <targetInstance>
     <id>sys0node0dimm426</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301AA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23141,7 +23141,7 @@
 
 <targetInstance>
     <id>sys0node0dimm427</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301AB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23164,7 +23164,7 @@
 
 <targetInstance>
     <id>sys0node0dimm428</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301AC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23187,7 +23187,7 @@
 
 <targetInstance>
     <id>sys0node0dimm429</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301AD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23210,7 +23210,7 @@
 
 <targetInstance>
     <id>sys0node0dimm430</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301AE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23233,7 +23233,7 @@
 
 <targetInstance>
     <id>sys0node0dimm431</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301AF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23256,7 +23256,7 @@
 
 <targetInstance>
     <id>sys0node0dimm432</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23279,7 +23279,7 @@
 
 <targetInstance>
     <id>sys0node0dimm433</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23302,7 +23302,7 @@
 
 <targetInstance>
     <id>sys0node0dimm434</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23325,7 +23325,7 @@
 
 <targetInstance>
     <id>sys0node0dimm435</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23348,7 +23348,7 @@
 
 <targetInstance>
     <id>sys0node0dimm436</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23371,7 +23371,7 @@
 
 <targetInstance>
     <id>sys0node0dimm437</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23394,7 +23394,7 @@
 
 <targetInstance>
     <id>sys0node0dimm438</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23417,7 +23417,7 @@
 
 <targetInstance>
     <id>sys0node0dimm439</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23440,7 +23440,7 @@
 
 <targetInstance>
     <id>sys0node0dimm440</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23463,7 +23463,7 @@
 
 <targetInstance>
     <id>sys0node0dimm441</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301B9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23486,7 +23486,7 @@
 
 <targetInstance>
     <id>sys0node0dimm442</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301BA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23509,7 +23509,7 @@
 
 <targetInstance>
     <id>sys0node0dimm443</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301BB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23532,7 +23532,7 @@
 
 <targetInstance>
     <id>sys0node0dimm444</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301BC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23555,7 +23555,7 @@
 
 <targetInstance>
     <id>sys0node0dimm445</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301BD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23578,7 +23578,7 @@
 
 <targetInstance>
     <id>sys0node0dimm446</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301BE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23601,7 +23601,7 @@
 
 <targetInstance>
     <id>sys0node0dimm447</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301BF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23624,7 +23624,7 @@
 
 <targetInstance>
     <id>sys0node0dimm448</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23647,7 +23647,7 @@
 
 <targetInstance>
     <id>sys0node0dimm449</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23670,7 +23670,7 @@
 
 <targetInstance>
     <id>sys0node0dimm450</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23693,7 +23693,7 @@
 
 <targetInstance>
     <id>sys0node0dimm451</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23716,7 +23716,7 @@
 
 <targetInstance>
     <id>sys0node0dimm452</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23739,7 +23739,7 @@
 
 <targetInstance>
     <id>sys0node0dimm453</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23762,7 +23762,7 @@
 
 <targetInstance>
     <id>sys0node0dimm454</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23785,7 +23785,7 @@
 
 <targetInstance>
     <id>sys0node0dimm455</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23808,7 +23808,7 @@
 
 <targetInstance>
     <id>sys0node0dimm456</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23831,7 +23831,7 @@
 
 <targetInstance>
     <id>sys0node0dimm457</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301C9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23854,7 +23854,7 @@
 
 <targetInstance>
     <id>sys0node0dimm458</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301CA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23877,7 +23877,7 @@
 
 <targetInstance>
     <id>sys0node0dimm459</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301CB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23900,7 +23900,7 @@
 
 <targetInstance>
     <id>sys0node0dimm460</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301CC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23923,7 +23923,7 @@
 
 <targetInstance>
     <id>sys0node0dimm461</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301CD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23946,7 +23946,7 @@
 
 <targetInstance>
     <id>sys0node0dimm462</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301CE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23969,7 +23969,7 @@
 
 <targetInstance>
     <id>sys0node0dimm463</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301CF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -23992,7 +23992,7 @@
 
 <targetInstance>
     <id>sys0node0dimm464</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24015,7 +24015,7 @@
 
 <targetInstance>
     <id>sys0node0dimm465</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24038,7 +24038,7 @@
 
 <targetInstance>
     <id>sys0node0dimm466</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24061,7 +24061,7 @@
 
 <targetInstance>
     <id>sys0node0dimm467</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24084,7 +24084,7 @@
 
 <targetInstance>
     <id>sys0node0dimm468</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24107,7 +24107,7 @@
 
 <targetInstance>
     <id>sys0node0dimm469</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24130,7 +24130,7 @@
 
 <targetInstance>
     <id>sys0node0dimm470</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24153,7 +24153,7 @@
 
 <targetInstance>
     <id>sys0node0dimm471</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24176,7 +24176,7 @@
 
 <targetInstance>
     <id>sys0node0dimm472</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24199,7 +24199,7 @@
 
 <targetInstance>
     <id>sys0node0dimm473</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301D9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24222,7 +24222,7 @@
 
 <targetInstance>
     <id>sys0node0dimm474</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301DA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24245,7 +24245,7 @@
 
 <targetInstance>
     <id>sys0node0dimm475</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301DB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24268,7 +24268,7 @@
 
 <targetInstance>
     <id>sys0node0dimm476</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301DC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24291,7 +24291,7 @@
 
 <targetInstance>
     <id>sys0node0dimm477</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301DD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24314,7 +24314,7 @@
 
 <targetInstance>
     <id>sys0node0dimm478</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301DE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24337,7 +24337,7 @@
 
 <targetInstance>
     <id>sys0node0dimm479</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301DF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24360,7 +24360,7 @@
 
 <targetInstance>
     <id>sys0node0dimm480</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24383,7 +24383,7 @@
 
 <targetInstance>
     <id>sys0node0dimm481</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24406,7 +24406,7 @@
 
 <targetInstance>
     <id>sys0node0dimm482</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24429,7 +24429,7 @@
 
 <targetInstance>
     <id>sys0node0dimm483</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24452,7 +24452,7 @@
 
 <targetInstance>
     <id>sys0node0dimm484</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24475,7 +24475,7 @@
 
 <targetInstance>
     <id>sys0node0dimm485</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24498,7 +24498,7 @@
 
 <targetInstance>
     <id>sys0node0dimm486</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24521,7 +24521,7 @@
 
 <targetInstance>
     <id>sys0node0dimm487</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24544,7 +24544,7 @@
 
 <targetInstance>
     <id>sys0node0dimm488</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24567,7 +24567,7 @@
 
 <targetInstance>
     <id>sys0node0dimm489</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301E9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24590,7 +24590,7 @@
 
 <targetInstance>
     <id>sys0node0dimm490</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301EA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24613,7 +24613,7 @@
 
 <targetInstance>
     <id>sys0node0dimm491</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301EB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24636,7 +24636,7 @@
 
 <targetInstance>
     <id>sys0node0dimm492</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301EC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24659,7 +24659,7 @@
 
 <targetInstance>
     <id>sys0node0dimm493</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301ED</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24682,7 +24682,7 @@
 
 <targetInstance>
     <id>sys0node0dimm494</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301EE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24705,7 +24705,7 @@
 
 <targetInstance>
     <id>sys0node0dimm495</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301EF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24728,7 +24728,7 @@
 
 <targetInstance>
     <id>sys0node0dimm496</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F0</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24751,7 +24751,7 @@
 
 <targetInstance>
     <id>sys0node0dimm497</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F1</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24774,7 +24774,7 @@
 
 <targetInstance>
     <id>sys0node0dimm498</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F2</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24797,7 +24797,7 @@
 
 <targetInstance>
     <id>sys0node0dimm499</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F3</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24820,7 +24820,7 @@
 
 <targetInstance>
     <id>sys0node0dimm500</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24843,7 +24843,7 @@
 
 <targetInstance>
     <id>sys0node0dimm501</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24866,7 +24866,7 @@
 
 <targetInstance>
     <id>sys0node0dimm502</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F6</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24889,7 +24889,7 @@
 
 <targetInstance>
     <id>sys0node0dimm503</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F7</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24912,7 +24912,7 @@
 
 <targetInstance>
     <id>sys0node0dimm504</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F8</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24935,7 +24935,7 @@
 
 <targetInstance>
     <id>sys0node0dimm505</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301F9</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24958,7 +24958,7 @@
 
 <targetInstance>
     <id>sys0node0dimm506</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301FA</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -24981,7 +24981,7 @@
 
 <targetInstance>
     <id>sys0node0dimm507</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301FB</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -25004,7 +25004,7 @@
 
 <targetInstance>
     <id>sys0node0dimm508</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301FC</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -25027,7 +25027,7 @@
 
 <targetInstance>
     <id>sys0node0dimm509</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301FD</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -25050,7 +25050,7 @@
 
 <targetInstance>
     <id>sys0node0dimm510</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301FE</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -25073,7 +25073,7 @@
 
 <targetInstance>
     <id>sys0node0dimm511</id>
-    <type>lcard-dimm-jedec</type>
+    <type>lcard-dimm-cdimm</type>
     <attribute><id>HUID</id><default>0x000301FF</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
diff --git a/src/usr/targeting/xmltohb/TULETA.mrw.xml b/src/usr/targeting/xmltohb/TULETA.mrw.xml
index 5121c43ec..7f234db41 100644
--- a/src/usr/targeting/xmltohb/TULETA.mrw.xml
+++ b/src/usr/targeting/xmltohb/TULETA.mrw.xml
@@ -3913,7 +3913,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>56</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -3940,7 +3940,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>57</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -3967,7 +3967,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>58</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -3994,7 +3994,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>59</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4021,7 +4021,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>4</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>60</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4048,7 +4048,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>5</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>61</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4075,7 +4075,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>6</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>62</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4102,7 +4102,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>7</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>63</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p6 -->
@@ -4131,7 +4131,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>8</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>48</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4158,7 +4158,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>9</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>49</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4185,7 +4185,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>10</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>50</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4212,7 +4212,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>11</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>51</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4239,7 +4239,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>12</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>52</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4266,7 +4266,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>13</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>53</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4293,7 +4293,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>14</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>54</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4320,7 +4320,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>15</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>55</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p5 -->
@@ -4349,7 +4349,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>16</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>40</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4376,7 +4376,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>17</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>41</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4403,7 +4403,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>18</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>42</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4430,7 +4430,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>19</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>43</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4457,7 +4457,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>20</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>44</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4484,7 +4484,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>21</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>45</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4511,7 +4511,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>22</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>46</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4538,7 +4538,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>23</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>47</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p4 -->
@@ -4567,7 +4567,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>24</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>32</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4594,7 +4594,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>25</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>33</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4621,7 +4621,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>26</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>34</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4648,7 +4648,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>27</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>35</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4675,7 +4675,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>28</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>36</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4702,7 +4702,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>29</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>37</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4729,7 +4729,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>30</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>38</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4756,7 +4756,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>31</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>39</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p12 -->
@@ -4785,7 +4785,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>32</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>96</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4812,7 +4812,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>33</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>97</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4839,7 +4839,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>34</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>98</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4866,7 +4866,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>35</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>99</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4893,7 +4893,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>36</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>100</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4920,7 +4920,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>37</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>101</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4947,7 +4947,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>38</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>102</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -4974,7 +4974,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>39</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>103</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p13 -->
@@ -5003,7 +5003,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>40</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>104</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5030,7 +5030,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>41</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>105</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5057,7 +5057,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>42</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>106</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5084,7 +5084,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>43</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>107</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5111,7 +5111,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>44</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>108</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5138,7 +5138,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>45</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>109</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5165,7 +5165,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>46</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>110</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5192,7 +5192,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>47</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>111</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p14 -->
@@ -5221,7 +5221,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>48</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>112</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5248,7 +5248,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>49</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>113</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5275,7 +5275,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>50</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>114</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5302,7 +5302,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>51</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>115</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5329,7 +5329,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>52</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>116</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5356,7 +5356,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>53</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>117</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5383,7 +5383,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>54</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>118</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5410,7 +5410,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>55</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>119</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p15 -->
@@ -5439,7 +5439,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>56</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>120</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5466,7 +5466,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>57</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>121</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5493,7 +5493,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>58</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>122</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5520,7 +5520,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>59</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>123</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5547,7 +5547,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>60</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>124</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5574,7 +5574,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>61</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>125</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5601,7 +5601,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>62</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>126</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5628,7 +5628,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>63</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>127</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p23 -->
@@ -5657,7 +5657,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>64</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>184</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5684,7 +5684,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>65</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>185</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5711,7 +5711,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>66</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>186</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5738,7 +5738,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>67</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>187</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5765,7 +5765,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>68</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>188</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5792,7 +5792,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>69</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>189</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5819,7 +5819,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>70</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>190</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5846,7 +5846,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>71</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>191</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p22 -->
@@ -5875,7 +5875,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>72</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>176</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5902,7 +5902,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>73</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>177</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5929,7 +5929,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>74</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>178</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5956,7 +5956,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>75</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>179</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -5983,7 +5983,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>76</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>180</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6010,7 +6010,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>77</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>181</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6037,7 +6037,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>78</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>182</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6064,7 +6064,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>79</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>183</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p21 -->
@@ -6093,7 +6093,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>80</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>168</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6120,7 +6120,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>81</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>169</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6147,7 +6147,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>82</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>170</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6174,7 +6174,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>83</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>171</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6201,7 +6201,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>84</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>172</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6228,7 +6228,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>85</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>173</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6255,7 +6255,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>86</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>174</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6282,7 +6282,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>87</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>175</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p20 -->
@@ -6311,7 +6311,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>88</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>160</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6338,7 +6338,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>89</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>161</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6365,7 +6365,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>90</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>162</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6392,7 +6392,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>91</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>163</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6419,7 +6419,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>92</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>164</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6446,7 +6446,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>93</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>165</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6473,7 +6473,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>94</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>166</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6500,7 +6500,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>95</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>167</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p28 -->
@@ -6529,7 +6529,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>96</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>224</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6556,7 +6556,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>97</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>225</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6583,7 +6583,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>98</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>226</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6610,7 +6610,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>99</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>227</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6637,7 +6637,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>100</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>228</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6664,7 +6664,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>101</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>229</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6691,7 +6691,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>102</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>230</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6718,7 +6718,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>103</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>231</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p29 -->
@@ -6747,7 +6747,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>104</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>232</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6774,7 +6774,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>105</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>233</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6801,7 +6801,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>106</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>234</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6828,7 +6828,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>107</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>235</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6855,7 +6855,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>108</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>236</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6882,7 +6882,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>109</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>237</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6909,7 +6909,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>110</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>238</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6936,7 +6936,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>111</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>239</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p30 -->
@@ -6965,7 +6965,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>112</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>240</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -6992,7 +6992,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>113</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>241</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7019,7 +7019,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>114</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>242</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7046,7 +7046,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>115</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>243</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7073,7 +7073,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>116</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>244</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7100,7 +7100,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>117</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>245</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7127,7 +7127,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>118</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>246</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7154,7 +7154,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>119</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>247</default></attribute>
 </targetInstance>
 
 <!-- C-DIMM n0:p31 -->
@@ -7183,7 +7183,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>120</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>248</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7210,7 +7210,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>121</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>249</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7237,7 +7237,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>122</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>250</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7264,7 +7264,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>123</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>251</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7291,7 +7291,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>124</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>252</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7318,7 +7318,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>125</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>253</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7345,7 +7345,7 @@
         <id>MBA_DIMM</id>
         <default>0</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>126</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>254</default></attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7372,7 +7372,7 @@
         <id>MBA_DIMM</id>
         <default>1</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>127</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>255</default></attribute>
 </targetInstance>
 
 </attributes>
diff --git a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
index f1b2d3367..8a76ac2c8 100755
--- a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
+++ b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
@@ -1084,6 +1084,28 @@ sub generate_dimm
     #$z = sprintf ("%d", $z);
     my $uidstr = sprintf("0x%02X03%04X",${node},$dimm+${node}*512);
 
+    # Calculate the VPD Record number value
+    my $vpdRec = 0;
+
+    # Set offsets based on mba, mem_port, and dimm values
+    if( 1 == $x )
+    {
+        $vpdRec = $vpdRec + 4;
+    }
+    if( 1 == $y )
+    {
+        $vpdRec = $vpdRec + 2;
+    }
+    if( 1 == $z )
+    {
+        $vpdRec = $vpdRec + 1;
+    }
+
+    # Adjust offset based on MCS value
+    $vpdRec = ($mcs * 8) + $vpdRec;
+    # Adjust offset basedon processor value
+    $vpdRec = ($proc * 64) + $vpdRec;
+
     print "
 <targetInstance>
     <id>sys${sys}node${node}dimm$dimm</id>
@@ -1109,7 +1131,7 @@ sub generate_dimm
         <id>MBA_DIMM</id>
         <default>$z</default>
     </attribute>
-    <attribute><id>VPD_REC_NUM</id><default>$dimm</default></attribute>
+    <attribute><id>VPD_REC_NUM</id><default>$vpdRec</default></attribute>
 </targetInstance>
 ";
 }
author	Terry J. Opie <opiet@us.ibm.com>	2012-04-25 11:39:05 -0500
committer	A. Patrick Williams III <iawillia@us.ibm.com>	2012-06-18 16:38:55 -0500
commit	e9de3b17d17a3c230ae9db3ed7d4139950cd4963 (patch)
tree	d71fec7cbd502e07d94c64590cff1401c9f3b155
parent	e14f34f3648159c2fd5d62900ee5568ca2b78af3 (diff)
download	talos-hostboot-e9de3b17d17a3c230ae9db3ed7d4139950cd4963.tar.gz talos-hostboot-e9de3b17d17a3c230ae9db3ed7d4139950cd4963.zip