Updated class member naming scheme