Fix against new naming