Changed variable names to meet convension