I think that'd probably improve clarity.  I'll change up the terminology.