Switching to a non-X header per rfc6648

plus removing rand in the spec per feedback from @henrikhodne.