jhm/naming: Update for move to <util/>
Merge pull request #112 from cmaloney/fix-build

jhm/naming: Update for move to <util/>