diff --git a/Z80.CPU/1.0/API/C/modules/emulation/CPU/Z80.h b/Z80.CPU/1.0/API/C/modules/emulation/CPU/Z80.h
index a6813c4..d2c4fbb 100644
--- a/Z80.CPU/1.0/API/C/modules/emulation/CPU/Z80.h
+++ b/Z80.CPU/1.0/API/C/modules/emulation/CPU/Z80.h
@@ -31,29 +31,29 @@ typedef struct {
 } Z80;
 
 
-#ifndef BUILDING_Z80_CPU
+#ifndef BUILDING_CPU_Z80
 
 #	ifdef __cplusplus
 	extern "C" {
 #	endif
 
-#	ifdef USING_STATIC_LIBRARY_Z80_CPU
-#		define Z80_CPU_API
+#	ifdef USING_STATIC_CPU_Z80
+#		define CPU_Z80_API
 #	else
-#		define Z80_CPU_API Q_API
+#		define CPU_Z80_API Q_API
 #	endif
 
-	Z80_CPU_API qsize z80_run   (Z80*     object,
+	CPU_Z80_API qsize z80_run   (Z80*     object,
 				     qsize    cycles);
 
-	Z80_CPU_API void  z80_power (Z80*     object,
+	CPU_Z80_API void  z80_power (Z80*     object,
 				     qboolean state);
 
-	Z80_CPU_API void  z80_reset (Z80*     object);
+	CPU_Z80_API void  z80_reset (Z80*     object);
 
-	Z80_CPU_API void  z80_nmi   (Z80*     object);
+	CPU_Z80_API void  z80_nmi   (Z80*     object);
 
-	Z80_CPU_API void  z80_irq   (Z80*     object,
+	CPU_Z80_API void  z80_irq   (Z80*     object,
 				     qboolean state);
 
 #	ifdef __cplusplus
diff --git a/Z80.CPU/1.0/sources/Z80.c b/Z80.CPU/1.0/sources/Z80.c
index 1636b95..0974ccc 100644
--- a/Z80.CPU/1.0/sources/Z80.c
+++ b/Z80.CPU/1.0/sources/Z80.c
@@ -10,7 +10,7 @@ Released under the terms of the GNU General Public License v3. */
 #define MODULE_NAME   Z80
 #define MODULE_PREFIX z80_
 #define MODULE_HEADER <modules/emulation/CPU/Z80.h>
-#define BUILDING_Z80_CPU
+#define BUILDING_CPU_Z80
 
 #include <Q/configuration/module.h>
 #include <Q/macros/value.h>