Attached is a patch that does this, and some more, renaming. That was more work than I'd imagined. I've also made the internal naming in origin.c more consistent/simpler and did a bunch of other cleanup.
Hi,
It looks like bowerbird is not too happy with this, neither is my build environment.