Follow naming convention changes
Match changes for naming conventions
Merge branch 'layout-xml-updates-for-skin-assets'