diff --git a/src/README.txt b/src/README.txt
index 936540be87a..2086765b6f9 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -6,7 +6,7 @@ rustc/             The self-hosted compiler
 
 libcore/           The core library (imported and linked by default)
 libstd/            The standard library (slightly more peripheral code)
-librustsyntax/     The Rust parser and pretty-printer
+libsyntax/         The Rust parser and pretty-printer
 
 rt/                The runtime system
 rt/rust_*.cpp      - The majority of the runtime services
diff --git a/src/rustc/README.txt b/src/rustc/README.txt
index 1c889cc429f..e0a4d7cbda1 100644
--- a/src/rustc/README.txt
+++ b/src/rustc/README.txt
@@ -31,9 +31,9 @@ lib/      - bindings to LLVM
 
 The files concerned purely with syntax -- that is, the AST, parser,
 pretty-printer, lexer, macro expander, and utilities for traversing
-ASTs -- are in a separate crate called "rustsyntax", whose files are
-in ./../librustsyntax if the parent directory of front/, middle/,
-back/, and so on is . .
+ASTs -- are in a separate crate called "syntax", whose files are in
+./../libsyntax if the parent directory of front/, middle/, back/, and
+so on is . .
 
 The entry-point for the compiler is main() in driver/rustc.rs, and
 this file sequences the various parts together.
@@ -42,7 +42,7 @@ this file sequences the various parts together.
 The 3 central data structures:
 ------------------------------
 
-#1: ../librustsyntax/ast.rs defines the AST. The AST is treated as immutable
+#1: ../libsyntax/ast.rs defines the AST. The AST is treated as immutable
     after parsing, but it depends on mutable context data structures
     (mainly hash maps) to give it meaning.
 
@@ -78,8 +78,8 @@ Control and information flow within the compiler:
 - main() in driver/rustc.rs assumes control on startup. Options are
   parsed, platform is detected, etc.
 
-- librustsyntax/parse/parser.rs parses the input files and produces an
-  AST that represents the input crate.
+- libsyntax/parse/parser.rs parses the input files and produces an AST
+  that represents the input crate.
 
 - Multiple middle-end passes (middle/resolve.rs, middle/typeck.rs)
   analyze the semantics of the resulting AST. Each pass generates new
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index 5ddfd8620fa..998e5a61666 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -343,7 +343,7 @@ type substs = {
 };
 
 // NB: If you change this, you'll probably want to change the corresponding
-// AST structure in front/ast::rs as well.
+// AST structure in libsyntax/ast.rs as well.
 enum sty {
     ty_nil,
     ty_bot,