Replace XXXExtension by XXXComponent in some classes