Rename C++ header files.

Fixes #6291