Fix utility class names