Some more fixes on package names