Use more consistent naming of variables and functions