Updating headers filenames

Headers files have been change to fit a C++ declaration