Changed old variable names

Changed old variable names to go along with new coding style.