diff --git a/APPL/API2/api2_dispatch.inc b/APPL/API2/api2_dispatch.inc
index 4526c4c373..4bc0ecea86 100644
--- a/APPL/API2/api2_dispatch.inc
+++ b/APPL/API2/api2_dispatch.inc
@@ -23,7 +23,7 @@ var api2_mapper = {
     "orderproperties"         : { "filename": "appl/mgt/bes_kenmerkbestel.asp" },
     "orderarticlegroups"      : { "filename": "appl/mgt/bes_srtgroep.asp" },
     "orderpropertytypes"      : { "filename": "appl/mgt/bes_srtkenmerk.asp" },
-    "orderproductgroups"      : { "filename": "appl/mgt/bes_srtprodgroep.asp" },
+    "orderproductgroups"      : { "filename": "appl/mgt/bes_srtprodgroep.asp", "lcl_name": "bes_srtgroep_m" },
     "orderpacelisttables"     : { "filename": "appl/mgt/bes_staffeltabel.asp" },
     "visitoractions"          : { "filename": "appl/mgt/bez_actie.asp" },
     "visitorproperties"       : { "filename": "appl/mgt/bez_kenmerk.asp" },
@@ -48,11 +48,11 @@ var api2_mapper = {
     "authorizations"          : { "filename": "appl/mgt/fac_groeprechten.asp" },
     "identityproviders"       : { "filename": "appl/mgt/fac_idp.asp" },
     "importfunctions"         : { "filename": "appl/mgt/fac_import_app.asp" },
-    "notificationjobs"        : { "filename": "appl/mgt/fac_notificatiejob.asp" },
+    "notificationjobs"        : { "filename": "appl/mgt/fac_notificatie_job.asp" },
     "profiles"                : { "filename": "appl/mgt/fac_profiel.asp" },
     "profilevalues"           : { "filename": "appl/mgt/fac_profielwaarde.asp" },
     "notificationtypes"       : { "filename": "appl/mgt/fac_srtnotificatie.asp" },
-    "customgraphs"            : { "filename": "appl/mgt/fac_usergraph.asp" },
+    "customgraphs"            : { "filename": "appl/mgt/fac_usrgraph.asp" },
     "customtables"            : { "filename": "appl/mgt/fac_usrtab.asp" },
     "widgets"                 : { "filename": "appl/mgt/fac_widget.asp" },
     "knowledgeproperties"     : { "filename": "appl/mgt/faq_kenmerk.asp" },
@@ -76,7 +76,7 @@ var api2_mapper = {
     "callsources"             : { "filename": "appl/mgt/mld_meldbron.asp" },
     "disciplinetypes"         : { "filename": "appl/mgt/mld_srtdiscipline.asp" },
     "issuepropertytypes"      : { "filename": "appl/mgt/mld_srtkenmerk.asp" },
-    "callgroups"              : { "filename": "appl/mgt/mld_stdmelding_groep.asp" },
+    "callgroups"              : { "filename": "appl/mgt/mld_stdmeldinggroep.asp" },
     "issueordertypes"         : { "filename": "appl/mgt/mld_typeopdr.asp" },
     "daysoff"                 : { "filename": "appl/mgt/mld_vrije_dagen.asp" },
     "workflows"               : { "filename": "appl/mgt/mld_workflow.asp" },
@@ -105,7 +105,8 @@ var api2_mapper = {
     "bookingpropertytypes"    : { "filename": "appl/mgt/res_srtkenmerk.asp" },
 
     "generictables"           : { "filename": "appl/mgt/mgt_generic.asp", "hidden": true },
-    "systemtables"            : { "filename": "appl/mgt/user_tables.asp", "hidden": true }
+    "systemtables"            : { "filename": "appl/mgt/user_tables.asp", "hidden": true },
+    "workflowexpressions"     : { "filename": "appl/mgt/mld_workflow_expression.asp", "hidden": true }  // dit is geen model
 }
 
 function api2_dispatch(api2_name)
diff --git a/APPL/API2/model_alg_kenmerk.inc b/APPL/API2/model_alg_kenmerk.inc
index 5a6720c41b..402573b747 100644
--- a/APPL/API2/model_alg_kenmerk.inc
+++ b/APPL/API2/model_alg_kenmerk.inc
@@ -22,8 +22,12 @@ function model_alg_kenmerk(niveau)
     this.primary = "alg_kenmerk_key";
     this.soft_delete = "alg_kenmerk_verwijder";
     this.autfunction = "WEB_PRSSYS";
-    this.record_title = L("mgt_kenmerk") + " " + get_real_estate_name(niveau);
-    this.records_title = L("mgt_kenmerk_m") + " " + get_real_estate_name(niveau);;
+    this.record_title = L("alg_kenmerk");
+    this.records_title = L("alg_kenmerk_m");
+
+    // overrule titel voor schermen.
+    this.record_title = L("mgt_kenmerk")    + " " + get_real_estate_name(niveau);
+    this.records_title = L("mgt_kenmerk_m") + " " + get_real_estate_name(niveau);
 
 
     this.fields = {
diff --git a/APPL/API2/model_bes_srtkenmerk.inc b/APPL/API2/model_bes_srtkenmerk.inc
index bde4b8d1ae..82047be309 100644
--- a/APPL/API2/model_bes_srtkenmerk.inc
+++ b/APPL/API2/model_bes_srtkenmerk.inc
@@ -21,8 +21,8 @@ function model_bes_srtkenmerk()
     this.primary = "bes_srtkenmerk_key";
     this.soft_delete = "bes_srtkenmerk_verwijder";
     this.autfunction = "WEB_BESMGT";
-    this.record_title = L("mgt_srtkenmerk");
-    this.records_title = L("mgt_srtkenmerk_m");
+    this.record_title = L("bes_srtkenmerk");
+    this.records_title = L("bes_srtkenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_bez_kenmerk.inc b/APPL/API2/model_bez_kenmerk.inc
index 53a4674d2c..b82ecad0a3 100644
--- a/APPL/API2/model_bez_kenmerk.inc
+++ b/APPL/API2/model_bez_kenmerk.inc
@@ -21,8 +21,8 @@ function model_bez_kenmerk()
     this.primary = "bez_kenmerk_key";
     this.soft_delete = "bez_kenmerk_verwijder";
     this.autfunction = "WEB_PRSSYS";
-    this.record_title = L("mgt_kenmerk");
-    this.records_title = L("mgt_kenmerk_m");
+    this.record_title = L("bez_kenmerk");
+    this.records_title = L("bez_kenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_cnt_srtkenmerk.inc b/APPL/API2/model_cnt_srtkenmerk.inc
index 82fdcafc24..f1da6b8752 100644
--- a/APPL/API2/model_cnt_srtkenmerk.inc
+++ b/APPL/API2/model_cnt_srtkenmerk.inc
@@ -21,8 +21,8 @@ function model_cnt_srtkenmerk()
     this.primary = "cnt_srtkenmerk_key";
     this.soft_delete = "cnt_srtkenmerk_verwijder";
     this.autfunction = "WEB_CNTMGT";
-    this.record_title = L("mgt_srtkenmerk");
-    this.records_title = L("mgt_srtkenmerk_m");
+    this.record_title = L("cnt_srtkenmerk");
+    this.records_title = L("cnt_srtkenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_fac_notificatiejob.inc b/APPL/API2/model_fac_notificatie_job.inc
similarity index 93%
rename from APPL/API2/model_fac_notificatiejob.inc
rename to APPL/API2/model_fac_notificatie_job.inc
index a610307c06..c7948a1091 100644
--- a/APPL/API2/model_fac_notificatiejob.inc
+++ b/APPL/API2/model_fac_notificatie_job.inc
@@ -2,9 +2,9 @@
     $Revision$
     $Id$
 
-    File:           model_fac_notificatiejob.inc
+    File:           model_fac_notificatie_job.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor fac_notificatiejob
+    Description:    Vanuit CodeCharge gegenereerd model voor fac_notificatie_job
 
     Context:
 
@@ -13,7 +13,7 @@
 %>
 <%
 
-function model_fac_notificatiejob()
+function model_fac_notificatie_job()
 {
     this.records_name = "notificationjobs";
     this.record_name = "notificationjob";
diff --git a/APPL/API2/model_fac_usergraph.inc b/APPL/API2/model_fac_usergraph.inc
index 25c16bab17..e24fb41baa 100644
--- a/APPL/API2/model_fac_usergraph.inc
+++ b/APPL/API2/model_fac_usergraph.inc
@@ -2,9 +2,9 @@
     $Revision$
     $Id$
 
-    File:           model_fac_usergraph.inc
+    File:           model_fac_usrgraph.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor fac_usergraph
+    Description:    Vanuit CodeCharge gegenereerd model voor fac_usrgraph
 
     Context:
 
@@ -13,7 +13,7 @@
 %>
 <%
 
-function model_fac_usergraph()
+function model_fac_usrgraph()
 {
     this.records_name = "customgraphs";
     this.record_name = "customgraph";
diff --git a/APPL/API2/model_faq_kenmerk.inc b/APPL/API2/model_faq_kenmerk.inc
index 17449b373a..2174383a10 100644
--- a/APPL/API2/model_faq_kenmerk.inc
+++ b/APPL/API2/model_faq_kenmerk.inc
@@ -21,8 +21,8 @@ function model_faq_kenmerk()
     this.primary = "faq_kenmerk_key";
     this.soft_delete = "faq_kenmerk_verwijder";
     this.autfunction = "WEB_FAQMGT";
-    this.record_title = L("mgt_kenmerk");
-    this.records_title = L("mgt_kenmerk_m");
+    this.record_title = L("faq_kenmerk");
+    this.records_title = L("faq_kenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_fin_verkoopfactuur.inc b/APPL/API2/model_fin_verkoopfactuur.inc
index 5d56f310f2..10e6206609 100644
--- a/APPL/API2/model_fin_verkoopfactuur.inc
+++ b/APPL/API2/model_fin_verkoopfactuur.inc
@@ -20,8 +20,12 @@ function model_fin_verkoopfactuurregels()
     this.table = "fin_verkoopfactuur";
     this.primary = "fin_verkoopfactuur_key";
     this.autfunction = "WEB_VERFAC";
-    this.record_title = L("lcl_verkoopfactuurregel"),
-    this.records_title = L("lcl_verkoopfactuurregels");
+
+    this.record_title = L("fin_verkoopfactuur");
+    this.records_title = L("fin_verkoopfactuur_m");
+
+//    this.record_title = L("lcl_verkoopfactuurregel"),
+//    this.records_title = L("lcl_verkoopfactuurregels");
 
 
     this.fields = {
diff --git a/APPL/API2/model_ins_srtkenmerk.inc b/APPL/API2/model_ins_srtkenmerk.inc
index 4d6c463ebe..d08cb140aa 100644
--- a/APPL/API2/model_ins_srtkenmerk.inc
+++ b/APPL/API2/model_ins_srtkenmerk.inc
@@ -21,8 +21,8 @@ function model_ins_srtkenmerk()
     this.primary = "ins_srtkenmerk_key";
     this.soft_delete = "ins_srtkenmerk_verwijder";
     this.autfunction = "WEB_INSMGT";
-    this.record_title = L("mgt_srtkenmerk");
-    this.records_title = L("mgt_srtkenmerk_m");
+    this.record_title = L("ins_srtkenmerk");
+    this.records_title = L("ins_srtkenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_invoices.inc b/APPL/API2/model_invoices.inc
index 2b9447ec96..01bbeee0a6 100644
--- a/APPL/API2/model_invoices.inc
+++ b/APPL/API2/model_invoices.inc
@@ -54,7 +54,7 @@ function model_invoices(fin_key, params)
              "debiteur_nr"     : { dbs: "fin_factuur_debiteur_nr",  multiedit: true, typ: "varchar",                                track: true, label: L("lcl_fin_debtor_nr"),           filter: "like" },
              "costtype"        : { dbs: "prs_kostensoort_key",      multiedit: true, typ: "key",     foreign: "prs_kostensoort",    track: true, label: L("lcl_shared_charge_type"),      filter: "exact" },
              "contact"         : { dbs: "prs_perslid_key_user",     multiedit: true, typ: "key",     foreign: "prs_perslid",        track: true, label: L("lcl_mld_name"),                filter: "exact" },
-             "goedkeur"        : { dbs: "prs_perslid_key_goedkeur", typ: "key",     foreign: "prs_perslid",        track: true, label: L("lcl_fin_goedkeurder"),         filter: "exact" },
+             "validater"       : { dbs: "prs_perslid_key_goedkeur", typ: "key",     foreign: "prs_perslid",        track: true, label: L("lcl_fin_goedkeurder"),         filter: "exact" },
              "remark"          : { dbs: "fin_factuur_opmerking",    typ: "varchar",                                track: true, label: L("lcl_fin_remark"),              filter: "like" }
             };
     this.includes =
diff --git a/APPL/API2/model_mld_srtkenmerk.inc b/APPL/API2/model_mld_srtkenmerk.inc
index 108b7d4b5b..341b25f6f0 100644
--- a/APPL/API2/model_mld_srtkenmerk.inc
+++ b/APPL/API2/model_mld_srtkenmerk.inc
@@ -21,8 +21,8 @@ function model_mld_srtkenmerk()
     this.primary = "mld_srtkenmerk_key";
     this.soft_delete  = "mld_srtkenmerk_verwijder";
     this.autfunction = "WEB_MLDMGT";
-    this.record_title = L("mgt_srtkenmerk");
-    this.records_title = L("mgt_srtkenmerk_m");
+    this.record_title = L("mld_srtkenmerk");
+    this.records_title = L("mld_srtkenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_mld_stdmelding_groep.inc b/APPL/API2/model_mld_stdmeldinggroep.inc
similarity index 89%
rename from APPL/API2/model_mld_stdmelding_groep.inc
rename to APPL/API2/model_mld_stdmeldinggroep.inc
index ff202bd5c4..5313dff8eb 100644
--- a/APPL/API2/model_mld_stdmelding_groep.inc
+++ b/APPL/API2/model_mld_stdmeldinggroep.inc
@@ -2,9 +2,9 @@
     $Revision$
     $Id$
 
-    File:           model_mld_stdmelding_groep.inc
+    File:           model_mld_stdmeldinggroep.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor mld_stdmelding_groep
+    Description:    Vanuit CodeCharge gegenereerd model voor mld_stdmeldinggroep
 
     Context:
 
@@ -13,7 +13,7 @@
 %>
 <%
 
-function model_mld_stdmelding_groep()
+function model_mld_stdmeldinggroep()
 {
     this.records_name = "callgroups";
     this.record_name = "callgroup";
diff --git a/APPL/API2/model_prs_srtperslid.inc b/APPL/API2/model_prs_srtperslid.inc
index 8cde2cc703..84607e3f51 100644
--- a/APPL/API2/model_prs_srtperslid.inc
+++ b/APPL/API2/model_prs_srtperslid.inc
@@ -17,12 +17,12 @@ function model_prs_srtperslid()
 {
     this.records_name = "employeefunctions";
     this.record_name = "employeefunction";
-    this.table = "prs_v_aanwezigsrtperslid";
+    this.table = "prs_srtperslid";
     this.primary = "prs_srtperslid_key";
     this.soft_delete = "prs_srtperslid_verwijder";
     this.autfunction = "WEB_PRSMSU";
-    this.record_title = L("prs_v_aanwezigsrtperslid");
-    this.records_title = L("prs_v_aanwezigsrtperslid_m");
+    this.record_title = L("prs_srtperslid");
+    this.records_title = L("prs_srtperslid_m");
 
     this.fields = {
         "id": {
diff --git a/APPL/API2/model_res_discipline.inc b/APPL/API2/model_res_discipline.inc
index dbed753508..c5d9e72395 100644
--- a/APPL/API2/model_res_discipline.inc
+++ b/APPL/API2/model_res_discipline.inc
@@ -23,7 +23,7 @@ function model_res_discipline(disc_key, params)
 
     this.REST_GET    = generic_REST_GET(_model_res_discipline,  // Let op: de originele _model_res_discipline
                                            { "GET": {
-                                                     wheres: [ "ins_tab_discipline.ins_discipline_module = 'RES'"
+                                                     wheres: [ "res_discipline.ins_discipline_module = 'RES'"
                                                              ]
                                                     }
                                             }
@@ -38,12 +38,16 @@ _model_res_discipline = // Internal only
 {
     "records_name": "bookingdisciplines",
     "record_name": "bookingdiscipline",
-    "table": "ins_tab_discipline",
+    "table": "res_discipline",
     "primary": "ins_discipline_key",
     "soft_delete": "ins_discipline_verwijder",
     "autfunction": "WEB_RESMGT",
-    "record_title": L("res_v_res_catalogus"),
-    "records_title": L("res_v_res_catalogus_m"),
+
+    "record_title": L("res_discipline"),
+    "records_title": L("res_discipline_m"),
+
+//    "record_title": L("res_v_res_catalogus"),
+//    "records_title": L("res_v_res_catalogus_m"),
 
 
     "fields": {
diff --git a/APPL/API2/model_res_ruimte.inc b/APPL/API2/model_res_ruimte.inc
index 9abf421b43..edb55163c3 100644
--- a/APPL/API2/model_res_ruimte.inc
+++ b/APPL/API2/model_res_ruimte.inc
@@ -25,8 +25,8 @@ function model_res_ruimte()
     this.soft_delete = "res_ruimte_verwijder";
     this.soft_expire = "res_ruimte_vervaldatum";
     this.autfunction = "WEB_RESMSU";
-    this.record_title = L("res_v_aanwezigruimte");
-    this.records_title = L("res_v_aanwezigruimte_m");
+    this.record_title = L("res_ruimte");
+    this.records_title = L("res_ruimte_m");
 
     this.fields = {
         "id": {
@@ -269,7 +269,6 @@ function model_res_ruimte()
         }
     };
 
-
     // res_v_alg_ruimte_gegevens levert voor een koppelzaal meerdere records waardoor de opstelling ook meervoudig wordt weergegeven.
     // Door alleen de onderstaande unieke combinaties te nemen wordt dit opgelost.
     // JGL: liever zou ik dit generieker doen via includes/rooms/locatiekey maar dat werd onwerkbaar complex
diff --git a/APPL/MGT/fac_notificatiejob.asp b/APPL/MGT/fac_notificatie_job.asp
similarity index 79%
rename from APPL/MGT/fac_notificatiejob.asp
rename to APPL/MGT/fac_notificatie_job.asp
index ad460db2cd..24a2f1bc4d 100644
--- a/APPL/MGT/fac_notificatiejob.asp
+++ b/APPL/MGT/fac_notificatie_job.asp
@@ -13,9 +13,9 @@
 */
 %>
 <!-- #include file="../scf/scaffolding.inc" -->
-<!-- #include file="../api2/model_fac_notificatiejob.inc" -->
+<!-- #include file="../api2/model_fac_notificatie_job.inc" -->
 <%
-var this_model = new model_fac_notificatiejob();
+var this_model = new model_fac_notificatie_job();
 
 scaffolding(this_model,
     {
diff --git a/APPL/MGT/fac_usergraph.asp b/APPL/MGT/fac_usrgraph.asp
similarity index 82%
rename from APPL/MGT/fac_usergraph.asp
rename to APPL/MGT/fac_usrgraph.asp
index 8bf5f6fd77..fc45dc5f95 100644
--- a/APPL/MGT/fac_usergraph.asp
+++ b/APPL/MGT/fac_usrgraph.asp
@@ -14,9 +14,9 @@
 %>
 <!-- #include file="../scf/scaffolding.inc" -->
 <!-- #include file="../mgt/mgt_tools.inc" -->
-<!-- #include file="../api2/model_fac_usergraph.inc" -->
+<!-- #include file="../api2/model_fac_usrgraph.inc" -->
 <%
-var this_model = new model_fac_usergraph();
+var this_model = new model_fac_usrgraph();
 
 scaffolding(this_model,
     {
diff --git a/APPL/MGT/mld_srtdiscipline.asp b/APPL/MGT/mld_srtdiscipline.asp
index 642eec260c..a117e04a66 100644
--- a/APPL/MGT/mld_srtdiscipline.asp
+++ b/APPL/MGT/mld_srtdiscipline.asp
@@ -14,9 +14,9 @@
 %>
 <!-- #include file="../scf/scaffolding.inc" -->
 <!-- #include file="../mgt/mgt_tools.inc" -->
-<!-- #include file="../api2/model_mld_srtdiscipline.inc" -->
+<!-- #include file="../api2/model_ins_srtdiscipline.inc" -->
 <%
-var this_model = new model_mld_srtdiscipline();
+var this_model = new model_ins_srtdiscipline();
 
 scaffolding(this_model,
     {