BS-8235
Fix issue when bo named is changed