Changed some references to old packages