LPS-37495 Use the renamed method
LPS-37425 Fix layout's nameMap as well
LPS-37425 SF