Change names to be more self-documenting