Renamed identifiers to work with the new version.