Fix name of functions to something more descriptive