Refactored irms_ field names