Rename some fields for better overall backwards compatibility