Change to the new naming scheme
Minor tweak to the bandwidth control
Merge pull request #221 from bstell/master

Change to the new naming scheme