minor naming changes for clarity.