Make names of stages consistent