Renames function helpers and adjusts code and examples to reflect