Fixed spatial data naming