naming improvements

and test_overloads.cpp has started working