diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7266431..4f7bf70 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,9 +35,9 @@ endif
 if WIN32
 # you must adjust the value of DEFAULT_MODPOSTFIX according 
 # to the first number in -version-info above
-CPPFLAGS_PFMOD = -DHCL_DEFAULT_PFMODPREFIX=\"libmoo-\" -DHCL_DEFAULT_PFMODPOSTFIX=\"-1.dll\"
+CPPFLAGS_PFMOD = -DHCL_DEFAULT_PFMODPREFIX=\"libhcl-\" -DHCL_DEFAULT_PFMODPOSTFIX=\"-1.dll\"
 else
-CPPFLAGS_PFMOD = -DHCL_DEFAULT_PFMODPREFIX=\"$(libdir)/libmoo-\" 
+CPPFLAGS_PFMOD = -DHCL_DEFAULT_PFMODPREFIX=\"$(libdir)/libhcl-\" 
 if MACOSX
 CPPFLAGS_PFMOD += -DHCL_DEFAULT_PFMODPOSTFIX=\".dylib\"
 else
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4e29e3a..4b35c82 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -451,12 +451,12 @@ LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
 LIBADD_LIB_COMMON = $(LIBM) $(am__append_1) $(am__append_2) \
 	$(am__append_3)
 @WIN32_FALSE@CPPFLAGS_PFMOD =  \
-@WIN32_FALSE@	-DHCL_DEFAULT_PFMODPREFIX=\"$(libdir)/libmoo-\" \
+@WIN32_FALSE@	-DHCL_DEFAULT_PFMODPREFIX=\"$(libdir)/libhcl-\" \
 @WIN32_FALSE@	$(am__append_4) $(am__append_5)
 
 # you must adjust the value of DEFAULT_MODPOSTFIX according 
 # to the first number in -version-info above
-@WIN32_TRUE@CPPFLAGS_PFMOD = -DHCL_DEFAULT_PFMODPREFIX=\"libmoo-\" \
+@WIN32_TRUE@CPPFLAGS_PFMOD = -DHCL_DEFAULT_PFMODPREFIX=\"libhcl-\" \
 @WIN32_TRUE@	-DHCL_DEFAULT_PFMODPOSTFIX=\"-1.dll\" \
 @WIN32_TRUE@	$(am__append_4) $(am__append_5)
 pkginclude_HEADERS = hcl.h hcl-cmn.h hcl-opt.h hcl-rbt.h hcl-utl.h \
diff --git a/lib/hcl.h b/lib/hcl.h
index f955421..e138a3a 100644
--- a/lib/hcl.h
+++ b/lib/hcl.h
@@ -688,7 +688,7 @@ struct hcl_process_scheduler_t
  * The HCL_BRANDOF() macro return the brand of an object including a numeric
  * object encoded into a pointer.
  */
-#define HCL_BRANDOF(moo,oop) \
+#define HCL_BRANDOF(hcl,oop) \
 	(HCL_OOP_GET_TAG(oop)? ((hcl)->tagged_brands[HCL_OOP_GET_TAG(oop)]): HCL_OBJ_GET_FLAGS_BRAND(oop))
 
 /**