#1 changes in class names, fixes