Remove need for header clients to pluralize.
Update machine headers on add/remove.