diff --git a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
similarity index 70%
rename from src/com/owncloud/android/lib/refactor/OwnCloudContext.java
rename to src/com/owncloud/android/lib/refactor/OCContext.java
index 7259b861..9602f588 100644
--- a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
+++ b/src/com/owncloud/android/lib/refactor/OCContext.java
@@ -2,11 +2,11 @@ package com.owncloud.android.lib.refactor;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 
-public class OwnCloudContext {
-    private static final String TAG = OwnCloudContext.class.toString();
+public class OCContext {
+    private static final String TAG = OCContext.class.toString();
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
     public static final String STATUS_PATH = "/status.php";
@@ -18,13 +18,13 @@ public class OwnCloudContext {
     private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
 
-    private OwnCloudCredentials mCredentials = null;
+    private OCCredentials mCredentials = null;
     private Uri mBaseUri;
 
     public class Builder {
-        OwnCloudContext ocContext = new OwnCloudContext();
+        OCContext ocContext = new OCContext();
 
-        public Builder setCredentials(OwnCloudCredentials credentials) {
+        public Builder setCredentials(OCCredentials credentials) {
             ocContext.mCredentials = credentials;
             return this;
         }
@@ -34,13 +34,13 @@ public class OwnCloudContext {
             return this;
         }
 
-        public OwnCloudContext build() {
+        public OCContext build() {
             return ocContext;
         }
     }
 
 
-    public OwnCloudCredentials getCredentials() {
+    public OCCredentials getCredentials() {
         return mCredentials;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 3fdbac5c..50c23a06 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,17 +1,15 @@
 package com.owncloud.android.lib.refactor;
 
-import com.owncloud.android.lib.refactor.RemoteOperation;
-
 import java.util.Map;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
 public abstract class RemoteOperation {
-    private final OwnCloudContext mContext;
+    private final OCContext mContext;
     private static OkHttpClient httpClient = null;
 
-    protected RemoteOperation(OwnCloudContext context) {
+    protected RemoteOperation(OCContext context) {
         mContext = context;
 
         if(httpClient == null) {
@@ -23,7 +21,7 @@ public abstract class RemoteOperation {
 
     public abstract RemoteOperationResult exec();
 
-    public OwnCloudContext getOCContext() {
+    public OCContext getOCContext() {
         return mContext;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
index e0550ec8..e4411b76 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public interface OwnCloudCredentials {
+public interface OCCredentials {
 
     Map<String, String> getCredentialHeaders();
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
similarity index 75%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
index 28ef3cce..990415ba 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
@@ -1,11 +1,11 @@
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import java.util.HashMap;
 import java.util.Map;
-public class OwnCloudAnonymousCredentials implements OwnCloudCredentials {
+public class OCAnonymousCredentials implements OCCredentials {
 
     @Override
     public Map<String, String> getCredentialHeaders() {
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
similarity index 89%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
index a6813da0..ea00d184 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
@@ -23,20 +23,19 @@
  */
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import okhttp3.Authenticator;
 import okhttp3.Credentials;
 
-public class OwnCloudBasicCredentials implements OwnCloudCredentials {
+public class OCBasicCredentials implements OCCredentials {
 
     private String mUsername;
     private String mPassword;
 
-    public OwnCloudBasicCredentials(String username, String password) {
+    public OCBasicCredentials(String username, String password) {
         mUsername = username != null ? username : "";
         mPassword = password != null ? password : "";
     }
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
similarity index 89%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
index 2b7b4fe8..bd427738 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
@@ -25,20 +25,18 @@ package com.owncloud.android.lib.refactor.authentication.credentials;
 
 
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import okhttp3.Authenticator;
-
-public class OwnCloudBearerCredentials implements OwnCloudCredentials {
+public class OCBearerCredentials implements OCCredentials {
 
     private String mUsername;
 
     private String mAccessToken;
 
-    public OwnCloudBearerCredentials(String username, String accessToken) {
+    public OCBearerCredentials(String username, String accessToken) {
         mUsername = username != null ? username : "";
         mAccessToken = accessToken != null ? accessToken : "";
     }
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
similarity index 90%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
index 5bd8e3a8..47ca012a 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
@@ -25,22 +25,20 @@ package com.owncloud.android.lib.refactor.authentication.credentials;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import org.apache.commons.httpclient.Cookie;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
+public class OCSamlSsoCredentials implements OCCredentials {
 
     private final String mUsername;
     private final String mSessionCookie;
     private final Uri mBaseUrl;
 
-    public OwnCloudSamlSsoCredentials(String username, String sessionCookie, Uri baseUrl) {
+    public OCSamlSsoCredentials(String username, String sessionCookie, Uri baseUrl) {
         mUsername = username != null ? username : "";
         mSessionCookie = sessionCookie != null ? sessionCookie : "";
         mBaseUrl = baseUrl;
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
index 34241c42..ec9c3a41 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
@@ -28,14 +28,14 @@ package com.owncloud.android.lib.refactor.authentication.oauth;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2GetAccessTokenOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2RefreshAccessTokenOperation;
 
 public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
 
-    private OwnCloudContext ocContext;
+    private OCContext ocContext;
     private OwnCloudOAuth2Provider mOAuth2Provider;
 
     private OAuthRequest mRequest;
@@ -67,7 +67,7 @@ public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
         mRefreshToken = refreshToken;
     }
 
-    public void setOcContext(OwnCloudContext ocContext) {
+    public void setOcContext(OCContext ocContext) {
         this.ocContext = ocContext;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index d2b66226..0256e232 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -28,7 +28,7 @@ package com.owncloud.android.lib.refactor.authentication.oauth.operations;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
@@ -59,7 +59,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
 
 
     public OAuth2GetAccessTokenOperation(
-            OwnCloudContext context,
+            OCContext context,
             String grantType,
             String code,
             String clientId,
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index f9e4595f..18a6fa78 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -21,12 +21,12 @@
 
 package com.owncloud.android.lib.refactor.authentication.oauth.operations;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.RemoteOperation;
-import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudBasicCredentials;
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
@@ -55,7 +55,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
     private final OAuth2ResponseParser mResponseParser;
 
     public OAuth2RefreshAccessTokenOperation(
-            OwnCloudContext ocContext,
+            OCContext ocContext,
             String clientId,
             String secretId,
             String refreshToken,
@@ -98,7 +98,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
                     .build();
 
 
-            OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(
+            OCCredentials oauthCredentials = new OCBasicCredentials(
                     mClientId,
                     mClientSecret
             );
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index c9395a88..b43d4c52 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -1,12 +1,12 @@
 package com.owncloud.android.lib.refactor.operations;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 
 public class PropfindOperation extends RemoteOperation {
 
-    public PropfindOperation(OwnCloudContext context) {
+    public PropfindOperation(OCContext context) {
         super(context);
     }