fix variable naming
rename and prune method names in Util