Rename some struct members for consistency