Fix up after package rename