added "Room" postfix to the location names that didn't sound like rooms.