fixed package names in old code