refactored layout/xml naming accordingly