ensure this sticks
rename a bunch of utils (shorter names)