diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt
index 90ed459d..22e792ad 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt
@@ -64,9 +64,9 @@ data class CapabilityResponse(
         filesSharingPublicExpireDateEnforced = CapabilityBooleanType.fromBooleanValue(
             capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced ?: false
         ),
-        filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.bigfilechunking),
-        filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.undelete),
-        filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.versioning),
+        filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.bigfilechunking),
+        filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.undelete),
+        filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.versioning),
         filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming),
         filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing)
     )
@@ -79,7 +79,7 @@ data class Capabilities(
     @Json(name = "files_sharing")
     val fileSharingCapabilities: FileSharingCapabilities,
     @Json(name = "files")
-    val filesCapabilities: FilesCapabilities
+    val fileCapabilities: FileCapabilities
 )
 
 @JsonClass(generateAdapter = true)
@@ -145,7 +145,7 @@ data class FileSharingFederation(
 )
 
 @JsonClass(generateAdapter = true)
-data class FilesCapabilities(
+data class FileCapabilities(
     val bigfilechunking: Boolean,
     val undelete: Boolean,
     val versioning: Boolean
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt
index d3af0df2..256e03b6 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt
@@ -56,7 +56,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() {
         var result: RemoteOperationResult<RemoteCapability>
 
         try {
-            val uriBuilder = client.baseUri.buildUpon().run {
+            val uriBuilder = client.baseUri.buildUpon().apply {
                 appendEncodedPath(OCS_ROUTE)    // avoid starting "/" in this method
                 appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT)
             }
@@ -79,7 +79,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() {
                 result = RemoteOperationResult(OK)
                 result.data = commonResponse?.ocs?.data?.toRemoteCapability()
 
-                Timber.d("*** Get Capabilities completed and parsed to ${result.data}")
+                Timber.d("Get Capabilities completed and parsed to ${result.data}")
             } else {
                 result = RemoteOperationResult(getMethod)
                 Timber.e("Failed response while getting capabilities from the server status code: $status; response message: $response")
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt
index d370b449..7ea63c69 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt
@@ -65,7 +65,7 @@ class GetRemoteUserInfoOperation : RemoteOperation<RemoteUserInfo>() {
                 result = RemoteOperationResult(ResultCode.OK)
                 result.data = commonResponse?.ocs?.data?.toRemoteUserInfo()
 
-                Timber.d("*** Get User Info completed and parsed to ${result.data}")
+                Timber.d("Get User Info completed and parsed to ${result.data}")
 
             } else {
                 result = RemoteOperationResult(getMethod)