Began fixing the naming of variables to conform to coding conventions