BS-7120, fix on tenant update with the same name