Feature/hyp attribute names