Make the variable names more consistent