Rename *SpriteBatch fields to *Batch

Closes #2331