diff --git a/juniper_codegen/src/enums.rs b/juniper_codegen/src/derive_enum.rs
similarity index 100%
rename from juniper_codegen/src/enums.rs
rename to juniper_codegen/src/derive_enum.rs
diff --git a/juniper_codegen/src/input_objects.rs b/juniper_codegen/src/derive_input_object.rs
similarity index 100%
rename from juniper_codegen/src/input_objects.rs
rename to juniper_codegen/src/derive_input_object.rs
diff --git a/juniper_codegen/src/lib.rs b/juniper_codegen/src/lib.rs
index cc94ce46..e157445e 100644
--- a/juniper_codegen/src/lib.rs
+++ b/juniper_codegen/src/lib.rs
@@ -6,8 +6,8 @@ extern crate syn;
 extern crate quote;
 
 mod util;
-mod enums;
-mod input_objects;
+mod derive_enum;
+mod derive_input_object;
 mod derive_object;
 
 use proc_macro::TokenStream;
@@ -16,7 +16,7 @@ use proc_macro::TokenStream;
 pub fn derive_enum(input: TokenStream) -> TokenStream {
     let s = input.to_string();
     let ast = syn::parse_derive_input(&s).unwrap();
-    let gen = enums::impl_enum(&ast);
+    let gen = derive_enum::impl_enum(&ast);
     gen.parse().unwrap()
 }
 
@@ -24,7 +24,7 @@ pub fn derive_enum(input: TokenStream) -> TokenStream {
 pub fn derive_input_object(input: TokenStream) -> TokenStream {
     let s = input.to_string();
     let ast = syn::parse_derive_input(&s).unwrap();
-    let gen = input_objects::impl_input_object(&ast);
+    let gen = derive_input_object::impl_input_object(&ast);
     gen.parse().unwrap()
 }
 
diff --git a/juniper_tests/src/codegen/enums.rs b/juniper_tests/src/codegen/derive_enum.rs
similarity index 100%
rename from juniper_tests/src/codegen/enums.rs
rename to juniper_tests/src/codegen/derive_enum.rs
diff --git a/juniper_tests/src/codegen/input_objects.rs b/juniper_tests/src/codegen/derive_input_object.rs
similarity index 100%
rename from juniper_tests/src/codegen/input_objects.rs
rename to juniper_tests/src/codegen/derive_input_object.rs
diff --git a/juniper_tests/src/codegen/mod.rs b/juniper_tests/src/codegen/mod.rs
index 5b5e77c8..596af99f 100644
--- a/juniper_tests/src/codegen/mod.rs
+++ b/juniper_tests/src/codegen/mod.rs
@@ -1,3 +1,3 @@
-mod enums;
-mod input_objects;
+mod derive_enum;
+mod derive_input_object;
 mod derive_object;