diff --git a/Makefile b/Makefile
index aad7fe90eb..5e1a9d6220 100755
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,8 @@ default:
 	@echo "macosx-ppc"
 	@echo "solaris-x86-32"
 	@echo "solaris-x86-64"
-	@echo "windows-ce-arm"
-	@echo "windows-nt-x86-32"
+	@echo "wince-arm"
+	@echo "winnt-x86-32"
 	@echo ""
 	@echo "Additional modifiers:"
 	@echo ""
@@ -122,10 +122,10 @@ solaris-x86-32:
 solaris-x86-64:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.solaris.x86.64
 
-windows-nt-x86-32:
+winnt-x86-32:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
 
-windows-ce-arm:
+wince-arm:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
 
 macosx.app: factor
diff --git a/core/system/system-docs.factor b/core/system/system-docs.factor
old mode 100644
new mode 100755
index d80cfa9ceb..bdd04307df
--- a/core/system/system-docs.factor
+++ b/core/system/system-docs.factor
@@ -51,7 +51,8 @@ HELP: os
         "openbsd"
         "netbsd"
         "solaris"
-        "windows"
+        "wince"
+        "winnt"
     }
 } ;
 
diff --git a/core/system/system.factor b/core/system/system.factor
old mode 100644
new mode 100755
index 4983260a36..4500720058
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -22,7 +22,7 @@ splitting assocs ;
     os "wince" = ; foldable
 
 : winnt? ( -- ? )
-    os "windows" = ; foldable
+    os "winnt" = ; foldable
 
 : windows? ( -- ? )
     wince? winnt? or ; foldable
diff --git a/vm/os-windows-nt.h b/vm/os-windows-nt.h
index 9e451f0301..e289b6617d 100755
--- a/vm/os-windows-nt.h
+++ b/vm/os-windows-nt.h
@@ -12,7 +12,7 @@ typedef char F_SYMBOL;
 #define unbox_symbol_string unbox_char_string
 #define from_symbol_string from_char_string
 
-#define FACTOR_OS_STRING "windows"
+#define FACTOR_OS_STRING "winnt"
 #define FACTOR_DLL L"factor-nt.dll"
 #define FACTOR_DLL_NAME "factor-nt.dll"