Change helper names to match helpers