Name changes

Changed "spaces" to "location"
and
Changed "row number" to "space"