Fixing the plural conversion of model name.