Refix stage/planned stage labels