Refactoring of utility class name.