cciss: use consistent variable names