Renamed packages according to control-integration.