Revert "Revert "Reverts change from templateName to layoutName""

This reverts commit 4d0d7105fd41f7f15e836627ba8fd761724cd205.