Removed and renamed the components for bms.