Keep variable names consistent