+ Modified spatial location class names