Rename functions to match others