Renamed extension classes in util