Renaming element variables for naming consistency