I don't like the current names or the new proposed names.  I'm not even sure this code belongs at this level.  I plan on diving into your code today and possibly creating my own branch of your branch to experiment with architecture.