Rename
Bring the hpoterm extractor to the new order