SCORE-133. Reflect class name changes from EXP-298.

issue: https://jira.kiji.org/browse/SCORE-133
review: https://review.kiji.org/r/1378