BS-10411 last part of the refactor api name