Room Feature made confusion in the application

After the Room Feature Update, I have renamed the devices to the specific device name(eg. Geyser), Earlier the device name was named as My Room Geyser.

So, I have created a Room as My Room, renamed My Room Geyser as Geyser, and added in My Room. Now when I try to create a Scene NO devices are shown under MY ROOM instead only Geyser is shown in the app.

Please add categories on the basis of Room Feature in Scene.

In Scene, All the devices are shown whether they are added in room or not.
Will consider your feedback

Tinxy

Please refer to the screenshot. I do not have any geyser in mandir. The devices are not aligned correctly with respect to the rooms.
Screenshot_20220201-104038_Tinxy

Scenes does not integrate with Rooms right now.