diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
index 8b45c9f570..134da4ce51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
@@ -33,8 +33,8 @@ internal class DefaultPermalinkService @Inject constructor(
         return permalinkFactory.createPermalink(id)
     }
 
-    override fun createRoomPermalink(roomId: String, via: List<String>?): String? {
-        return permalinkFactory.createRoomPermalink(roomId, via)
+    override fun createRoomPermalink(roomId: String, viaServers: List<String>?): String? {
+        return permalinkFactory.createRoomPermalink(roomId, viaServers)
     }
 
     override fun createPermalink(roomId: String, eventId: String): String {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
index 23ed2f68a3..639e45582a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
@@ -48,7 +48,7 @@ internal class PermalinkFactory @Inject constructor(
                 append(MATRIX_TO_URL_BASE)
                 append(escape(roomId))
                 append(
-                        via?.takeIf { it.isNotEmpty() }?.let { viaParameterFinder.computeViaParams(it) }
+                        via?.takeIf { it.isNotEmpty() }?.let { viaParameterFinder.asUrlViaParameters(it) }
                                 ?: viaParameterFinder.computeViaParams(userId, roomId)
                 )
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
index f00d2a9ef7..72fbfcced5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
@@ -39,11 +39,10 @@ internal class ViaParameterFinder @Inject constructor(
      * current user one.
      */
     fun computeViaParams(userId: String, roomId: String): String {
-        return computeViaParams(userId, roomId, 3)
-                .joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
+        return asUrlViaParameters(computeViaParams(userId, roomId, 3))
     }
 
-    fun computeViaParams(viaList: List<String>): String {
+    fun asUrlViaParameters(viaList: List<String>): String {
         return viaList.joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
     }