Updated RoomBuilder xml, to have more consistant element names for all
objects.