update for changes to util class names