Renaming a few functions to be more clear