Introduce proper stage naming