fixed the names of several variables to match naming conventions