Use correct utility class replacements