clean up some missed stuff for 1.7 naming in block-data-manager.  Much
work on creating a stand-alone template converter for moving from
old->new versions