diff --git a/include/ebcl/Registration.hh b/include/ebcl/Registration.hh
index aae6972..125cfd1 100644
--- a/include/ebcl/Registration.hh
+++ b/include/ebcl/Registration.hh
@@ -2,11 +2,11 @@
 /* REGISTRATION SUPPORT *******************************************************/
 /******************************************************************************/
 
-#ifndef _H_LW_LIB_REGISTRATION
-#define _H_LW_LIB_REGISTRATION
-#include <lw/lib/Utilities.hh>
-#include <lw/lib/Pointers.hh>
-namespace lw {
+#ifndef _H_EBCL_REGISTRATION
+#define _H_EBCL_REGISTRATION
+#include <ebcl/Utilities.hh>
+#include <ebcl/Pointers.hh>
+namespace ebcl {
 
 
 /*= REGISTRATION SUPPORT =====================================================*/
@@ -81,5 +81,5 @@ M_DECLARE_SWAP( T_RegisteredItem );
 
 
 } // namespace
-#endif // _H_LW_LIB_REGISTRATION
-#include <lw/lib/inline/Registration.hh>
+#endif // _H_EBCL_REGISTRATION
+#include <ebcl/inline/Registration.hh>
diff --git a/include/ebcl/inline/Registration.hh b/include/ebcl/inline/Registration.hh
index 59b0c87..36a6793 100644
--- a/include/ebcl/inline/Registration.hh
+++ b/include/ebcl/inline/Registration.hh
@@ -2,10 +2,10 @@
 /* REGISTRATION SUPPORT - INLINE CODE *****************************************/
 /******************************************************************************/
 
-#ifndef _H_LW_LIB_INLINE_REGISTRATION
-#define _H_LW_LIB_INLINE_REGISTRATION
-#include <lw/lib/Registration.hh>
-namespace lw {
+#ifndef _H_EBCL_INLINE_REGISTRATION
+#define _H_EBCL_INLINE_REGISTRATION
+#include <ebcl/Registration.hh>
+namespace ebcl {
 
 
 /*= T_RegisteredItem ============================================================*/
@@ -120,5 +120,5 @@ inline void T_RegisteredItem::deleteData( ) noexcept
 }
 
 
-} // namespace lw
-#endif // _H_LW_LIB_INLINE_REGISTRATION
+} // namespace
+#endif // _H_EBCL_INLINE_REGISTRATION