Change package names to be real packages