diff --git a/lib/twitter/client.rb b/lib/twitter/client.rb
index 122d0a545..aa28cbdbf 100644
--- a/lib/twitter/client.rb
+++ b/lib/twitter/client.rb
@@ -1,14 +1,16 @@
 require 'addressable/uri'
 require 'simple_oauth'
+require 'twitter/utils'
 require 'twitter/version'
 
 module Twitter
   class Client
+    include Twitter::Utils
     attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret
-    alias_method :oauth_token, :access_token
-    alias_method :oauth_token=, :access_token=
-    alias_method :oauth_token_secret, :access_token_secret
-    alias_method :oauth_token_secret=, :access_token_secret=
+    deprecate_alias :oauth_token, :access_token
+    deprecate_alias :oauth_token=, :access_token=
+    deprecate_alias :oauth_token_secret, :access_token_secret
+    deprecate_alias :oauth_token_secret=, :access_token_secret=
 
     # Initializes a new Client object
     #