Rename some record members to match the renamed record