Change naming of functions for readability