I'm in favor of this, but I'm still looking for the right word... It will be easy to update in the new branch once we find it.