Finalized name change from helpers to util