Final (hopefully) package rename fix