Add names to the header file since they help in documenting the API
(and for consistency).