     params ?= []
     queries = render rawQueries ? queries, view
     if split
-      @emit 'splitting', queries, view
+      @emit 'splitStart', queries, view
       queries = new Splitter(@splitter).split queries
-      @emit 'split-complete', queries, view
+      @emit 'splitFinish', queries, view
     result = null
     count = queries.length
     time 'Total Execution Time', =>
-      @emit 'executing-queries', queries, view
+      @emit 'stepStart', queries, view
       for i, query of queries
         i = parseInt(i)
         counter = i
         console.log "\nNow executing #{counter+1} of #{count}"
         console.log "\n#{query}\n".green
-        @emit 'executing-query', i, query
+        @emit 'queryStart', i, query
         if cb?
           @client.query(query, params, cb)
         else
           if @time
             result = time 'Execution Time', =>
               @client.query.sync(@client, query, params)
-        @emit 'executed-query', i, query
+        @emit 'queryFinish', i, query
         console.log()
-      @emit 'executed-queries', queries, view
+      @emit 'stepFinish', queries, view
       console.log()
     result

          console.log "Retries remaining: #{opts.times}".red.bold
          Sync.sleep(opts.wait)
          opts.times -= 1
          @emit 'retrying', opts
        else
          throw e

    # Out of lives, time to give up...
    console.error "Out of lives... I give up.".red.underline
    if opts.silent
      @silentErrors = true
      console.error e.message.red.underline

    opts.times ?= 10
    opts.silent ?= false
    error = null
    @emit 'retryLoopStart', opts
    while opts.times > 0
      @emit 'retry', opts
      try
        result = cb()
        @emit 'retryLoopFinish', opts, result
        result
      catch e
        error = e
        console.trace e
