Correct package names and cleanup script