Rename functions for better consistency