diff --git a/django_google_storage/storage.py b/django_google_storage/storage.py
index 248f624..eadd619 100644
--- a/django_google_storage/storage.py
+++ b/django_google_storage/storage.py
@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.core.files.storage import Storage
 from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
-from django.utils.encoding import force_unicode, smart_str
+from django.utils.encoding import force_text, smart_bytes
 
 from .format import SubdomainCallingFormat
 from .file import GSBotoStorageFile
@@ -126,10 +126,10 @@ def _normalize_name(self, name):
             raise SuspiciousOperation("Attempted access to '%s' denied." % name)
 
     def _encode_name(self, name):
-        return smart_str(name, encoding=self.file_name_charset)
+        return smart_bytes(name, encoding=self.file_name_charset)
 
     def _decode_name(self, name):
-        return force_unicode(name, encoding=self.file_name_charset)
+        return force_text(name, encoding=self.file_name_charset)
 
     def _open(self, name, mode='rb'):
         name = self._normalize_name(self._clean_name(name))
diff --git a/setup.py b/setup.py
index 95e7de0..3981821 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='django-google-storage-updated',
-    version='0.5.1',
+    version='0.5.2',
     packages=['django_google_storage', ],
     author='Maxim Smirnoff',
     author_email='smirnoffmg@gmail.com',