Add resource name; some renames