Fixed naming scheme for some variables