Rename utils method names; plus other changes