Resource refactoring, beginning ...
Resource refactoring, more...
Resource renaming.