Reference and variable/parameter naming consistency