changes to types to avoid problems with reusing record field names