Fixes a mess with package names