Update names based on latest version of the v3 pep