Minor naming changes for easier understanding.