Make variable names consistent with other functions