Changes function names to be more simulare