Rename some variables, methods and classes related to Free Day search