NBodySimulator is now Simulator