diff --git a/.gitignore b/.gitignore
index 46db1ee..a9d37c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/target
-/Cargo.lock
-/derive_rand/target
-/derive_rand/Cargo.lock
+target
+Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
index 0803647..4078e1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,5 +17,5 @@
 log = "0.2.1"
 libc = "0.1.1"
 
-[dev-dependencies.derive_rand]
-path = "derive_rand"
+[dev-dependencies.rand_macros]
+path = "rand_macros"
diff --git a/derive_rand/Cargo.toml b/rand_macros/Cargo.toml
similarity index 89%
rename from derive_rand/Cargo.toml
rename to rand_macros/Cargo.toml
index 45e6af1..6305a07 100644
--- a/derive_rand/Cargo.toml
+++ b/rand_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 
-name = "derive_rand"
+name = "rand_macros"
 version = "0.1.1"
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
@@ -13,5 +13,5 @@
 """
 
 [lib]
-name = "derive_rand"
+name = "rand_macros"
 plugin = true
diff --git a/derive_rand/README.md b/rand_macros/README.md
similarity index 82%
rename from derive_rand/README.md
rename to rand_macros/README.md
index 83bfbf9..464a2c2 100644
--- a/derive_rand/README.md
+++ b/rand_macros/README.md
@@ -5,7 +5,7 @@
 ```rust
 #![feature(plugin)]
 
-#[plugin] #[no_link] extern crate derive_rand;
+#[plugin] #[no_link] extern crate rand_macros;
 extern crate rand;
 
 #[derive_Rand]
diff --git a/derive_rand/src/lib.rs b/rand_macros/src/lib.rs
similarity index 100%
rename from derive_rand/src/lib.rs
rename to rand_macros/src/lib.rs
diff --git a/tests/derive_rand.rs b/tests/rand_macros.rs
similarity index 89%
rename from tests/derive_rand.rs
rename to tests/rand_macros.rs
index 4f293ab..540ad14 100755
--- a/tests/derive_rand.rs
+++ b/tests/rand_macros.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 #![feature(plugin, core)]
 
-#[plugin] #[no_link] extern crate derive_rand;
+#[plugin] #[no_link] extern crate rand_macros;
 extern crate rand;
 
 use rand::Rng;