Some variable name changes. Ad nr of rooms to search