updates structure and class names