Change names to be more meaningful