Fixed up some miss-named packages