Fix for "underscore" support in model names