Pickaxe and package rename fix