Refactored xml layout file names