CBOS-31 Refactor method names