Fix for underscores in model names