fix & rename salt-model generator

Change-Id: I91287f07e05537d888292609ad103ff396724093
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 60cfb14..a943b3b 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -2,11 +2,11 @@
   jenkins:
     client:
       job_template:
-        generate_reclass_clusters:
-          name: generate_reclass_cluster_{{cookiecutter_template}}
+        generate-salt-model:
+          name: generate-salt-model-{{cookiecutter_template}}
           param:
             cookiecutter_template:
-            - separated_products
+            - separated-products
           template:
             type: workflow-scm
             concurrent: true
@@ -48,7 +48,7 @@
                 type: string
               RECLASS_MODEL_URL:
                 type: string
-                default: "jenkins-mk@${_param:jenkins_gerrit_url}/salt-models/training.git"
+                default: "${_param:jenkins_gerrit_url}/salt-models/training.git"
               RECLASS_MODEL_CREDENTIALS:
                 type: string
                 default: gerrit