Merge "Rename files for RecordedTransaction"