Refactor according to helper renaming
Update CHANGELOG