added two new rooms and renamed old rooms