Fixed SubComponent naming bug