rename utils and fix export