Renamed utility classes.