diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt
index b9aba45123..b4014b1b97 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt
@@ -21,8 +21,8 @@ import im.vector.matrix.android.api.session.events.model.Content
 import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
 
 // Possible values for optionType
-const val OPTION_TYPE_POLL = "m.pool"
-const val OPTION_TYPE_BUTTONS = "m.buttons"
+const val OPTION_TYPE_POLL = "org.matrix.pool"
+const val OPTION_TYPE_BUTTONS = "org.matrix.buttons"
 
 /**
  * Polls and bot buttons are m.room.message events with a msgtype of m.options,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
index d75cd7f8dc..c244500c9e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
@@ -25,9 +25,9 @@ object MessageType {
     const val MSGTYPE_VIDEO = "m.video"
     const val MSGTYPE_LOCATION = "m.location"
     const val MSGTYPE_FILE = "m.file"
-    const val MSGTYPE_OPTIONS = "m.options"
-    const val MSGTYPE_RESPONSE = "m.response"
-    const val MSGTYPE_POLL_CLOSED = "m.poll_closed"
+    const val MSGTYPE_OPTIONS = "org.matrix.options"
+    const val MSGTYPE_RESPONSE = "org.matrix.response"
+    const val MSGTYPE_POLL_CLOSED = "org.matrix.poll_closed"
     const val MSGTYPE_VERIFICATION_REQUEST = "m.key.verification.request"
     // Add, in local, a fake message type in order to StickerMessage can inherit Message class
     // Because sticker isn't a message type but a event type without msgtype field