Change names to make more sense