This most likely has to do with the names that you have. Google tries to guess what groups to put things in based on their names and it will, indeed, group things from different rooms together which you may not want grouped together. About all you can do is re-name some of the devices so Google no longer groups them. Or use a nickname which can be distinctive for the exact devices that you want.