More consistency for import type names
Be more flexible about PHAF header lines