clean up naming conventions a little
refactor to fix and clarify dispatch to consumer
v0.3.1