Made variable names more consistent