diff --git a/examples/play.rs b/examples/play.rs
index 4aa7303..87f6882 100644
--- a/examples/play.rs
+++ b/examples/play.rs
@@ -4,10 +4,10 @@ extern crate tokio_core;
 use std::env;
 use tokio_core::reactor::Core;
 
-use librespot::librespot_core::authentication::Credentials;
-use librespot::librespot_core::config::SessionConfig;
-use librespot::librespot_core::session::Session;
-use librespot::librespot_core::spotify_id::SpotifyId;
+use librespot::core::authentication::Credentials;
+use librespot::core::config::SessionConfig;
+use librespot::core::session::Session;
+use librespot::core::spotify_id::SpotifyId;
 use librespot::playback::config::PlayerConfig;
 
 use librespot::playback::audio_backend;
diff --git a/src/lib.rs b/src/lib.rs
index d43c39e..f73db1a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@ extern crate url;
 
 pub extern crate librespot_audio as audio;
 pub extern crate librespot_connect as connect;
-pub extern crate librespot_core;
+pub extern crate librespot_core as core;
 pub extern crate librespot_metadata as metadata;
 pub extern crate librespot_playback as playback;
 pub extern crate librespot_protocol as protocol;
diff --git a/src/main.rs b/src/main.rs
index 92949c2..e3718fb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,11 +26,11 @@ use tokio_core::reactor::{Core, Handle};
 use tokio_io::IoStream;
 use url::Url;
 
-use librespot::librespot_core::authentication::{get_credentials, Credentials};
-use librespot::librespot_core::cache::Cache;
-use librespot::librespot_core::config::{ConnectConfig, DeviceType, SessionConfig};
-use librespot::librespot_core::session::Session;
-use librespot::librespot_core::version;
+use librespot::core::authentication::{get_credentials, Credentials};
+use librespot::core::cache::Cache;
+use librespot::core::config::{ConnectConfig, DeviceType, SessionConfig};
+use librespot::core::session::Session;
+use librespot::core::version;
 
 use librespot::connect::discovery::{discovery, DiscoveryStream};
 use librespot::connect::spirc::{Spirc, SpircTask};