Rename functions for consistency