Use consistent function names