VID-1841 Make sure cat names use underscores

Btw. I'm very glad that you are thinking of pros and cons of different solutions vs. just choosing the first one / whatever works.