Renaming the file and correcting the package names