piggy: fixing imports after the rename.