Nvm, the `OLDSTYLE_NEWSTYLEMAP` takes care of the mapping. I don't like the renaming though, let's discuss that.