Refactoring names of resources for clarity