Slight naming changes for clarity