Changed namingt convention of class members