Renamed some functions to be more consistent and/or shorter