Changed Nbody, Npair #defines