rename a few fields for clarity