Fix package names/paths