Refactor func names for consistency's sake