Merge "Rename three header files to free namespace for api."