diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml
index 4cdc20ce..f3e9e44d 100644
--- a/serde_codegen/Cargo.toml
+++ b/serde_codegen/Cargo.toml
@@ -18,7 +18,7 @@ with-syntex = [
     "quasi/with-syntex",
     "quasi_codegen",
     "quasi_codegen/with-syntex",
-    "serde_internals/with-syntex",
+    "serde_codegen_internals/with-syntex",
     "syntex",
     "syntex_syntax",
 ]
@@ -32,6 +32,6 @@ aster = { version = "^0.19.0", default-features = false }
 clippy = { version = "^0.*", optional = true }
 quasi = { version = "^0.13.0", default-features = false }
 quasi_macros = { version = "^0.13.0", optional = true }
-serde_internals = { version = "^0.1.0", path = "../serde_internals", default-features = false }
+serde_codegen_internals = { version = "^0.1.0", path = "../serde_codegen_internals", default-features = false }
 syntex = { version = "^0.36.0", optional = true }
 syntex_syntax = { version = "^0.36.0", optional = true }
diff --git a/serde_codegen/src/bound.rs b/serde_codegen/src/bound.rs
index 9e6b182d..259b2427 100644
--- a/serde_codegen/src/bound.rs
+++ b/serde_codegen/src/bound.rs
@@ -6,7 +6,8 @@ use syntax::ast;
 use syntax::ptr::P;
 use syntax::visit;
 
-use internals::{attr, Item};
+use internals::ast::Item;
+use internals::attr;
 
 // Remove the default from every type parameter because in the generated impls
 // they look like associated types: "error: associated type bindings are not
diff --git a/serde_codegen/src/de.rs b/serde_codegen/src/de.rs
index d3c236bf..ee83ede2 100644
--- a/serde_codegen/src/de.rs
+++ b/serde_codegen/src/de.rs
@@ -7,7 +7,8 @@ use syntax::parse::token::InternedString;
 use syntax::ptr::P;
 
 use bound;
-use internals::{attr, Body, Error, Field, Item, Style, Variant};
+use internals::ast::{Body, Field, Item, Style, Variant};
+use internals::{attr, Error};
 
 pub fn expand_derive_deserialize(
     cx: &mut ExtCtxt,
diff --git a/serde_codegen/src/lib.rs b/serde_codegen/src/lib.rs
index 898f34cd..83a2f705 100644
--- a/serde_codegen/src/lib.rs
+++ b/serde_codegen/src/lib.rs
@@ -7,7 +7,7 @@
 
 extern crate aster;
 extern crate quasi;
-extern crate serde_internals as internals;
+extern crate serde_codegen_internals as internals;
 
 #[cfg(feature = "with-syntex")]
 extern crate syntex;
diff --git a/serde_codegen/src/ser.rs b/serde_codegen/src/ser.rs
index 0d833eb5..0369ee21 100644
--- a/serde_codegen/src/ser.rs
+++ b/serde_codegen/src/ser.rs
@@ -6,7 +6,8 @@ use syntax::ext::base::{Annotatable, ExtCtxt};
 use syntax::ptr::P;
 
 use bound;
-use internals::{attr, Body, Error, Field, Item, Style, Variant};
+use internals::ast::{Body, Field, Item, Style, Variant};
+use internals::{attr, Error};
 
 pub fn expand_derive_serialize(
     cx: &mut ExtCtxt,
diff --git a/serde_internals/Cargo.toml b/serde_codegen_internals/Cargo.toml
similarity index 94%
rename from serde_internals/Cargo.toml
rename to serde_codegen_internals/Cargo.toml
index f2864280..1d761475 100644
--- a/serde_internals/Cargo.toml
+++ b/serde_codegen_internals/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "serde_internals"
+name = "serde_codegen_internals"
 version = "0.1.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
diff --git a/serde_internals/src/lib.rs b/serde_codegen_internals/src/ast.rs
similarity index 89%
rename from serde_internals/src/lib.rs
rename to serde_codegen_internals/src/ast.rs
index fc8afe60..dd79944f 100644
--- a/serde_internals/src/lib.rs
+++ b/serde_codegen_internals/src/ast.rs
@@ -1,24 +1,10 @@
-#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
-#![cfg_attr(feature = "nightly-testing", feature(plugin))]
-#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
-
-#[cfg(feature = "with-syntex")]
-#[macro_use]
-extern crate syntex_syntax as syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-#[macro_use]
-extern crate syntax;
-
 use syntax::ast;
 use syntax::codemap;
 use syntax::ext::base::ExtCtxt;
 use syntax::ptr::P;
 
-pub mod attr;
-
-mod error;
-pub use error::Error;
+use attr;
+use Error;
 
 pub struct Item<'a> {
     pub ident: ast::Ident,
diff --git a/serde_internals/src/attr.rs b/serde_codegen_internals/src/attr.rs
similarity index 100%
rename from serde_internals/src/attr.rs
rename to serde_codegen_internals/src/attr.rs
diff --git a/serde_internals/src/error.rs b/serde_codegen_internals/src/error.rs
similarity index 100%
rename from serde_internals/src/error.rs
rename to serde_codegen_internals/src/error.rs
diff --git a/serde_codegen_internals/src/lib.rs b/serde_codegen_internals/src/lib.rs
new file mode 100644
index 00000000..d6e1cfe5
--- /dev/null
+++ b/serde_codegen_internals/src/lib.rs
@@ -0,0 +1,17 @@
+#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
+#![cfg_attr(feature = "nightly-testing", feature(plugin))]
+#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
+
+#[cfg(feature = "with-syntex")]
+#[macro_use]
+extern crate syntex_syntax as syntax;
+
+#[cfg(not(feature = "with-syntex"))]
+#[macro_use]
+extern crate syntax;
+
+pub mod ast;
+pub mod attr;
+
+mod error;
+pub use error::Error;