fix some missing ebeam becos of naming