Rename and refactor resources