Name changes

Helpers were updates