VID-1841 Make sure cat names use underscores

Right you are. That would be faster.