More sane naming for C++ version