SOC-3831 | Wrong labels since spec update