Rename functions, remove redundant function