diff --git a/src/mock.rs b/src/common.rs
similarity index 96%
rename from src/mock.rs
rename to src/common.rs
index c039611..917bf5b 100644
--- a/src/mock.rs
+++ b/src/common.rs
@@ -1,3 +1,4 @@
+//! Common functionality used by the mock implementations.
 
 use std::sync::{Mutex, Arc};
 
@@ -60,7 +61,7 @@ impl <'a, T>Iterator for Generic<'a, T> {
 
 #[cfg(test)]
 mod tests {
-    use mock::Generic;
+    use super::*;
 
     #[test]
     fn test_generic_mock() {
diff --git a/src/i2c.rs b/src/i2c.rs
index 0f785dd..a335b55 100644
--- a/src/i2c.rs
+++ b/src/i2c.rs
@@ -31,7 +31,7 @@
 
 use hal::blocking::i2c;
 
-use mock::Generic;
+use common::Generic;
 use error::MockError;
 
 /// I2C Transaction modes
diff --git a/src/lib.rs b/src/lib.rs
index ce7635b..4fb2b19 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,7 @@ extern crate embedded_hal as hal;
 mod error;
 pub use error::MockError;
 
-pub mod mock;
+pub mod common;
 pub mod i2c;
 pub mod spi;
 pub mod delay;
diff --git a/src/spi.rs b/src/spi.rs
index 01dd4ee..e17a6ca 100644
--- a/src/spi.rs
+++ b/src/spi.rs
@@ -36,7 +36,7 @@
 
 use hal::blocking::spi;
 
-use mock::Generic;
+use common::Generic;
 use error::MockError;
 
 /// SPI Transaction mode