Change some names according to ERMI paper