Rename some fields to be clearer