fixed errors after renaming util classes