Fix package names and paths.