LPS-44769 Fix layout names