Fix a couple of wrongly named package