Rename extras to be easier to understand, remove componenttype, check class names