Change names for clarity