changed class names to signify new general nature