Change name of utils to be more generic