Rename account resources for consistency