diff --git a/src/lib.rs b/src/lib.rs
index 260f1a0..1d859d4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,5 @@
 #[cfg(target_os = "macos")]
-mod osx;
+mod mac_os;
 
 #[cfg(target_os = "macos")]
 #[macro_use]
@@ -13,7 +13,7 @@ pub trait Barfly {
 }
 
 #[cfg(target_os = "macos")]
-pub type PlatformFly = osx::OsxBarfly;
+pub type PlatformFly = mac_os::MacOsBarfly;
 
 pub fn new(name: &str) -> PlatformFly {
     PlatformFly::new(name)
diff --git a/src/osx/mod.rs b/src/mac_os/mod.rs
similarity index 98%
rename from src/osx/mod.rs
rename to src/mac_os/mod.rs
index 7412c71..6765868 100644
--- a/src/osx/mod.rs
+++ b/src/mac_os/mod.rs
@@ -26,13 +26,13 @@ pub use self::objc_foundation::{INSObject, NSObject};
 
 use super::Barfly;
 
-pub struct OsxBarfly {
+pub struct MacOsBarfly {
     name: String,
     menu: *mut objc::runtime::Object,
     pool: *mut objc::runtime::Object,
 }
 
-impl Drop for OsxBarfly {
+impl Drop for MacOsBarfly {
     fn drop(&mut self) {
         unsafe {
             self.pool.drain()
@@ -40,11 +40,11 @@ impl Drop for OsxBarfly {
     }
 }
 
-impl Barfly for OsxBarfly {
+impl Barfly for MacOsBarfly {
     fn new(name: &str) -> Self {
         unsafe {
             let pool = NSAutoreleasePool::new(nil);
-            OsxBarfly {
+            MacOsBarfly {
                 name: name.to_owned(),
                 pool: pool,
                 menu: NSMenu::new(nil).autorelease(),