diff --git a/include/w32lib/w32lib.h b/include/w32lib/w32lib.h
index 1b94f73..a94d39e 100644
--- a/include/w32lib/w32lib.h
+++ b/include/w32lib/w32lib.h
@@ -11,10 +11,10 @@ extern "C" {
 #endif
 
 /* pre-alpha */
-#ifndef WLIB_APP
-#ifndef WLIB_PRE_ALPHA
+#ifndef W32LIB_APP
+#ifndef W32LIB_PRE_ALPHA
 #error  libw32lib: pre-alpha: ABI is not final!
-#error  to use the library, please pass -DWLIB_PRE_ALPHA to the compiler.
+#error  to use the library, please pass -DW32LIB_PRE_ALPHA to the compiler.
 #endif
 #endif
 
diff --git a/include/w32lib/w32lib_api.h b/include/w32lib/w32lib_api.h
index ae3fd88..5b2c211 100644
--- a/include/w32lib/w32lib_api.h
+++ b/include/w32lib/w32lib_api.h
@@ -3,33 +3,33 @@
 
 #include <limits.h>
 
-/* wlib_export */
+/* w32lib_export */
 #if	defined(__dllexport)
-#define wlib_export __dllexport
+#define w32lib_export __dllexport
 #else
-#define wlib_export
+#define w32lib_export
 #endif
 
-/* wlib_import */
+/* w32lib_import */
 #if	defined(__dllimport)
-#define wlib_import __dllimport
+#define w32lib_import __dllimport
 #else
-#define wlib_import
+#define w32lib_import
 #endif
 
-/* wlib_api */
-#ifndef WLIB_APP
-#if     defined (WLIB_EXPORT)
-#define wlib_api wlib_export
-#elif   defined (WLIB_IMPORT)
-#define wlib_api wlib_import
-#elif   defined (WLIB_STATIC)
-#define wlib_api
+/* w32lib_api */
+#ifndef W32LIB_APP
+#if     defined (W32LIB_EXPORT)
+#define w32lib_api w32lib_export
+#elif   defined (W32LIB_IMPORT)
+#define w32lib_api w32lib_import
+#elif   defined (W32LIB_STATIC)
+#define w32lib_api
 #else
-#define wlib_api
+#define w32lib_api
 #endif
 #else
-#define wlib_api
+#define w32lib_api
 #endif
 
 #endif
diff --git a/project/extras.mk b/project/extras.mk
index a25054a..54ec606 100644
--- a/project/extras.mk
+++ b/project/extras.mk
@@ -1,6 +1,6 @@
-CFLAGS_SHARED_ATTR	+= -DWLIB_PRE_ALPHA -DWLIB_EXPORT
-CFLAGS_STATIC_ATTR	+= -DWLIB_PRE_ALPHA -DWLIB_STATIC
-CFLAGS_APP_ATTR		+= -DWLIB_APP
+CFLAGS_SHARED_ATTR	+= -DW32LIB_PRE_ALPHA -DW32LIB_EXPORT
+CFLAGS_STATIC_ATTR	+= -DW32LIB_PRE_ALPHA -DW32LIB_STATIC
+CFLAGS_APP_ATTR		+= -DW32LIB_APP
 
 src/driver/wlib_driver_ctx.o:	version.tag
 src/driver/wlib_driver_ctx.lo:	version.tag
diff --git a/project/tagver.mk b/project/tagver.mk
index 1696919..7ab2595 100644
--- a/project/tagver.mk
+++ b/project/tagver.mk
@@ -1,4 +1,4 @@
-VER_NAMESPACE	= WLIB
+VER_NAMESPACE	= W32LIB
 
 VER_MAJOR	= 0
 VER_MINOR	= 0