Rename: shorter function names