Rename hyp -> Hyp