make variable names consistent