Rename some ids to avoid clashes with API members.