Fixed a bug with the model name and underscored models