Move hbp vocabulary into consistent place