updated class member naming convention