Normalize field names with service prefix