Make variable names consistent