diff --git a/README.md b/README.md
index 9cde2fe9..5ab58542 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ and run the following command on Windows:
 If you can't get the short-form commands to work, try invoking Java directly:
 
     java -cp lib/js.jar org.mozilla.javascript.tools.shell.Main \
-    -modules node_modules -modules rhino_modules -modules . \
+    -modules nodejs_modules -modules rhino_modules -modules . \
     jsdoc.js -T
 
 Usage
@@ -72,7 +72,7 @@ or the long form version:
 
     $ java -classpath lib/js.jar \
     org.mozilla.javascript.tools.debugger.Main -debug \
-    -modules node_modules -modules rhino_modules -modules . \
+    -modules nodejs_modules -modules rhino_modules -modules . \
     jsdoc.js \
     your/script.js
 
diff --git a/jsdoc b/jsdoc
index a6f216dd..4c82ee53 100755
--- a/jsdoc
+++ b/jsdoc
@@ -25,9 +25,9 @@ fi
 if test "$1" = "-T"
 then
     echo "Running Tests"
-    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" 
+    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/nodejs_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" 
 
 else
     # normal mode should be quiet
-    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" 
+    java -classpath "${BASEPATH}/lib/js.jar" ${CMD} -modules "${URLPATH}/nodejs_modules" -modules "${URLPATH}/rhino_modules" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" 
 fi
diff --git a/jsdoc.cmd b/jsdoc.cmd
index 96db593b..c08d424d 100644
--- a/jsdoc.cmd
+++ b/jsdoc.cmd
@@ -36,10 +36,10 @@ IF [%1]==[--debug] (
 
 IF [%1]==[-T] (
     ECHO Running Tests
-    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -opt -1 -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
+    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -opt -1 -modules "%_URLPATH%/nodejs_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
 ) ELSE (
     REM normal mode should be quiet
-    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
+    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -modules "%_URLPATH%/nodejs_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
 )
 
 ENDLOCAL
diff --git a/node_modules/common/args.js b/nodejs_modules/common/args.js
similarity index 100%
rename from node_modules/common/args.js
rename to nodejs_modules/common/args.js
diff --git a/node_modules/common/assert.js b/nodejs_modules/common/assert.js
similarity index 100%
rename from node_modules/common/assert.js
rename to nodejs_modules/common/assert.js
diff --git a/node_modules/common/events.js b/nodejs_modules/common/events.js
similarity index 100%
rename from node_modules/common/events.js
rename to nodejs_modules/common/events.js
diff --git a/node_modules/common/query.js b/nodejs_modules/common/query.js
similarity index 100%
rename from node_modules/common/query.js
rename to nodejs_modules/common/query.js
diff --git a/node_modules/common/sqlite.js b/nodejs_modules/common/sqlite.js
similarity index 100%
rename from node_modules/common/sqlite.js
rename to nodejs_modules/common/sqlite.js
diff --git a/node_modules/common/util.js b/nodejs_modules/common/util.js
similarity index 100%
rename from node_modules/common/util.js
rename to nodejs_modules/common/util.js
diff --git a/node_modules/evilstreak/markdown.js b/nodejs_modules/evilstreak/markdown.js
similarity index 100%
rename from node_modules/evilstreak/markdown.js
rename to nodejs_modules/evilstreak/markdown.js
diff --git a/node_modules/gfm/showdown.js b/nodejs_modules/gfm/showdown.js
similarity index 100%
rename from node_modules/gfm/showdown.js
rename to nodejs_modules/gfm/showdown.js
diff --git a/node_modules/goessner/json2xml.js b/nodejs_modules/goessner/json2xml.js
similarity index 100%
rename from node_modules/goessner/json2xml.js
rename to nodejs_modules/goessner/json2xml.js
diff --git a/node_modules/jshint/jshint.js b/nodejs_modules/jshint/jshint.js
similarity index 100%
rename from node_modules/jshint/jshint.js
rename to nodejs_modules/jshint/jshint.js
diff --git a/node_modules/pajhome/hash.js b/nodejs_modules/pajhome/hash.js
similarity index 100%
rename from node_modules/pajhome/hash.js
rename to nodejs_modules/pajhome/hash.js
diff --git a/node_modules/sitepen/jsonschema.js b/nodejs_modules/sitepen/jsonschema.js
similarity index 100%
rename from node_modules/sitepen/jsonschema.js
rename to nodejs_modules/sitepen/jsonschema.js
diff --git a/node_modules/typicaljoe/taffy.js b/nodejs_modules/typicaljoe/taffy.js
similarity index 100%
rename from node_modules/typicaljoe/taffy.js
rename to nodejs_modules/typicaljoe/taffy.js
diff --git a/node_modules/underscore/template.js b/nodejs_modules/underscore/template.js
similarity index 100%
rename from node_modules/underscore/template.js
rename to nodejs_modules/underscore/template.js
diff --git a/node_modules/wrench/wrench.js b/nodejs_modules/wrench/wrench.js
similarity index 100%
rename from node_modules/wrench/wrench.js
rename to nodejs_modules/wrench/wrench.js
diff --git a/test/README.md b/test/README.md
index 386cde61..483a34fb 100644
--- a/test/README.md
+++ b/test/README.md
@@ -16,7 +16,7 @@ and run the following command on Windows:
 If you can't get the short-form commands to work, try invoking Java directly:
 
     java -cp lib/js.jar org.mozilla.javascript.tools.shell.Main -opt -1 \
-    -modules node_modules -modules rhino_modules -modules . \
+    -modules nodejs_modules -modules rhino_modules -modules . \
     jsdoc.js -T
 
 Writing Tests
diff --git a/test/spec-collection.js b/test/spec-collection.js
index 146d9833..627c89bc 100644
--- a/test/spec-collection.js
+++ b/test/spec-collection.js
@@ -36,7 +36,7 @@ exports.load = function(loadpath, matcher, clear) {
         var file = path.join(env.dirname, loadpath, wannaBeSpecs[i]);
         try {
             if (fs.statSync(file).isFile()) {
-                if (!/.*node_modules.*/.test(file) && matcher.test(path.filename(file))) {
+                if (!/.*nodejs_modules.*/.test(file) && matcher.test(path.filename(file))) {
                     specs.push(createSpecObj(file));
                 }
             }