Fixed a few remapped names