rename activity block and increment function
rename activity block and increment function

Make these two variables more descriptive, and make room for use of the
activity name for a different purpose.

Signed-off-by: Jacob Keller <74ec1f46a68d238888726a00aa611ba6343172e2@gmail.com>

rdancer/cbc-kitten-scientists,oliversalzburg/cbc-kitten-scientists,oliversalzburg/cbc-kitten-scientists,oliversalzburg/cbc-kitten-scientists,cameroncondry/cbc-kitten-scientists