diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/MediaInfo.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/MediaInfo.kt
index 2fc47e0d2c..3dede8e929 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/MediaInfo.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/MediaInfo.kt
@@ -29,7 +29,7 @@ data class MediaInfo(
 ) : Parcelable
 
 fun anImageInfo(): MediaInfo = MediaInfo(
-    "an image file.jpg", MimeTypes.Jpeg, "4MB","jpg"
+    "an image file.jpg", MimeTypes.Jpeg, "4MB", "jpg"
 )
 
 fun aVideoInfo(): MediaInfo = MediaInfo(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
index 97bbf925bd..8391704701 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
@@ -324,7 +324,7 @@ class MessageComposerPresenterTest {
             Result.success(
                 MediaUploadInfo.Image(
                     file = File("/some/path"),
-                    info = ImageInfo(
+                    imageInfo = ImageInfo(
                         width = null,
                         height = null,
                         mimetype = null,
@@ -357,7 +357,7 @@ class MessageComposerPresenterTest {
             Result.success(
                 MediaUploadInfo.Video(
                     file = File("/some/path"),
-                    info = VideoInfo(
+                    videoInfo = VideoInfo(
                         width = null,
                         height = null,
                         mimetype = null,
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt
index df80f40e9b..20d253f3fb 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt
@@ -605,7 +605,7 @@ class RoomDetailsEditPresenterTest {
             Result.success(
                 MediaUploadInfo.AnyFile(
                     file = processedFile,
-                    info = mockk(),
+                    fileInfo = mockk(),
                 )
             )
         )
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
index 6dab564b6e..cfa59d65d3 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
@@ -46,36 +46,43 @@ class MediaSender @Inject constructor(
     }
 
     private suspend fun MatrixRoom.sendMedia(
-        info: MediaUploadInfo,
+        uploadInfo: MediaUploadInfo,
         progressCallback: ProgressCallback?
     ): Result<Unit> {
-        return when (info) {
+        return when (uploadInfo) {
             is MediaUploadInfo.Image -> {
                 sendImage(
-                    file = info.file,
-                    thumbnailFile = info.thumbnailFile,
-                    imageInfo = info.info,
+                    file = uploadInfo.file,
+                    thumbnailFile = uploadInfo.thumbnailFile,
+                    imageInfo = uploadInfo.imageInfo,
                     progressCallback = progressCallback
                 )
             }
 
             is MediaUploadInfo.Video -> {
                 sendVideo(
-                    file = info.file,
-                    thumbnailFile = info.thumbnailFile,
-                    videoInfo = info.info,
+                    file = uploadInfo.file,
+                    thumbnailFile = uploadInfo.thumbnailFile,
+                    videoInfo = uploadInfo.videoInfo,
+                    progressCallback = progressCallback
+                )
+            }
+            is MediaUploadInfo.Audio -> {
+                sendAudio(
+                    file = uploadInfo.file,
+                    audioInfo = uploadInfo.audioInfo,
                     progressCallback = progressCallback
                 )
             }
 
             is MediaUploadInfo.AnyFile -> {
                 sendFile(
-                    file = info.file,
-                    fileInfo = info.info,
+                    file = uploadInfo.file,
+                    fileInfo = uploadInfo.fileInfo,
                     progressCallback = progressCallback
                 )
             }
-            else -> Result.failure(IllegalStateException("Unexpected MediaUploadInfo format: $info"))
+            else -> Result.failure(IllegalStateException("Unexpected MediaUploadInfo format: $uploadInfo"))
         }
     }
 }
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
index 5da3d36c44..51f6372b23 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
@@ -26,8 +26,8 @@ sealed interface MediaUploadInfo {
 
     val file: File
 
-    data class Image(override val file: File, val info: ImageInfo, val thumbnailFile: File) : MediaUploadInfo
-    data class Video(override val file: File, val info: VideoInfo, val thumbnailFile: File) : MediaUploadInfo
-    data class Audio(override val file: File, val info: AudioInfo) : MediaUploadInfo
-    data class AnyFile(override val file: File, val info: FileInfo) : MediaUploadInfo
+    data class Image(override val file: File, val imageInfo: ImageInfo, val thumbnailFile: File) : MediaUploadInfo
+    data class Video(override val file: File, val videoInfo: VideoInfo, val thumbnailFile: File) : MediaUploadInfo
+    data class Audio(override val file: File, val audioInfo: AudioInfo) : MediaUploadInfo
+    data class AnyFile(override val file: File, val fileInfo: FileInfo) : MediaUploadInfo
 }
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
index f0cf6b9dcb..8ff40fae39 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt
@@ -133,7 +133,7 @@ class AndroidMediaPreProcessor @Inject constructor(
             removeSensitiveImageMetadata(compressionResult.file)
             return MediaUploadInfo.Image(
                 file = compressionResult.file,
-                info = imageInfo,
+                imageInfo = imageInfo,
                 thumbnailFile = thumbnailResult.file
             )
         }
@@ -156,7 +156,7 @@ class AndroidMediaPreProcessor @Inject constructor(
             removeSensitiveImageMetadata(file)
             return MediaUploadInfo.Image(
                 file = file,
-                info = imageInfo,
+                imageInfo = imageInfo,
                 thumbnailFile = thumbnailResult.file
             )
         }
@@ -184,7 +184,7 @@ class AndroidMediaPreProcessor @Inject constructor(
         val videoInfo = extractVideoMetadata(resultFile, mimeType, thumbnailInfo)
         return MediaUploadInfo.Video(
             file = resultFile,
-            info = videoInfo,
+            videoInfo = videoInfo,
             thumbnailFile = thumbnailInfo.file
         )
     }