Changed a bunch of function names to be shorter but still descriptive