rename functions consistently