layout xmls naming changed