Fixed variable names according to correct coding conventions