Util class name fix