Renamed some functions in Simulation