Fixing some files with the right package name