Merge pull request #940 from public/use-the-map-from-the-rfc

This one curve is still named wrong