BPP-10655 Code refactoring, bug renaming