TEZ-1237. Consolidate naming of API classes (bikas)