Adjusting group-ids and package names