removed inconsistencies in class/attribute names