Removed "Base"-prefix from BaseComponentBuilder