Changed variable names to meet naming standards