Updated var naming scheme in entity class to be more descriptive