Changed variable names to fit the naming convention