cpp_v2 - lib: little renaming