PRD: Created Nimbus specific rule files

Change-Id: I0fe5f7aedde70d4aae006b4926cb542799cebcec
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68152
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68276
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

23 files changed, 129 insertions, 129 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfP9Mca_common.C b/src/usr/diag/prdf/common/plat/mem/prdfP9Mca_common.C
index ac54ac97e..80d15bc71 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfP9Mca_common.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfP9Mca_common.C
@@ -40,7 +40,7 @@ namespace PRDF
 
 using namespace PlatServices;
 
-namespace p9_mca
+namespace nimbus_mca
 {
 
 //##############################################################################
@@ -59,7 +59,7 @@ int32_t Initialize( ExtensibleChip * i_chip )
     i_chip->getDataBundle() = new McaDataBundle( i_chip );
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE( p9_mca, Initialize );
+PRDF_PLUGIN_DEFINE( nimbus_mca, Initialize );
 
 //##############################################################################
 //
@@ -81,7 +81,7 @@ int32_t CalloutAttachedDimmsHigh( ExtensibleChip * i_chip,
 
     return SUCCESS; // nothing to return to rule code
 }
-PRDF_PLUGIN_DEFINE( p9_mca, CalloutAttachedDimmsHigh );
+PRDF_PLUGIN_DEFINE( nimbus_mca, CalloutAttachedDimmsHigh );
 
 //##############################################################################
 //
@@ -98,7 +98,7 @@ PRDF_PLUGIN_DEFINE( p9_mca, CalloutAttachedDimmsHigh );
 int32_t mcaUeAlgorithm( ExtensibleChip * i_chip,
                         STEP_CODE_DATA_STRUCT & io_sc )
 {
-    #define PRDF_FUNC "[p9_mca::mcaUeAlgorithm] "
+    #define PRDF_FUNC "[nimbus_mca::mcaUeAlgorithm] "
 
     SCAN_COMM_REGISTER_CLASS * fir = nullptr;
     SCAN_COMM_REGISTER_CLASS * msk = nullptr;
@@ -165,7 +165,7 @@ int32_t mcaUeAlgorithm( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE( p9_mca, mcaUeAlgorithm );
+PRDF_PLUGIN_DEFINE( nimbus_mca, mcaUeAlgorithm );
 
 //##############################################################################
 //
@@ -187,7 +187,7 @@ int32_t AnalyzeFetchMpe_##RANK( ExtensibleChip * i_chip, \
     MemEcc::analyzeFetchMpe<TYPE_MCA>( i_chip, rank, io_sc ); \
     return SUCCESS; \
 } \
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeFetchMpe_##RANK );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeFetchMpe_##RANK );
 
 PLUGIN_FETCH_MPE_ERROR( 0 )
 PLUGIN_FETCH_MPE_ERROR( 1 )
@@ -214,7 +214,7 @@ int32_t AnalyzeFetchNceTce( ExtensibleChip * i_chip,
     MemEcc::analyzeFetchNceTce<TYPE_MCA>( i_chip, io_sc );
     return SUCCESS; // nothing to return to rule code
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeFetchNceTce );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeFetchNceTce );
 
 //------------------------------------------------------------------------------
 
@@ -230,7 +230,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_chip,
     MemEcc::analyzeFetchUe<TYPE_MCA>( i_chip, io_sc );
     return SUCCESS; // nothing to return to rule code
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeFetchUe );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeFetchUe );
 
 //------------------------------------------------------------------------------
 
@@ -255,7 +255,7 @@ int32_t AnalyzeMainlineIue( ExtensibleChip * i_chip,
 
     return rc; // nothing to return to rule code
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeMainlineIue );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeMainlineIue );
 
 //------------------------------------------------------------------------------
 
@@ -280,7 +280,7 @@ int32_t AnalyzeMaintIue( ExtensibleChip * i_chip,
 
     return rc; // nothing to return to rule code
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeMaintIue );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeMaintIue );
 
 //------------------------------------------------------------------------------
 
@@ -295,7 +295,7 @@ int32_t AnalyzeImpe( ExtensibleChip * i_chip, STEP_CODE_DATA_STRUCT & io_sc )
     MemEcc::analyzeImpe<TYPE_MCA>( i_chip, io_sc );
     return SUCCESS; // nothing to return to rule code
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeImpe );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeImpe );
 
 //------------------------------------------------------------------------------
 
@@ -308,7 +308,7 @@ PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeImpe );
 int32_t AnalyzeFetchAueIaue( ExtensibleChip * i_chip,
                              STEP_CODE_DATA_STRUCT & io_sc )
 {
-    #define PRDF_FUNC "[p9_mca::AnalyzeFetchAueIaue] "
+    #define PRDF_FUNC "[nimbus_mca::AnalyzeFetchAueIaue] "
 
     MemAddr addr;
     if ( SUCCESS != getMemReadAddr<TYPE_MCA>(i_chip, MemAddr::READ_AUE_ADDR,
@@ -328,7 +328,7 @@ int32_t AnalyzeFetchAueIaue( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeFetchAueIaue );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeFetchAueIaue );
 
 /**
  * @brief  MCAECCFIR[33] - Maintenance AUE
@@ -339,7 +339,7 @@ PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeFetchAueIaue );
 int32_t AnalyzeMaintAue( ExtensibleChip * i_chip,
                          STEP_CODE_DATA_STRUCT & io_sc )
 {
-    #define PRDF_FUNC "[p9_mca::AnalyzeMaintAue] "
+    #define PRDF_FUNC "[nimbus_mca::AnalyzeMaintAue] "
 
     MemAddr addr;
     if ( SUCCESS != getMemMaintAddr<TYPE_MCA>(i_chip, addr) )
@@ -358,11 +358,11 @@ int32_t AnalyzeMaintAue( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE( p9_mca, AnalyzeMaintAue );
+PRDF_PLUGIN_DEFINE( nimbus_mca, AnalyzeMaintAue );
 
 //------------------------------------------------------------------------------
 
-} // end namespace p9_mca
+} // end namespace nimbus_mca
 
 } // end namespace PRDF
 
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfP9Mcbist_common.C b/src/usr/diag/prdf/common/plat/mem/prdfP9Mcbist_common.C
index 24e1fbc71..98834c08f 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfP9Mcbist_common.C
+++ b/src/usr/diag/prdf/common/plat/mem/prdfP9Mcbist_common.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -40,7 +40,7 @@ namespace PRDF
 using namespace PlatServices;
 using namespace TARGETING;
 
-namespace p9_mcbist
+namespace nimbus_mcbist
 {
 
 //##############################################################################
@@ -59,7 +59,7 @@ namespace p9_mcbist
 int32_t CaptureMcaRegisters( ExtensibleChip * i_mcbChip,
                              STEP_CODE_DATA_STRUCT & io_sc  )
 {
-    #define PRDF_FUNC "[p9_mcbist::CaptureMcaRegisters] "
+    #define PRDF_FUNC "[nimbus_mcbist::CaptureMcaRegisters] "
 
     CaptureData & cd = io_sc.service_data->GetCaptureData();
 
@@ -77,8 +77,8 @@ int32_t CaptureMcaRegisters( ExtensibleChip * i_mcbChip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE( p9_mcbist, CaptureMcaRegisters );
+PRDF_PLUGIN_DEFINE( nimbus_mcbist, CaptureMcaRegisters );
 
-} // end namespace p9_mcbist
+} // end namespace nimbus_mcbist
 
 } // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_capp.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_capp.rule
index 55ca5bd8f..7df3ba57a 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_capp.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_capp.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_capp.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_capp.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_capp
+chip nimbus_capp
 {
     name        "P9 CAPP chiplet";
     targettype  TYPE_CAPP;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ec.rule
index bda7915aa..0721706eb 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ec.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_ec.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_ec.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_ec
+chip nimbus_ec
 {
     name        "P9 EC chiplet";
     targettype  TYPE_CORE;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_eq.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule
index 073ef8a51..897211aa1 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_eq.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_eq.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_eq.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_eq
+chip nimbus_eq
 {
     name        "P9 EQ chiplet";
     targettype  TYPE_EQ;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule
index 9c349cd70..a82fa3857 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_ex.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_ex
+chip nimbus_ex
 {
     name        "P9 EX chiplet";
     targettype  TYPE_EX;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mca.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
index 6b0800390..b00568be6 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mca.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_mca.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_mca
+chip nimbus_mca
 {
     name        "P9 MCA chiplet";
     targettype  TYPE_MCA;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule
index 7c8ff27b1..f1098d033 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_mcbist
+chip nimbus_mcbist
 {
     name        "P9 MCBIST chiplet";
     targettype  TYPE_MCBIST;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcs.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule
index 930f770d1..244909452 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mcs.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_mcs.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_mcs
+chip nimbus_mcs
 {
     name        "P9 MCS chiplet";
     targettype  TYPE_MCS;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_obus.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule
index 5e62a4216..6f5cdb118 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_obus.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_obus.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_obus.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_obus
+chip nimbus_obus
 {
     name        "P9 OBUS chiplet";
     targettype  TYPE_OBUS;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_pec.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_pec.rule
index e3ede37d5..d9b45b225 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_pec.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_pec.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_pec.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_pec.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_pec
+chip nimbus_pec
 {
     name        "P9 PEC chiplet";
     targettype  TYPE_PEC;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_phb.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_phb.rule
index 271265c98..78e7dd173 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_phb.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_phb.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_phb.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_phb.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_phb
+chip nimbus_phb
 {
     name        "P9 PHB chiplet";
     targettype  TYPE_PHB;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
index 6592e2842..b0a378218 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_proc.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_nimbus
+chip nimbus_proc
 {
     name        "P9 Nimbus chip";
     targettype  TYPE_PROC;
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_xbus.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_xbus.rule
index ea8bc69be..093ef6c76 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_xbus.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_xbus.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/plat/p9/p9_xbus.rule $
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_xbus.rule $
 #
 # OpenPOWER HostBoot Project
 #
@@ -23,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-chip p9_xbus
+chip nimbus_xbus
 {
     name        "P9 XBUS chiplet";
     targettype  TYPE_XBUS;
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C b/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
index 5853dc431..00197f709 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
@@ -64,18 +64,18 @@ int32_t ClearServiceCallFlag( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,  CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_xbus,    CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_obus,    CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_ec,      CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_eq,      CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_pec,     CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_mcbist,  CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_mca,     CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_capp,    CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_phb,     CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( p9_mcs,     CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_capp,   CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ec,     CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_eq,     CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,     CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_mca,    CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_mcbist, CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_mcs,    CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,   CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_pec,    CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_phb,    CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,   CommonPlugins, ClearServiceCallFlag );
+PRDF_PLUGIN_DEFINE_NS( nimbus_xbus,   CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( cumulus_capp,  CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( cumulus_dmi,   CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ec,    CommonPlugins, ClearServiceCallFlag );
@@ -108,7 +108,7 @@ int32_t ClearServiceCallFlag_mnfgInfo( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS(p9_nimbus,  CommonPlugins, ClearServiceCallFlag_mnfgInfo);
+PRDF_PLUGIN_DEFINE_NS(nimbus_proc,  CommonPlugins, ClearServiceCallFlag_mnfgInfo);
 PRDF_PLUGIN_DEFINE_NS(cumulus_proc, CommonPlugins, ClearServiceCallFlag_mnfgInfo);
 
 } // namespace CommonPlugins ends
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C b/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C
index 14d31e06d..6eb03a5a0 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C
@@ -554,7 +554,7 @@ int32_t obus_callout_L0( ExtensibleChip * i_chip,
     return rc;
 
 } // end  obus_callout_L0
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, obus_callout_L0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, obus_callout_L0 );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, obus_callout_L0 );
 
 int32_t obus_callout_L1( ExtensibleChip * i_chip,
@@ -570,7 +570,7 @@ int32_t obus_callout_L1( ExtensibleChip * i_chip,
     return rc;
 
 } // end  obus_callout_L1
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, obus_callout_L1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, obus_callout_L1 );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, obus_callout_L1 );
 
 int32_t obus0_callout_L0( ExtensibleChip * i_chip,
@@ -585,7 +585,7 @@ int32_t obus0_callout_L0( ExtensibleChip * i_chip,
 
 } // end obus0_callout_L0
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus0_callout_L0 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus0_callout_L0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus0_callout_L0 );
 
 
 int32_t obus0_callout_L1( ExtensibleChip * i_chip,
@@ -600,7 +600,7 @@ int32_t obus0_callout_L1( ExtensibleChip * i_chip,
 
 } // end obus0_callout_L1
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus0_callout_L1 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus0_callout_L1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus0_callout_L1 );
 
 
 int32_t obus1_callout_L0( ExtensibleChip * i_chip,
@@ -615,7 +615,7 @@ int32_t obus1_callout_L0( ExtensibleChip * i_chip,
 
 } // end obus1_callout_L0
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus1_callout_L0 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus1_callout_L0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus1_callout_L0 );
 
 
 int32_t obus1_callout_L1( ExtensibleChip * i_chip,
@@ -630,7 +630,7 @@ int32_t obus1_callout_L1( ExtensibleChip * i_chip,
 
 } // end obus1_callout_L1
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus1_callout_L1 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus1_callout_L1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus1_callout_L1 );
 
 
 int32_t obus2_callout_L0( ExtensibleChip * i_chip,
@@ -645,7 +645,7 @@ int32_t obus2_callout_L0( ExtensibleChip * i_chip,
 
 } // end obus2_callout_L0
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus2_callout_L0 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus2_callout_L0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus2_callout_L0 );
 
 
 int32_t obus2_callout_L1( ExtensibleChip * i_chip,
@@ -660,7 +660,7 @@ int32_t obus2_callout_L1( ExtensibleChip * i_chip,
 
 } // end obus2_callout_L1
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus2_callout_L1 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus2_callout_L1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus2_callout_L1 );
 
 
 int32_t obus3_callout_L0( ExtensibleChip * i_chip,
@@ -675,7 +675,7 @@ int32_t obus3_callout_L0( ExtensibleChip * i_chip,
 
 } // end obus3_callout_L0
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus3_callout_L0 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus3_callout_L0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus3_callout_L0 );
 
 
 int32_t obus3_callout_L1( ExtensibleChip * i_chip,
@@ -690,7 +690,7 @@ int32_t obus3_callout_L1( ExtensibleChip * i_chip,
 
 } // end obus3_callout_L1
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, obus3_callout_L1 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, obus3_callout_L1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, obus3_callout_L1 );
 
 
 void  obus_clearMaskFail( errlHndl_t &io_errl, TargetHandle_t &i_rxTrgt,
@@ -795,7 +795,7 @@ int32_t obus_fail_L0( ExtensibleChip * i_chip,
     return rc;
 
 } // end obus_fail_L0
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, obus_fail_L0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, obus_fail_L0 );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, obus_fail_L0 );
 
 
@@ -827,7 +827,7 @@ int32_t obus_fail_L1( ExtensibleChip * i_chip,
     return rc;
 
 } // end obus_fail_L1
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, obus_fail_L1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, obus_fail_L1 );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, obus_fail_L1 );
 
 
@@ -860,7 +860,7 @@ int32_t captureSmpObus0( ExtensibleChip * i_chip,
 
 } // end captureSmpObus0
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, captureSmpObus0 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, captureSmpObus0 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, captureSmpObus0 );
 
 
 int32_t captureSmpObus1( ExtensibleChip * i_chip,
@@ -871,7 +871,7 @@ int32_t captureSmpObus1( ExtensibleChip * i_chip,
 
 } // end captureSmpObus1
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, captureSmpObus1 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, captureSmpObus1 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, captureSmpObus1 );
 
 
 int32_t captureSmpObus2( ExtensibleChip * i_chip,
@@ -882,7 +882,7 @@ int32_t captureSmpObus2( ExtensibleChip * i_chip,
 
 } // end captureSmpObus2
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, captureSmpObus2 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, captureSmpObus2 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, captureSmpObus2 );
 
 
 int32_t captureSmpObus3( ExtensibleChip * i_chip,
@@ -893,7 +893,7 @@ int32_t captureSmpObus3( ExtensibleChip * i_chip,
 
 } // end captureSmpObus3
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, LaneRepair, captureSmpObus3 );
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,   LaneRepair, captureSmpObus3 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  LaneRepair, captureSmpObus3 );
 
 
 
@@ -990,9 +990,9 @@ int32_t spareDeployed( ExtensibleChip * i_chip,
     else
         return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_xbus,     LaneRepair, spareDeployed );
+PRDF_PLUGIN_DEFINE_NS( nimbus_xbus,  LaneRepair, spareDeployed );
 PRDF_PLUGIN_DEFINE_NS( cumulus_xbus, LaneRepair, spareDeployed );
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, spareDeployed );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, spareDeployed );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, spareDeployed );
 PRDF_PLUGIN_DEFINE_NS( cen_centaur, LaneRepair, spareDeployed );
 
@@ -1010,9 +1010,9 @@ int32_t maxSparesExceeded( ExtensibleChip * i_chip,
     else
         return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_xbus,     LaneRepair, maxSparesExceeded );
+PRDF_PLUGIN_DEFINE_NS( nimbus_xbus,  LaneRepair, maxSparesExceeded );
 PRDF_PLUGIN_DEFINE_NS( cumulus_xbus, LaneRepair, maxSparesExceeded );
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, maxSparesExceeded );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, maxSparesExceeded );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, maxSparesExceeded );
 PRDF_PLUGIN_DEFINE_NS( cen_centaur, LaneRepair, maxSparesExceeded );
 
@@ -1030,9 +1030,9 @@ int32_t tooManyBusErrors( ExtensibleChip * i_chip,
     else
         return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_xbus,     LaneRepair, tooManyBusErrors );
+PRDF_PLUGIN_DEFINE_NS( nimbus_xbus,  LaneRepair, tooManyBusErrors );
 PRDF_PLUGIN_DEFINE_NS( cumulus_xbus, LaneRepair, tooManyBusErrors );
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, tooManyBusErrors );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, tooManyBusErrors );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, tooManyBusErrors );
 PRDF_PLUGIN_DEFINE_NS( cen_centaur, LaneRepair, tooManyBusErrors );
 
@@ -1048,9 +1048,9 @@ int32_t calloutBusInterfacePlugin( ExtensibleChip * i_chip,
     calloutBusInterface(i_chip, io_sc, MRU_LOW);
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_xbus,     LaneRepair, calloutBusInterfacePlugin );
+PRDF_PLUGIN_DEFINE_NS( nimbus_xbus,  LaneRepair, calloutBusInterfacePlugin );
 PRDF_PLUGIN_DEFINE_NS( cumulus_xbus, LaneRepair, calloutBusInterfacePlugin );
-PRDF_PLUGIN_DEFINE_NS( p9_obus,     LaneRepair, calloutBusInterfacePlugin );
+PRDF_PLUGIN_DEFINE_NS( nimbus_obus,  LaneRepair, calloutBusInterfacePlugin );
 PRDF_PLUGIN_DEFINE_NS( cumulus_obus, LaneRepair, calloutBusInterfacePlugin );
 PRDF_PLUGIN_DEFINE_NS( cumulus_dmi,  LaneRepair, calloutBusInterfacePlugin );
 PRDF_PLUGIN_DEFINE_NS( cen_centaur, LaneRepair, calloutBusInterfacePlugin );
@@ -1100,7 +1100,7 @@ int32_t calloutBusInterface_##TYPE##POS( ExtensibleChip * i_chip, \
 { \
     return callChildLR_calloutBusInterfacePlugin( i_chip, TYPE_##TYPE, POS, io_sc ); \
 } \
-PRDF_PLUGIN_DEFINE_NS(p9_nimbus,  LaneRepair, calloutBusInterface_##TYPE##POS);\
+PRDF_PLUGIN_DEFINE_NS(nimbus_proc,  LaneRepair, calloutBusInterface_##TYPE##POS);\
 PRDF_PLUGIN_DEFINE_NS(cumulus_proc, LaneRepair, calloutBusInterface_##TYPE##POS);
 
 PLUGIN_CALLOUT_INTERFACE( XBUS, 0 )
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
index a61540357..a3b17a13f 100755
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
@@ -222,18 +222,18 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type,
 
     std::map<TARGETING::MODEL, std::map<TARGETING::TYPE, const char *>> fnMap =
     {
-        { MODEL_NIMBUS,  { { TYPE_PROC,   p9_nimbus      },
-                           { TYPE_EQ,     p9_eq          },
-                           { TYPE_EX,     p9_ex          },
-                           { TYPE_CORE,   p9_ec          },
-                           { TYPE_CAPP,   p9_capp        },
-                           { TYPE_PEC,    p9_pec         },
-                           { TYPE_PHB,    p9_phb         },
-                           { TYPE_XBUS,   p9_xbus        },
-                           { TYPE_OBUS,   p9_obus        },
-                           { TYPE_MCBIST, p9_mcbist      },
-                           { TYPE_MCS,    p9_mcs         },
-                           { TYPE_MCA,    p9_mca         }, } },
+        { MODEL_NIMBUS,  { { TYPE_PROC,   nimbus_proc    },
+                           { TYPE_EQ,     nimbus_eq      },
+                           { TYPE_EX,     nimbus_ex      },
+                           { TYPE_CORE,   nimbus_ec      },
+                           { TYPE_CAPP,   nimbus_capp    },
+                           { TYPE_PEC,    nimbus_pec     },
+                           { TYPE_PHB,    nimbus_phb     },
+                           { TYPE_XBUS,   nimbus_xbus    },
+                           { TYPE_OBUS,   nimbus_obus    },
+                           { TYPE_MCBIST, nimbus_mcbist  },
+                           { TYPE_MCS,    nimbus_mcs     },
+                           { TYPE_MCA,    nimbus_mca     }, } },
         { MODEL_CUMULUS, { { TYPE_PROC,   cumulus_proc   },
                            { TYPE_EQ,     cumulus_eq     },
                            { TYPE_EX,     cumulus_ex     },
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Ec.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Ec.C
index e620195d9..7f14ab1e8 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Ec.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Ec.C
@@ -133,7 +133,7 @@ int32_t PostAnalysis( ExtensibleChip * i_chip,
 #endif
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ec,      Ec, PostAnalysis );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ec,  Ec, PostAnalysis );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ec, Ec, PostAnalysis );
 
 /**
@@ -250,7 +250,7 @@ int32_t PreAnalysis( ExtensibleChip * i_chip, STEP_CODE_DATA_STRUCT & io_sc,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ec,      Ec, PreAnalysis );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ec,  Ec, PreAnalysis );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ec, Ec, PreAnalysis );
 
 void checkCoreRePresent( ExtensibleChip * i_chip,
@@ -399,7 +399,7 @@ int32_t CheckCoreCheckstop( ExtensibleChip * i_chip,
     return SUCCESS;
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ec,      Ec, CheckCoreCheckstop );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ec,  Ec, CheckCoreCheckstop );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ec, Ec, CheckCoreCheckstop );
 
 } // end namespace Ec
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Eq.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Eq.C
index ad211501b..93ccec2de 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Eq.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Eq.C
@@ -60,7 +60,7 @@ int32_t PostAnalysis( ExtensibleChip * i_chip,
 #endif
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_eq,      Eq, PostAnalysis );
+PRDF_PLUGIN_DEFINE_NS( nimbus_eq,  Eq, PostAnalysis );
 PRDF_PLUGIN_DEFINE_NS( cumulus_eq, Eq, PostAnalysis );
 
 }
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Ex.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Ex.C
index de7246b26..71f3b79ab 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Ex.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Ex.C
@@ -54,7 +54,7 @@ int32_t Initialize( ExtensibleChip * i_exChip )
     i_exChip->getDataBundle() = new P9ExDataBundle( i_exChip );
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, Initialize );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, Initialize );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, Initialize );
 
 /**
@@ -169,7 +169,7 @@ int32_t PostAnalysis( ExtensibleChip * i_exChip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, PostAnalysis );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, PostAnalysis );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, PostAnalysis );
 
 /**
@@ -195,7 +195,7 @@ int32_t cacheCeWorkaround( ExtensibleChip * i_chip,
     return SUCCESS;
 
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, cacheCeWorkaround );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, cacheCeWorkaround );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, cacheCeWorkaround );
 
 /**
@@ -319,7 +319,7 @@ int32_t L2UE( ExtensibleChip * i_chip, STEP_CODE_DATA_STRUCT & io_sc )
 #endif
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, L2UE );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, L2UE );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, L2UE );
 
 /**
@@ -367,7 +367,7 @@ int32_t L3UE( ExtensibleChip * i_chip, STEP_CODE_DATA_STRUCT & io_sc )
 #endif
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, L3UE );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, L3UE );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, L3UE );
 
 /**
@@ -482,7 +482,7 @@ int32_t L2CE( ExtensibleChip * i_chip, STEP_CODE_DATA_STRUCT & io_sc )
     return SUCCESS;
 
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, L2CE );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, L2CE );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, L2CE );
 
 /**
@@ -638,7 +638,7 @@ int32_t L3CE( ExtensibleChip * i_chip,
     return SUCCESS;
 
 }
-PRDF_PLUGIN_DEFINE_NS( p9_ex,      Ex, L3CE );
+PRDF_PLUGIN_DEFINE_NS( nimbus_ex,  Ex, L3CE );
 PRDF_PLUGIN_DEFINE_NS( cumulus_ex, Ex, L3CE );
 
 }
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
index 56f694fa4..80ce46823 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
@@ -362,7 +362,7 @@ int32_t CheckErrorType( ExtensibleChip * i_chip, uint32_t & o_errType )
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, CheckErrorType );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, CheckErrorType );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, CheckErrorType );
 
 /**
@@ -390,7 +390,7 @@ int32_t clearParityError( ExtensibleChip * i_chip,
     return SUCCESS;
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, clearParityError );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, clearParityError );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, clearParityError );
 
 /**
@@ -426,7 +426,7 @@ int32_t QueryPll( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, QueryPll );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, QueryPll );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, QueryPll );
 
 /**
@@ -469,7 +469,7 @@ int32_t ClearPll( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, ClearPll );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, ClearPll );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, ClearPll );
 
 int32_t ClearMfPll( ExtensibleChip * i_chip,
@@ -502,7 +502,7 @@ int32_t ClearMfPll( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, ClearMfPll );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, ClearMfPll );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, ClearMfPll );
 
 /**
@@ -562,7 +562,7 @@ int32_t MaskPll( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, MaskPll );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, MaskPll );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, MaskPll );
 
 /**
@@ -597,7 +597,7 @@ int32_t capturePllFfdc( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, capturePllFfdc );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, capturePllFfdc );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, capturePllFfdc );
 
 } // end namespace Proc
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Proc.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Proc.C
index 3f1a56372..8fafaa561 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Proc.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Proc.C
@@ -93,7 +93,7 @@ int32_t CheckForRecovered( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, CheckForRecovered );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, CheckForRecovered );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, CheckForRecovered );
 
 //------------------------------------------------------------------------------
@@ -174,7 +174,7 @@ int32_t CheckForRecoveredSev(ExtensibleChip * i_chip, uint32_t & o_sev)
     return SUCCESS;
 
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, CheckForRecoveredSev );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, CheckForRecoveredSev );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, CheckForRecoveredSev );
 
 /** @func GetCheckstopInfo
@@ -271,7 +271,7 @@ int32_t GetCheckstopInfo( ExtensibleChip * i_chip,
     return SUCCESS;
 
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, GetCheckstopInfo );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, GetCheckstopInfo );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, GetCheckstopInfo );
 
 //------------------------------------------------------------------------------
@@ -292,7 +292,7 @@ int32_t checkNimbusDD10( ExtensibleChip * i_chip,
     else
         return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus, Proc, checkNimbusDD10 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc, Proc, checkNimbusDD10 );
 
 int32_t checkNotNimbusDD10( ExtensibleChip * i_chip,
                             STEP_CODE_DATA_STRUCT & io_sc )
@@ -300,7 +300,7 @@ int32_t checkNotNimbusDD10( ExtensibleChip * i_chip,
     // Return the opposite of checkNimbusDD10().
     return (FAIL == checkNimbusDD10(i_chip, io_sc)) ? SUCCESS : FAIL;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus, Proc, checkNotNimbusDD10 );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc, Proc, checkNotNimbusDD10 );
 
 //------------------------------------------------------------------------------
 
@@ -323,7 +323,7 @@ int32_t isHostAttnFirAccessible(ExtensibleChip * i_chip, bool & o_isOkToAccess)
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, isHostAttnFirAccessible );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, isHostAttnFirAccessible );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, isHostAttnFirAccessible );
 
 //------------------------------------------------------------------------------
@@ -361,7 +361,7 @@ int32_t isUcsFirAccessible(ExtensibleChip * i_chip, bool & o_isOkToAccess)
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, isUcsFirAccessible );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, isUcsFirAccessible );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, isUcsFirAccessible );
 
 //------------------------------------------------------------------------------
@@ -379,7 +379,7 @@ int32_t handleDeadmanTimer( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, handleDeadmanTimer );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, handleDeadmanTimer );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, handleDeadmanTimer );
 
 //------------------------------------------------------------------------------
@@ -420,7 +420,7 @@ int32_t handleSbeVital( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, handleSbeVital );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, handleSbeVital );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, handleSbeVital );
 
 //------------------------------------------------------------------------------
@@ -454,7 +454,7 @@ int32_t CheckForUnitCs( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, CheckForUnitCs );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, CheckForUnitCs );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, CheckForUnitCs );
 
 //------------------------------------------------------------------------------
@@ -488,7 +488,7 @@ int32_t PmRecovery( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, PmRecovery );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, PmRecovery );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, PmRecovery );
 
 //------------------------------------------------------------------------------
@@ -563,7 +563,7 @@ int32_t handleIntCqFirPcRecovError( ExtensibleChip * i_chip,
 
     return l_rc;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, handleIntCqFirPcRecovError );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, handleIntCqFirPcRecovError );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, handleIntCqFirPcRecovError );
 
 //------------------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9TodPlugins.C b/src/usr/diag/prdf/common/plat/p9/prdfP9TodPlugins.C
index 04996b138..3261c7100 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9TodPlugins.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9TodPlugins.C
@@ -967,7 +967,7 @@ int32_t todStepCheckFault( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, todStepCheckFault );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, todStepCheckFault );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, todStepCheckFault );
 
 /**
@@ -1030,7 +1030,7 @@ int32_t todNewTopologyIfBackupMDMT( ExtensibleChip * i_chip,
 #endif
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, todNewTopologyIfBackupMDMT );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, todNewTopologyIfBackupMDMT );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, todNewTopologyIfBackupMDMT );
 
 
@@ -1054,7 +1054,7 @@ int32_t requestTopologySwitch( ExtensibleChip * i_chip,
 #endif
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, requestTopologySwitch );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, requestTopologySwitch );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, requestTopologySwitch );
 
 /**
@@ -1090,7 +1090,7 @@ int32_t isTodDisabled( ExtensibleChip * i_chip,
 
     return o_rc;
 }
-PRDF_PLUGIN_DEFINE_NS( p9_nimbus,    Proc, isTodDisabled );
+PRDF_PLUGIN_DEFINE_NS( nimbus_proc,  Proc, isTodDisabled );
 PRDF_PLUGIN_DEFINE_NS( cumulus_proc, Proc, isTodDisabled );
 
 } //namespace Proc ends