Rename replication remote fields for consistency