Rename resources to be more standardized