C++ code cleanup
use NAME prototype and use NameStr macro to point to string representation