Bug 481272 - attempting to fix "display" of data.

This commit is admittedly an "experiment", trying to put back one case
of using underscore, instead of hypen. Will require new data and
database. 

24 files changed