updated strings
updated class members names