Rename functions for closer to consistency