Fix silly mistakes (regex replaced names were wrong)