Improved Cpp header file name