fix naming of functions for return_url to work