--- a/test/testnativew32.c	Thu Jan 20 17:33:06 2011 -0800
+++ b/test/testnativew32.c	Thu Jan 20 18:04:05 2011 -0800
@@ -1,15 +1,15 @@
 
 #include "testnative.h"
 
-#ifdef TEST_NATIVE_WIN32
+#ifdef TEST_NATIVE_WINDOWS
 
-static void *CreateWindowWin32(int w, int h);
-static void DestroyWindowWin32(void *window);
+static void *CreateWindowNative(int w, int h);
+static void DestroyWindowNative(void *window);
 
-NativeWindowFactory Win32WindowFactory = {
-    "win32",
-    CreateWindowWin32,
-    DestroyWindowWin32
+NativeWindowFactory WindowsWindowFactory = {
+    "windows",
+    CreateWindowNative,
+    DestroyWindowNative
 };
 
 LRESULT CALLBACK
@@ -29,7 +29,7 @@
 }
 
 static void *
-CreateWindowWin32(int w, int h)
+CreateWindowNative(int w, int h)
 {
     HWND hwnd;
     WNDCLASS wc;
@@ -67,7 +67,7 @@
 }
 
 static void
-DestroyWindowWin32(void *window)
+DestroyWindowNative(void *window)
 {
     DestroyWindow((HWND) window);
 }