diff --git a/gpapi/config.py b/gpapi/config.py
index 432d8df..f2b5586 100644
--- a/gpapi/config.py
+++ b/gpapi/config.py
@@ -48,7 +48,7 @@ def __init__(self, device):
         for (key, value) in config.items(device):
             self.device[key] = value
 
-    def setLocale(self, locale):
+    def set_locale(self, locale):
         # test if provided locale is valid
         if locale is None or type(locale) is not str:
             raise Exception('Wrong locale supplied')
diff --git a/gpapi/googleplay.py b/gpapi/googleplay.py
index 5dbc960..3cba6dc 100644
--- a/gpapi/googleplay.py
+++ b/gpapi/googleplay.py
@@ -53,7 +53,13 @@ def __init__(self, locale, timezone, debug=False, device_codename='bacon',
         self.debug = debug
         self.proxies_config = proxies_config
         self.deviceBuilder = config.DeviceBuilder(device_codename)
-        self.deviceBuilder.setLocale(locale)
+        self.set_locale(locale)
+        self.set_timezone(timezone)
+
+    def set_locale(self, locale):
+        self.deviceBuilder.set_locale(locale)
+
+    def set_timezone(self, timezone):
         self.deviceBuilder.set_timezone(timezone)
 
     def encrypt_password(self, login, passwd):
diff --git a/test.py b/test.py
index 2cfcb8d..109cadd 100644
--- a/test.py
+++ b/test.py
@@ -9,7 +9,7 @@
 
 args = ap.parse_args()
 
-server = GooglePlayAPI(debug=True, locale='it_IT', timezone='Europe/Rome')
+server = GooglePlayAPI('it_IT', 'Europe/Rome', debug=True)
 
 # LOGIN
 
@@ -19,7 +19,7 @@
 authSubToken = server.authSubToken
 
 print('\nNow trying secondary login with ac2dm token and gsfId saved\n')
-server = GooglePlayAPI(debug=True, locale='it_IT', timezone='Europe/Rome')
+server = GooglePlayAPI('it_IT', 'Europe/Rome', debug=True)
 server.login(None, None, gsfId, authSubToken)
 
 # SEARCH