Make variable names more consistent