diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/document/GiniCaptureDocument.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/document/GiniCaptureDocument.java
index 0d1ecdbe0..2856ba685 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/document/GiniCaptureDocument.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/document/GiniCaptureDocument.java
@@ -14,7 +14,7 @@
 import net.gini.android.capture.internal.util.DeviceHelper;
 import net.gini.android.capture.internal.util.UriReaderAsyncTask;
 import net.gini.android.capture.util.IntentHelper;
-import net.gini.android.capture.util.UploadMetadataBuilder;
+import net.gini.android.capture.util.UploadMetadata;
 
 import java.util.Arrays;
 import java.util.UUID;
@@ -223,7 +223,7 @@ public String getParcelableMemoryCacheTag() {
 
     @Override
     public String generateUploadMetadata(Context context) {
-        return UploadMetadataBuilder.INSTANCE
+        return UploadMetadata.INSTANCE
                 .setSource(mSource.getName())
                 .setDeviceType(DeviceHelper.getDeviceType(context))
                 .setDeviceOrientation(DeviceHelper.getDeviceOrientation(context))
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/UploadMetadata.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/UploadMetadata.kt
index 276444f1e..e62ffe76a 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/UploadMetadata.kt
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/util/UploadMetadata.kt
@@ -5,7 +5,7 @@ import net.gini.android.capture.BuildConfig
 import net.gini.android.capture.EntryPoint
 import net.gini.android.capture.GiniCapture
 
-internal object UploadMetadataBuilder {
+internal object UploadMetadata {
 
     private const val USER_COMMENT_PLATFORM = "Platform"
     private const val USER_COMMENT_OS_VERSION = "OSVer"
@@ -37,15 +37,15 @@ internal object UploadMetadataBuilder {
         return csvBuilder.toString()
     }
 
-    fun setDeviceOrientation(deviceOrientation: String): UploadMetadataBuilder =
+    fun setDeviceOrientation(deviceOrientation: String): UploadMetadata =
         this.also { it.deviceOrientation = deviceOrientation }
 
-    fun setDeviceType(deviceType: String): UploadMetadataBuilder =
+    fun setDeviceType(deviceType: String): UploadMetadata =
         this.also { it.deviceType = deviceType }
 
-    fun setSource(source: String): UploadMetadataBuilder = this.also { it.source = source }
+    fun setSource(source: String): UploadMetadata = this.also { it.source = source }
 
-    fun setImportMethod(importMethod: String): UploadMetadataBuilder = this.also { it.importMethod = importMethod }
+    fun setImportMethod(importMethod: String): UploadMetadata = this.also { it.importMethod = importMethod }
 
     fun build(): String {
         val metadataMap = mutableMapOf<String, String>()
@@ -81,4 +81,4 @@ internal object UploadMetadataBuilder {
             EntryPoint.FIELD -> "field"
             EntryPoint.BUTTON -> "button"
     }
-}
\ No newline at end of file
+}