Renamed Simulation to Sim.
Naming improvements.