Rename SecureROM to SecureRomManager

Change-Id: I839daf3fc44e3459a9c6c147703fd671c5ec79a8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36971
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 70 insertions, 79 deletions

diff --git a/src/usr/secureboot/base/makefile b/src/usr/secureboot/base/makefile
index 883e48123..58d79be86 100644
--- a/src/usr/secureboot/base/makefile
+++ b/src/usr/secureboot/base/makefile
@@ -30,7 +30,7 @@ SUBDIRS += test.d
 OBJS += service.o
 OBJS += settings.o
 OBJS += header.o
-OBJS += securerom.o
+OBJS += securerommgr.o
 OBJS += rom_entry.o
 OBJS += trustedboot_base.o
 OBJS += $(if $(CONFIG_TPMDD),trustedbootMsg.o,)
diff --git a/src/usr/secureboot/base/securerom.C b/src/usr/secureboot/base/securerommgr.C
index 74c2a18bb..b79640d0d 100644
--- a/src/usr/secureboot/base/securerom.C
+++ b/src/usr/secureboot/base/securerommgr.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/secureboot/base/securerom.C $                         */
+/* $Source: src/usr/secureboot/base/securerommgr.C $                      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -34,7 +34,7 @@
 #include <errl/errlmanager.H>
 #include "../common/securetrace.H"
 
-#include "securerom.H"
+#include "securerommgr.H"
 #include <secureboot/settings.H>
 
 // Quick change for unit testing
@@ -56,9 +56,9 @@ namespace SECUREBOOT
  * @brief Initialize Secure Rom by loading it into memory and
  *        retrieving Hash Keys
  */
-errlHndl_t initializeSecureROM(void)
+errlHndl_t initializeSecureRomManager(void)
 {
-    return Singleton<SecureROM>::instance().initialize();
+    return Singleton<SecureRomManager>::instance().initialize();
 }
 
 
@@ -73,7 +73,7 @@ errlHndl_t verifyContainer(void * i_container, const sha2_hash_t* i_hwKeyHash)
     TRACUCOMP(g_trac_secure, "verifyContainer(): i_container=%p, size=0x%x",
               i_container, i_size);
 
-    return Singleton<SecureROM>::instance().verifyContainer(i_container,
+    return Singleton<SecureRomManager>::instance().verifyContainer(i_container,
                                                             i_hwKeyHash);
 }
 
@@ -83,7 +83,8 @@ errlHndl_t verifyContainer(void * i_container, const sha2_hash_t* i_hwKeyHash)
  */
 errlHndl_t hashBlob(const void * i_blob, size_t i_size, SHA512_t io_buf)
 {
-    return Singleton<SecureROM>::instance().hashBlob(i_blob, i_size, io_buf);
+    return Singleton<SecureRomManager>::instance().hashBlob(i_blob, i_size,
+                                                            io_buf);
 }
 
 /**
@@ -92,7 +93,8 @@ errlHndl_t hashBlob(const void * i_blob, size_t i_size, SHA512_t io_buf)
  */
 errlHndl_t hashConcatBlobs(const blobPair_t &i_blobs, SHA512_t o_buf)
 {
-    return Singleton<SecureROM>::instance().hashConcatBlobs(i_blobs, o_buf);
+    return Singleton<SecureRomManager>::instance().hashConcatBlobs(i_blobs,
+                                                                   o_buf);
 }
 
 /*
@@ -100,7 +102,7 @@ errlHndl_t hashConcatBlobs(const blobPair_t &i_blobs, SHA512_t o_buf)
  */
 void getHwKeyHash(sha2_hash_t o_hash)
 {
-    return Singleton<SecureROM>::instance().getHwKeyHash(o_hash);
+    return Singleton<SecureRomManager>::instance().getHwKeyHash(o_hash);
 }
 
 }; //end SECUREBOOT namespace
@@ -116,9 +118,9 @@ using namespace SECUREBOOT;
  * @brief Initialize Secure Rom by loading it into memory and
  *        getting Hash Keys
  */
-errlHndl_t SecureROM::initialize()
+errlHndl_t SecureRomManager::initialize()
 {
-    TRACDCOMP(g_trac_secure,ENTER_MRK"SecureROM::initialize()");
+    TRACDCOMP(g_trac_secure,ENTER_MRK"SecureRomManager::initialize()");
 
     errlHndl_t l_errl = NULL;
 #if (0)
@@ -131,7 +133,7 @@ errlHndl_t SecureROM::initialize()
         if (iv_device_ptr != NULL)
         {
             // The Secure ROM has already been initialized
-            TRACUCOMP(g_trac_secure,"SecureROM::initialize(): Already "
+            TRACUCOMP(g_trac_secure,"SecureRomManager::initialize(): Already "
                       "Loaded: iv_device_ptr=%p", iv_device_ptr);
 
             // Can skip the rest of this function
@@ -154,14 +156,14 @@ errlHndl_t SecureROM::initialize()
 
         if (l_errl != NULL)
         {
-            TRACFCOMP(g_trac_secure,ERR_MRK"SecureROM::initialize():"
+            TRACFCOMP(g_trac_secure,ERR_MRK"SecureRomManager::initialize():"
             " Fail SCOM Read of tbrom_reg_addr (0x%x)", tbrom_reg_addr);
 
             break;
         }
 
 
-        TRACUCOMP(g_trac_secure,INFO_MRK"SecureROM::initialize(): "
+        TRACUCOMP(g_trac_secure,INFO_MRK"SecureRomManager::initialize(): "
                   "tbrom_reg_data = 0x%016llx", tbrom_reg_data);
 
 
@@ -176,7 +178,7 @@ errlHndl_t SecureROM::initialize()
 
         if (l_rom_virtAddr == NULL)
         {
-            TRACFCOMP(g_trac_secure,ERR_MRK"SecureROM::initialize():"
+            TRACFCOMP(g_trac_secure,ERR_MRK"SecureRomManager::initialize():"
             " mmio_dev_map failed: l_rom_virtAddr=%p, l_rom_baseAddr=%p",
             l_rom_virtAddr, l_rom_baseAddr);
 
@@ -234,7 +236,7 @@ errlHndl_t SecureROM::initialize()
 
         if (l_rc != 0)
         {
-            TRACFCOMP(g_trac_secure,EXIT_MRK"SecureROM::initialize():"
+            TRACFCOMP(g_trac_secure,EXIT_MRK"SecureRomManager::initialize():"
             " Fail from mm_set_permission(EXECUTABLE): l_rc=0x%x, ptr=%p, "
             "size=0x%x, access=0x%x", l_rc, iv_device_ptr,
             SECUREROM_MEMORY_SIZE, l_access_type);
@@ -266,13 +268,13 @@ errlHndl_t SecureROM::initialize()
         /*  Retrieve HW Hash Keys From The System                      */
         /***************************************************************/
 
-        // @todo RTC:RTC:34080 - Support for SecureROM::getHwKeyHash()
-        l_errl = SecureROM::getHwKeyHash();
+        // @todo RTC:RTC:34080 - Support for SecureRomManager::getHwKeyHash()
+        l_errl = SecureRomManager::getHwKeyHash();
 
         if (l_errl != NULL)
         {
-            TRACFCOMP(g_trac_secure,ERR_MRK"SecureROM::initialize():"
-            " SecureROM::getHwKeyHash() returned an error");
+            TRACFCOMP(g_trac_secure,ERR_MRK"SecureRomManager::initialize():"
+            " SecureRomManager::getHwKeyHash() returned an error");
 
             l_errl->collectTrace(SECURE_COMP_NAME,256);
             break;
@@ -286,7 +288,7 @@ errlHndl_t SecureROM::initialize()
         // If we've made it this far without an error, than Secure ROM
         //  is properly initialized and pages shouldn't be de-allocated
         l_cleanup = false;
-        TRACFCOMP(g_trac_secure,INFO_MRK"SecureROM::initialize(): SUCCESSFUL:"
+        TRACFCOMP(g_trac_secure,INFO_MRK"SecureRomManager::initialize(): SUCCESSFUL:"
         " iv_device_ptr=%p", iv_device_ptr);
 
 
@@ -295,10 +297,10 @@ errlHndl_t SecureROM::initialize()
     // Check to see if we should free pages
     if (l_cleanup == true)
     {
-        SecureROM::_cleanup();
+        SecureRomManager::_cleanup();
     }
 
-    TRACDCOMP(g_trac_secure,EXIT_MRK"SecureROM::initialize() - %s",
+    TRACDCOMP(g_trac_secure,EXIT_MRK"SecureRomManager::initialize() - %s",
               ((NULL == l_errl) ? "No Error" : "With Error") );
 #endif
     return l_errl;
@@ -309,12 +311,12 @@ errlHndl_t SecureROM::initialize()
 /**
  * @brief Verify Container against system hash keys
  */
-errlHndl_t SecureROM::verifyContainer(void * i_container,
+errlHndl_t SecureRomManager::verifyContainer(void * i_container,
 // TODO securebootp9 - this is dummy parameter added to aid in p9 port
 // need to replace the method below with up-to-date version
                                       const sha2_hash_t* i_hwKeyHash)
 {
-    TRACDCOMP(g_trac_secure,ENTER_MRK"SecureROM::verifyContainer(): "
+    TRACDCOMP(g_trac_secure,ENTER_MRK"SecureRomManager::verifyContainer(): "
               "i_container=%p", i_container);
 
 
@@ -338,8 +340,6 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
 
         // Now set hw_key_hash, which is of type sha2_hash_t, to iv_key_hash
         memcpy (&l_hw_parms.hw_key_hash, &iv_key_hash, sizeof(sha2_hash_t));
-        TRACFBIN(g_trac_secure,"SecureROM::verifyContainer(): hw_key_hash",
-                 l_hw_parms.hw_key_hash, sizeof(sha2_hash_t));
 
         /*******************************************************************/
         /* Call ROM_verify() function via an assembly call                 */
@@ -350,7 +350,7 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
                                                  iv_device_ptr)
                                                + ROM_VERIFY_FUNCTION_OFFSET;
 
-        TRACUCOMP(g_trac_secure,"SecureROM::verifyContainer(): "
+        TRACUCOMP(g_trac_secure,"SecureRomManager::verifyContainer(): "
                   " Calling ROM_verify() via call_rom_verify: l_rc=0x%x, "
                   "l_hw_parms.log=0x%x (&l_hw_parms=%p) addr=%p (iv_d_p=%p)",
                   l_rc, l_hw_parms.log, &l_hw_parms, l_rom_verify_startAddr,
@@ -358,15 +358,6 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
 
 
         ROM_container_raw* l_container = reinterpret_cast<ROM_container_raw*>(i_container);
-        TRACFCOMP(g_trac_secure,"magic_number 0x%X", l_container->magic_number);
-        TRACFCOMP(g_trac_secure,"version 0x%X", l_container->version);
-        TRACFCOMP(g_trac_secure,"container_size 0x%X", l_container->container_size);
-        TRACFCOMP(g_trac_secure,"target_hrmor 0x%X", l_container->target_hrmor);
-        TRACFCOMP(g_trac_secure,"stack_pointer 0x%X", l_container->stack_pointer);
-        TRACFBIN(g_trac_secure,"hw_pkey_a", l_container->hw_pkey_a, SHA512_DIGEST_LENGTH);
-        TRACFBIN(g_trac_secure,"hw_pkey_b", l_container->hw_pkey_b, SHA512_DIGEST_LENGTH);
-        TRACFBIN(g_trac_secure,"hw_pkey_c", l_container->hw_pkey_c, SHA512_DIGEST_LENGTH);
-        TRACFCOMP(g_trac_secure,"prefix 0x%X", l_container->prefix);
 
         l_rc = call_rom_verify(reinterpret_cast<void*>
                                (l_rom_verify_startAddr),
@@ -374,7 +365,7 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
                                &l_hw_parms);
 
 
-        TRACUCOMP(g_trac_secure,"SecureROM::verifyContainer(): "
+        TRACUCOMP(g_trac_secure,"SecureRomManager::verifyContainer(): "
                   "Back from ROM_verify() via call_rom_verify: l_rc=0x%x, "
                   "l_hw_parms.log=0x%x (&l_hw_parms=%p) addr=%p (iv_d_p=%p)",
                    l_rc, l_hw_parms.log, &l_hw_parms, l_rom_verify_startAddr,
@@ -384,7 +375,7 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
 
         if (l_rc != 0)
         {
-            TRACFCOMP(g_trac_secure,ERR_MRK"SecureROM::verifyContainer():"
+            TRACFCOMP(g_trac_secure,ERR_MRK"SecureRomManager::verifyContainer():"
             " ROM_verify() FAIL: l_rc=0x%x, l_hw_parms.log=0x%x "
             "addr=%p (iv_d_p=%p)", l_rc, l_hw_parms.log,
             l_rom_verify_startAddr, iv_device_ptr);
@@ -416,7 +407,7 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
     }while(0);
 
 
-    TRACDCOMP(g_trac_secure,EXIT_MRK"SecureROM::verifyContainer() - %s",
+    TRACDCOMP(g_trac_secure,EXIT_MRK"SecureRomManager::verifyContainer() - %s",
              ((NULL == l_errl) ? "No Error" : "With Error") );
 
     return l_errl;
@@ -426,10 +417,10 @@ errlHndl_t SecureROM::verifyContainer(void * i_container,
 /**
  * @brief Hash Blob
  */
-errlHndl_t SecureROM::hashBlob(const void * i_blob, size_t i_size, SHA512_t io_buf) const
+errlHndl_t SecureRomManager::hashBlob(const void * i_blob, size_t i_size, SHA512_t io_buf) const
 {
 
-    TRACDCOMP(g_trac_secure,INFO_MRK"SecureROM::hashBlob() NOT "
+    TRACDCOMP(g_trac_secure,INFO_MRK"SecureRomManager::hashBlob() NOT "
               "supported, but not returning error log");
 
     errlHndl_t  l_errl      =   NULL;
@@ -452,7 +443,7 @@ errlHndl_t SecureROM::hashBlob(const void * i_blob, size_t i_size, SHA512_t io_b
                         i_size,
                         reinterpret_cast<sha2_hash_t*>(io_buf));
 
-        TRACUCOMP(g_trac_secure,"SecureROM::hashBlob(): "
+        TRACUCOMP(g_trac_secure,"SecureRomManager::hashBlob(): "
                   "call_rom_SHA512: blob=%p size=0x%X addr=%p (iv_d_p=%p)",
                    i_blob, i_size, l_rom_SHA512_startAddr,
                    iv_device_ptr);
@@ -460,7 +451,7 @@ errlHndl_t SecureROM::hashBlob(const void * i_blob, size_t i_size, SHA512_t io_b
     }while(0);
 
 
-    TRACDCOMP(g_trac_secure,EXIT_MRK"SecureROM::hashBlob()");
+    TRACDCOMP(g_trac_secure,EXIT_MRK"SecureRomManager::hashBlob()");
 
     return l_errl;
 }
@@ -468,14 +459,14 @@ errlHndl_t SecureROM::hashBlob(const void * i_blob, size_t i_size, SHA512_t io_b
 /**
  * @brief Hash concatenation of N Blobs
  */
-errlHndl_t SecureROM::hashConcatBlobs(const blobPair_t &i_blobs,
+errlHndl_t SecureRomManager::hashConcatBlobs(const blobPair_t &i_blobs,
                                       SHA512_t o_buf) const
 {
     errlHndl_t pError = nullptr;
     std::vector<uint8_t> concatBuf;
     for (const auto &it : i_blobs)
     {
-        assert(it.first != nullptr, "BUG! In SecureROM::hashConcatBlobs(), "
+        assert(it.first != nullptr, "BUG! In SecureRomManager::hashConcatBlobs(), "
             "User passed in nullptr blob pointer");
         const uint8_t* const blob =  static_cast<const uint8_t*>(it.first);
         const auto blobSize = it.second;
@@ -495,10 +486,10 @@ errlHndl_t SecureROM::hashConcatBlobs(const blobPair_t &i_blobs,
 /**
  * @brief  Constructor
  */
-SecureROM::SecureROM()
+SecureRomManager::SecureRomManager()
 :iv_device_ptr(NULL)
 {
-    TRACDCOMP(g_trac_secure, "SecureROM::SecureROM()>");
+    TRACDCOMP(g_trac_secure, "SecureRomManager::SecureRomManager()>");
 
     // Clear out iv_key_hash, which is of type sha2_hash_t
     memset(&iv_key_hash, 0, sizeof(sha2_hash_t) );
@@ -508,9 +499,9 @@ SecureROM::SecureROM()
 /**
  * @brief  Destructor
  */
-SecureROM::~SecureROM() { SecureROM::_cleanup(); };
+SecureRomManager::~SecureRomManager() { SecureRomManager::_cleanup(); };
 
-void SecureROM::_cleanup()
+void SecureRomManager::_cleanup()
 {
     // deallocate pages
     if ( iv_device_ptr != NULL )
@@ -526,7 +517,7 @@ void SecureROM::_cleanup()
 
         if (l_rc != 0)
         {
-            TRACFCOMP(g_trac_secure,ERR_MRK"SecureROM:::_cleanup():"
+            TRACFCOMP(g_trac_secure,ERR_MRK"SecureRomManager:::_cleanup():"
             " Fail from mm_set_permission(WRITABLE): l_rc=0x%x, ptr=%p, "
             "size=0x%x, pages=%d, access=0x%x", l_rc, iv_device_ptr,
             SECUREROM_MEMORY_SIZE, SECUREROM_NUM_PAGES, l_access_type);
@@ -564,7 +555,7 @@ void SecureROM::_cleanup()
             free(iv_device_ptr);
 
             TRACDCOMP(g_trac_secure,INFO_MRK
-                      "SecureROM::_cleanup(): pages set to "
+                      "SecureRomManager::_cleanup(): pages set to "
                       "WRITABLE (rc=0x%x) and free called", l_rc);
 
 
@@ -579,12 +570,12 @@ void SecureROM::_cleanup()
 /**
  * @brief Retrieves HW keys' hash from the system
  */
-errlHndl_t SecureROM::getHwKeyHash()
+errlHndl_t SecureRomManager::getHwKeyHash()
 {
 
     errlHndl_t  l_errl      =   NULL;
 
-    TRACFCOMP(g_trac_secure,INFO_MRK"SecureROM::getHwKeyHash() NOT supported");
+    TRACFCOMP(g_trac_secure,INFO_MRK"SecureRomManager::getHwKeyHash() NOT supported");
 
     // @todo RTC:34080 - Add support for getting HW keys' hash from System
 
@@ -594,7 +585,7 @@ errlHndl_t SecureROM::getHwKeyHash()
 /**
  * @brief  Retrieve the internal hardware keys' hash from secure ROM object.
  */
-void SecureROM::getHwKeyHash(sha2_hash_t o_hash)
+void SecureRomManager::getHwKeyHash(sha2_hash_t o_hash)
 {
     memcpy(o_hash, iv_key_hash, sizeof(sha2_hash_t));
 }
@@ -602,9 +593,9 @@ void SecureROM::getHwKeyHash(sha2_hash_t o_hash)
 /**
  * @brief Static instance function for testcase only
  */
-SecureROM& SecureROM::getInstance()
+SecureRomManager& SecureRomManager::getInstance()
 {
-    return Singleton<SecureROM>::instance();
+    return Singleton<SecureRomManager>::instance();
 }
 
 
diff --git a/src/usr/secureboot/base/securerom.H b/src/usr/secureboot/base/securerommgr.H
index 3704209d9..7ccbf9d77 100644
--- a/src/usr/secureboot/base/securerom.H
+++ b/src/usr/secureboot/base/securerommgr.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/secureboot/base/securerom.H $                         */
+/* $Source: src/usr/secureboot/base/securerommgr.H $                      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -29,10 +29,10 @@
 #include <errl/errlentry.H>
 #include <securerom/ROM.H>
 
-/** @class SecureROM
- *  @brief Class for loading and interacting with SecureROM in memory
+/** @class SecureRomManager
+ *  @brief Class for loading and interacting with SecureRomManager in memory
  */
-class SecureROM
+class SecureRomManager
 {
     public:
 
@@ -99,12 +99,12 @@ class SecureROM
         /**
          * @brief Constructor
          */
-        SecureROM();
+        SecureRomManager();
 
         /**
          * @brief Destructor
          */
-        ~SecureROM();
+        ~SecureRomManager();
 
     private:
 
@@ -137,7 +137,7 @@ class SecureROM
         /**
          * @brief Static instance function for testcase only
          */
-        static SecureROM& getInstance();
+        static SecureRomManager& getInstance();
 
 
         /**
@@ -151,10 +151,10 @@ class SecureROM
          ********************************************/
 
         // let my testcase poke around
-        friend class SecureROMTest;
+        friend class SecureRomManagerTest;
 
 
-}; // end of SecureROM class
+}; // end of SecureRomManager class
 
 
 
diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C
index 54b7d7fb7..05a29acc3 100644
--- a/src/usr/secureboot/base/service.C
+++ b/src/usr/secureboot/base/service.C
@@ -75,13 +75,13 @@ void* initializeBase(void* unused)
         assert(0 == mm_extend(MM_EXTEND_PARTIAL_CACHE));
 
         // Don't extend more than 1/2 cache in VPO as fake PNOR is there
-        // Don't enable SecureROM in VPO
+        // Don't enable SecureRomManager in VPO
 #ifndef CONFIG_P9_VPO_COMPILE
         // Run dcbz on the entire 10MB cache
         assert(0 == mm_extend(MM_EXTEND_FULL_CACHE));
 
         // Initialize the Secure ROM
-        l_errl = initializeSecureROM();
+        l_errl = initializeSecureRomManager();
         if (l_errl)
         {
             break;
diff --git a/src/usr/secureboot/base/test/secureromtest.H b/src/usr/secureboot/base/test/securerommgrtest.H
index 8a4ff4043..9372e1ad3 100644
--- a/src/usr/secureboot/base/test/secureromtest.H
+++ b/src/usr/secureboot/base/test/securerommgrtest.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/secureboot/base/test/secureromtest.H $                */
+/* $Source: src/usr/secureboot/base/test/securerommgrtest.H $             */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -35,7 +35,7 @@
 #include <secureboot/service.H>
 #include <secureboot/secure_reasoncodes.H>
 
-#include "../securerom.H"
+#include "../securerommgr.H"
 
 #include "../../common/securetrace.H"
 
@@ -79,7 +79,7 @@ const uint64_t hw_key_hash[] =
 /*  End of UTILITY FUNCTIONS                                          */
 /**********************************************************************/
 
-class SecureROMTest : public CxxTest::TestSuite
+class SecureRomManagerTest : public CxxTest::TestSuite
 {
   public:
 
@@ -88,7 +88,7 @@ class SecureROMTest : public CxxTest::TestSuite
      */
     void test_verify(void)
     {
-        TRACFCOMP(g_trac_secure,ENTER_MRK"SecureROMTest::test_verify>");
+        TRACFCOMP(g_trac_secure,ENTER_MRK"SecureRomManagerTest::test_verify>");
 
         errlHndl_t  l_errl  =   NULL;
 
@@ -108,23 +108,23 @@ class SecureROMTest : public CxxTest::TestSuite
 
         if (l_errl)
         {
-            TS_FAIL("SecureROMTest::test_verify: loadSignedFile() Failed");
+            TS_FAIL("SecureRomManagerTest::test_verify: loadSignedFile() Failed");
             errlCommit(l_errl, SECURE_COMP_ID);
             return;
         }
 
-        TRACUCOMP(g_trac_secure, "SecureROMTest::test_verify: "
+        TRACUCOMP(g_trac_secure, "SecureRomManagerTest::test_verify: "
                   "signedFile info: addr = %p, size=0x%x",
                   signedFile_pageAddr, signedFile_size);
 
-        SecureROM l_sRom;
+        SecureRomManager l_sRom;
 
-        // Call initializeSecureROM()
+        // Call initializeSecureRomManager()
         l_errl = l_sRom.initialize();
 
         if (l_errl)
         {
-            TS_FAIL("SecureROMTest::test_verify: initializeSecureROM() Failed");
+            TS_FAIL("SecureRomManagerTest::test_verify: initializeSecureRomManager() Failed");
             errlCommit(l_errl, SECURE_COMP_ID);
             return;
         }
@@ -143,7 +143,7 @@ class SecureROMTest : public CxxTest::TestSuite
 
         if (l_errl)
         {
-            TS_FAIL("SecureROMTest::test_verify: verifyContainer() Failed");
+            TS_FAIL("SecureRomManagerTest::test_verify: verifyContainer() Failed");
             errlCommit(l_errl, SECURE_COMP_ID);
             return;
         }
@@ -156,7 +156,7 @@ class SecureROMTest : public CxxTest::TestSuite
             unloadSignedFile( signedFile_pageAddr, signedFile_size);
         }
 
-        TRACFCOMP(g_trac_secure,EXIT_MRK"SecureROMTest::test_verify");
+        TRACFCOMP(g_trac_secure,EXIT_MRK"SecureRomManagerTest::test_verify");
     };
 };