Various renaming, fixed wrong time in record data