LPS-37425 Fix layout's nameMap as well
LPS-37425 SF