Redid database, renamed packages etc