refactored res names.