Refactor Layout name