Fix up some naming silliness.
Fix up some naming silliness.

--HG--
extra : convert_revision : d3784d187ac1aa9a54a054eff7eb37bc9b40c87a

iu-parfunc/criterion,osa1/criterion,bgamari/criterion,rrnewton/criterion,bos/criterion,iu-parfunc/criterion,bos/criterion,rrnewton/criterion,bgamari/criterion,paulolieuthier/criterion,rrnewton/criterion,bgamari/criterion,osa1/criterion,bos/criterion,iu-parfunc/criterion,paulolieuthier/criterion,paulolieuthier/criterion