diff --git a/README.md b/README.md
index acb5fe9..4ae6b16 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-htmlthing
-=========
+maud
+====
 
 Compile-time HTML templates.
 
diff --git a/htmlthing/Cargo.toml b/maud/Cargo.toml
similarity index 69%
rename from htmlthing/Cargo.toml
rename to maud/Cargo.toml
index aa6b7ac..1fc1c5b 100644
--- a/htmlthing/Cargo.toml
+++ b/maud/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 
-name = "htmlthing"
+name = "maud"
 version = "0.0.1"
 authors = ["Chris Wong <lambda.fairy@gmail.com>"]
 
 license = "MIT/Apache-2.0"
-repository = "https://github.com/lfairy/htmlthing"
+repository = "https://github.com/lfairy/maud"
 description = """
 Compile-time HTML templates.
 """
diff --git a/htmlthing/src/lib.rs b/maud/src/lib.rs
similarity index 93%
rename from htmlthing/src/lib.rs
rename to maud/src/lib.rs
index da4bf7d..3c1ec05 100644
--- a/htmlthing/src/lib.rs
+++ b/maud/src/lib.rs
@@ -1,7 +1,7 @@
 //! Internal HTML utilities
 
 #![experimental = "These functions should not be called directly.
-Use the macros in `htmlthing_macros` instead."]
+Use the macros in `maud_macros` instead."]
 
 use std::io::IoResult;
 
diff --git a/htmlthing_macros/Cargo.toml b/maud_macros/Cargo.toml
similarity index 54%
rename from htmlthing_macros/Cargo.toml
rename to maud_macros/Cargo.toml
index 3e4387a..2dbd49e 100644
--- a/htmlthing_macros/Cargo.toml
+++ b/maud_macros/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 
-name = "htmlthing_macros"
+name = "maud_macros"
 version = "0.0.1"
 authors = ["Chris Wong <lambda.fairy@gmail.com>"]
 
 license = "MIT/Apache-2.0"
-repository = "https://github.com/lfairy/htmlthing"
+repository = "https://github.com/lfairy/maud"
 description = """
 Compile-time HTML templates.
 """
 
-[dependencies.htmlthing]
-path = "../htmlthing"
+[dependencies.maud]
+path = "../maud"
 
 [lib]
-name = "htmlthing_macros"
+name = "maud_macros"
 plugin = true
diff --git a/htmlthing_macros/src/lib.rs b/maud_macros/src/lib.rs
similarity index 100%
rename from htmlthing_macros/src/lib.rs
rename to maud_macros/src/lib.rs
diff --git a/htmlthing_macros/src/parse.rs b/maud_macros/src/parse.rs
similarity index 100%
rename from htmlthing_macros/src/parse.rs
rename to maud_macros/src/parse.rs
diff --git a/htmlthing_macros/src/render.rs b/maud_macros/src/render.rs
similarity index 100%
rename from htmlthing_macros/src/render.rs
rename to maud_macros/src/render.rs
diff --git a/htmlthing_macros/tests/tests.rs b/maud_macros/tests/tests.rs
similarity index 78%
rename from htmlthing_macros/tests/tests.rs
rename to maud_macros/tests/tests.rs
index 5c10bac..a71fb9d 100644
--- a/htmlthing_macros/tests/tests.rs
+++ b/maud_macros/tests/tests.rs
@@ -1,7 +1,7 @@
 #![feature(phase)]
 
-extern crate htmlthing;
-#[phase(plugin)] extern crate htmlthing_macros;
+extern crate maud;
+#[phase(plugin)] extern crate maud_macros;
 
 #[test]
 fn it_works() {