 // Globals, constants and typedefs
 //---------------------------------------------------------------------
 
-static const int        NUM_WARPS       = 2;
+static const int        MAX_WARPS       = 2;
 
 
 bool                    g_verbose       = false;

    int             logical_warp_items,
    ScanOpT         scan_op,
    T               initial_value,
    T               warp_aggregates[NUM_WARPS])
{
    for (int w = 0; w < NUM_WARPS; ++w)
    {
        int base_idx = (w * logical_warp_items);
        int i = base_idx;

    fflush(stdout);

    // Run aggregate/prefix kernel
    WarpScanKernel<LOGICAL_WARP_THREADS, TEST_MODE><<<1, LOGICAL_WARP_THREADS * TOTAL_WARPS>>>(
        d_in,
        d_out,
        d_aggregate,
