Normalize headers
Tweak description
Drop reference to old name