rename headers; clarify ohai 6 options