Another package rename to ensure maven is consistent