diff --git a/app/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt
index ddf7cdeae3..5271780118 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt
@@ -19,14 +19,14 @@ package im.vector.riotredesign.features.home.group
 import android.widget.ImageView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder
+import im.vector.riotredesign.core.epoxy.RiotEpoxyModel
 import im.vector.riotredesign.core.platform.CheckableFrameLayout
 import im.vector.riotredesign.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_group)
-abstract class GroupSummaryItem : EpoxyModelWithHolder<GroupSummaryItem.Holder>() {
+abstract class GroupSummaryItem : RiotEpoxyModel<GroupSummaryItem.Holder>() {
 
     @EpoxyAttribute lateinit var groupName: CharSequence
     @EpoxyAttribute var avatarUrl: String? = null
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
index ee990fffd3..656593b419 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
@@ -22,12 +22,12 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder
+import im.vector.riotredesign.core.epoxy.RiotEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_room_category)
-abstract class RoomCategoryItem : EpoxyModelWithHolder<RoomCategoryItem.Holder>() {
+abstract class RoomCategoryItem : RiotEpoxyModel<RoomCategoryItem.Holder>() {
 
     @EpoxyAttribute lateinit var title: CharSequence
     @EpoxyAttribute var expanded: Boolean = false
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
index 7f83c6aa3a..fbe9f4f4a6 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
@@ -20,15 +20,15 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder
+import im.vector.riotredesign.core.epoxy.RiotEpoxyModel
 import im.vector.riotredesign.core.platform.CheckableFrameLayout
 import im.vector.riotredesign.features.home.AvatarRenderer
 
 
 @EpoxyModelClass(layout = R.layout.item_room)
-abstract class RoomSummaryItem : EpoxyModelWithHolder<RoomSummaryItem.Holder>() {
+abstract class RoomSummaryItem : RiotEpoxyModel<RoomSummaryItem.Holder>() {
 
     @EpoxyAttribute lateinit var roomName: CharSequence
     @EpoxyAttribute var avatarUrl: String? = null