Changing confusing function names