rename utils for consistency
makefile fixes for renamed utils