fix names for attributes (buttonName -> name)
fix strEnum (add "class object")