Fix parsed name mapper to not use rank enums