diff --git a/src/register/iipCaptureData.h b/src/register/iipCaptureData.h
index 10f764b..b37036d 100755
--- a/src/register/iipCaptureData.h
+++ b/src/register/iipCaptureData.h
@@ -109,7 +109,7 @@
 
 #endif
 
-namespace PRDF
+namespace libhei
 {
 
 // Forward Declarations
@@ -399,6 +399,6 @@
 
 };
 
-} // end namespace PRDF
+} // end namespace libhei
 
 #endif
diff --git a/src/register/prdfCaptureData.C b/src/register/prdfCaptureData.C
index 85ff09b..7dac116 100755
--- a/src/register/prdfCaptureData.C
+++ b/src/register/prdfCaptureData.C
@@ -42,7 +42,7 @@
 
 using namespace TARGETING;
 
-namespace PRDF
+namespace libhei
 {
 
 //---------------------------------------------------------------------
@@ -401,4 +401,5 @@
     return *this;
 }
 
-} // end of namespace PRDF
+} // end namespace libhei
+
diff --git a/src/register/prdfHomRegisterAccess.C b/src/register/prdfHomRegisterAccess.C
index 9bdab98..b1702bb 100755
--- a/src/register/prdfHomRegisterAccess.C
+++ b/src/register/prdfHomRegisterAccess.C
@@ -48,7 +48,7 @@
 
 using namespace TARGETING;
 
-namespace PRDF
+namespace libhei
 {
 
 //----------------------------------------------------------------------
@@ -220,4 +220,5 @@
     return rc;
 }
 
-} // End namespace PRDF
+} // end namespace libhei
+
diff --git a/src/register/prdfHomRegisterAccess.H b/src/register/prdfHomRegisterAccess.H
index fe794ce..d382048 100755
--- a/src/register/prdfHomRegisterAccess.H
+++ b/src/register/prdfHomRegisterAccess.H
@@ -43,7 +43,7 @@
 //  Forward References
 //--------------------------------------------------------------------
 
-namespace PRDF
+namespace libhei
 {
 
 namespace RegisterAccess
@@ -162,6 +162,6 @@
     ScomAccessor * iv_ScomAccessor;
 };
 
-} // End namespace PRDF
+} // end namespace libhei
 
 #endif /* PRDFHOMREGISTERACCESS_H */
diff --git a/src/register/prdfRegisterCache.C b/src/register/prdfRegisterCache.C
index 1b547eb..f73b4cd 100644
--- a/src/register/prdfRegisterCache.C
+++ b/src/register/prdfRegisterCache.C
@@ -27,7 +27,7 @@
 
 #include <prdfRegisterCache.H>
 
-namespace PRDF
+namespace libhei
 {
 
 //------------------------------------------------------------------------------
@@ -121,4 +121,6 @@
 }
 
 //------------------------------------------------------------------------------
-}// end namespace  PRDF
+
+} // end namespace libhei
+
diff --git a/src/register/prdfRegisterCache.H b/src/register/prdfRegisterCache.H
index 052bb5c..8ef5159 100644
--- a/src/register/prdfRegisterCache.H
+++ b/src/register/prdfRegisterCache.H
@@ -37,7 +37,7 @@
 #include <prdfScomRegisterAccess.H>
 #include <prdfTargetFwdRef.H>
 
-namespace PRDF
+namespace libhei
 {
 /**
  * @brief Caches the contents of registers used during analysis.
@@ -118,7 +118,7 @@
 
 PRDF_DECLARE_SINGLETON(RegDataCache, ReadCache);
 
-} // namespace PRDF
+} // end namespace libhei
 
 #endif // REG_CACHE_H
 
diff --git a/src/register/prdfScanFacility.C b/src/register/prdfScanFacility.C
index 9175471..2ce591d 100755
--- a/src/register/prdfScanFacility.C
+++ b/src/register/prdfScanFacility.C
@@ -38,7 +38,7 @@
 #include <prdfFlyWeightS.C>
 #include <prdfScomRegisterAccess.H>
 
-namespace PRDF
+namespace libhei
 {
 
 //----------------------------------------------------------------------
@@ -231,5 +231,5 @@
 
 #endif
 
-} // end namespace PRDF
+} // end namespace libhei
 
diff --git a/src/register/prdfScanFacility.H b/src/register/prdfScanFacility.H
index 9a423dd..4107c83 100755
--- a/src/register/prdfScanFacility.H
+++ b/src/register/prdfScanFacility.H
@@ -45,7 +45,7 @@
 #include <prdfScomRegisterAccess.H>
 #include <prdfPlatServices.H>
 
-namespace PRDF
+namespace libhei
 {
 
 
@@ -232,6 +232,6 @@
 
 };
 
-} // end namespace PRDF
+} // end namespace libhei
 
 #endif /* PRDFSCANFACILITY_H */
diff --git a/src/register/prdfScomRegisterAccess.C b/src/register/prdfScomRegisterAccess.C
index 608feeb..3f3f271 100644
--- a/src/register/prdfScomRegisterAccess.C
+++ b/src/register/prdfScomRegisterAccess.C
@@ -25,7 +25,8 @@
 #include <prdfScanFacility.H>
 #include <prdfRegisterCache.H>
 #include <prdfExtensibleChip.H>
-namespace PRDF
+
+namespace libhei
 {
 
 ScomRegisterAccess::ScomRegisterAccess(
@@ -80,4 +81,6 @@
 }
 
 //----------------------------------------------------------------------
-}//namespace PRDF ends
+
+} // end namespace libhei
+
diff --git a/src/register/prdfScomRegisterAccess.H b/src/register/prdfScomRegisterAccess.H
index e302583..b99f8b6 100644
--- a/src/register/prdfScomRegisterAccess.H
+++ b/src/register/prdfScomRegisterAccess.H
@@ -50,7 +50,7 @@
  * else.
  */
 
-namespace PRDF
+namespace libhei
 {
 class ScomRegisterAccess : public HardwareRegister
 {
@@ -105,6 +105,7 @@
 
 };
 
-}//namepsace PRDF ends
+} // end namespace libhei
+
 #endif