Minor naming changes in response to feedback.