Fix some package names