Refactor layout names