LP-190 : Align variable names with class names

LP-190 : Align variable names with class names