[impl] names refactoring, new test