diff --git a/tests/ef_tests/src/doc_cases.rs b/tests/ef_tests/src/cases.rs
similarity index 90%
rename from tests/ef_tests/src/doc_cases.rs
rename to tests/ef_tests/src/cases.rs
index 6c87f17c4..9ac08434d 100644
--- a/tests/ef_tests/src/doc_cases.rs
+++ b/tests/ef_tests/src/cases.rs
@@ -9,11 +9,11 @@ pub use ssz_generic::*;
 pub use ssz_static::*;
 
 #[derive(Debug, Deserialize)]
-pub struct DocCases<T> {
+pub struct Cases<T> {
     pub test_cases: Vec<T>,
 }
 
-impl<T: YamlDecode> YamlDecode for DocCases<T> {
+impl<T: YamlDecode> YamlDecode for Cases<T> {
     /// Decodes a YAML list of test cases
     fn yaml_decode(yaml: &String) -> Result<Self, Error> {
         let doc = &YamlLoader::load_from_str(yaml).unwrap()[0];
diff --git a/tests/ef_tests/src/doc_cases/ssz_generic.rs b/tests/ef_tests/src/cases/ssz_generic.rs
similarity index 98%
rename from tests/ef_tests/src/doc_cases/ssz_generic.rs
rename to tests/ef_tests/src/cases/ssz_generic.rs
index 2074e76bb..66cca1ffd 100644
--- a/tests/ef_tests/src/doc_cases/ssz_generic.rs
+++ b/tests/ef_tests/src/cases/ssz_generic.rs
@@ -16,7 +16,7 @@ impl YamlDecode for SszGeneric {
     }
 }
 
-impl Test for DocCases<SszGeneric> {
+impl Test for Cases<SszGeneric> {
     fn test<E: EthSpec>(&self) -> Vec<TestCaseResult> {
         self.test_cases
             .iter()
diff --git a/tests/ef_tests/src/doc_cases/ssz_static.rs b/tests/ef_tests/src/cases/ssz_static.rs
similarity index 99%
rename from tests/ef_tests/src/doc_cases/ssz_static.rs
rename to tests/ef_tests/src/cases/ssz_static.rs
index a8f904406..e4904404b 100644
--- a/tests/ef_tests/src/doc_cases/ssz_static.rs
+++ b/tests/ef_tests/src/cases/ssz_static.rs
@@ -41,7 +41,7 @@ impl SszStatic {
     }
 }
 
-impl Test for DocCases<SszStatic> {
+impl Test for Cases<SszStatic> {
     fn test<E: EthSpec>(&self) -> Vec<TestCaseResult> {
         self.test_cases
             .iter()
diff --git a/tests/ef_tests/src/doc.rs b/tests/ef_tests/src/doc.rs
index a32cfedfc..6792535e6 100644
--- a/tests/ef_tests/src/doc.rs
+++ b/tests/ef_tests/src/doc.rs
@@ -54,11 +54,11 @@ impl Doc {
 
 pub fn run_test<T, E: EthSpec>(test_doc_yaml: &String) -> Vec<TestCaseResult>
 where
-    DocCases<T>: Test + serde::de::DeserializeOwned + YamlDecode,
+    Cases<T>: Test + serde::de::DeserializeOwned + YamlDecode,
 {
     let test_cases_yaml = extract_yaml_by_key(test_doc_yaml, "test_cases");
 
-    let test_cases: DocCases<T> = DocCases::yaml_decode(&test_cases_yaml.to_string()).unwrap();
+    let test_cases: Cases<T> = Cases::yaml_decode(&test_cases_yaml.to_string()).unwrap();
 
     test_cases.test::<E>()
 }
diff --git a/tests/ef_tests/src/lib.rs b/tests/ef_tests/src/lib.rs
index 430502f7a..7dd1167f9 100644
--- a/tests/ef_tests/src/lib.rs
+++ b/tests/ef_tests/src/lib.rs
@@ -5,16 +5,16 @@ use ssz::Decode;
 use std::fmt::Debug;
 
 pub use crate::case_result::*;
+pub use crate::cases::*;
 pub use crate::doc::*;
-pub use crate::doc_cases::*;
 pub use crate::doc_header::*;
 pub use crate::error::*;
 pub use crate::eth_specs::*;
 pub use yaml_decode::YamlDecode;
 
 mod case_result;
+mod cases;
 mod doc;
-mod doc_cases;
 mod doc_header;
 mod error;
 mod eth_specs;