improved naming of rooms