diff --git a/README.md b/README.md
index 1c1ac31..d1cfbaa 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,6 @@ but not yet implemented.
 
 # Useful code
 The source code for DScanner has a complete lexer, parser, and abstact syntax
-tree library for D code under the stdx/d/ directory. It is intended that these
+tree library for D code under the std/d/ directory. It is intended that these
 modules eventually end up in Phobos, so feel free to use them for your own D
 tools.
diff --git a/build.sh b/build.sh
index 1a4c7de..2b3cd32 100755
--- a/build.sh
+++ b/build.sh
@@ -24,8 +24,8 @@ dmd\
 #	astprinter.d\
 #	formatter.d\
 #	outliner.d\
-#	stdx/*.d\
-#	stdx/d/*.d\
+#	std/*.d\
+#	std/d/*.d\
 #	analysis/*.d\
 #	-O3 -frelease -fno-bounds-check\
 #	-odscanner\
@@ -39,8 +39,8 @@ dmd\
 #	astprinter.d\
 #	formatter.d\
 #	outliner.d\
-#	stdx/*.d\
-#	stdx/d/*.d\
+#	std/*.d\
+#	std/d/*.d\
 #	analysis/*.d\
 #	-O3 -release\
 #	-oq -of=dscanner\
diff --git a/dub.json b/dub.json
index 086d89e..c67d6fb 100644
--- a/dub.json
+++ b/dub.json
@@ -9,7 +9,7 @@
         {
             "name": "library",
             "targetType": "library",
-            "sourcePaths": ["stdx"],
+            "sourcePaths": ["std"],
         },
         {
             "name": "dscanner",
diff --git a/std/lexer.d b/std/lexer.d
index 1072e45..84fd384 100644
--- a/std/lexer.d
+++ b/std/lexer.d
@@ -33,7 +33,7 @@
  * )
  * Examples:
  * $(UL
- * $(LI A _lexer for D is available $(LINK2 https://github.com/Hackerpilot/Dscanner/blob/master/stdx/d/lexer.d, here).)
+ * $(LI A _lexer for D is available $(LINK2 https://github.com/Hackerpilot/Dscanner/blob/master/std/d/lexer.d, here).)
  * $(LI A _lexer for Lua is available $(LINK2 https://github.com/Hackerpilot/lexer-demo/blob/master/lualexer.d, here).)
  * $(LI A _lexer for JSON is available $(LINK2 https://github.com/Hackerpilot/lexer-demo/blob/master/jsonlexer.d, here).)
  * )