Bug 1085384 - Use page.upperCase instead of layout.upperCase as the structure has been moved to page during normalization.