Fixed compile errors after package rename