unify the layout file naming