Rename study-related fields and methods.
Record which block of trials we're in and randomize trial order.