Add import with headers.
Name modification to be more accurate with its interface.