Fixing the model name parsing on generate commands