Renaming several classes following recent design discussion.