- Renamed the extended version to be the one that we use.