Changed room names and layout