VID-1841 Make sure cat names use underscores

str_replace might be faster