resource api renaming/cleanup