Finished fixing SRG method and field names