Fix name collisions in previous.

Now start and thenStart, restart and thenRestart.