Rename some uses of 'origin' to 'boundary'