Change names to make them less opaque