diff --git a/ALG/ALG_INI.SRC b/ALG/ALG_INI.SRC
index a3be44de..7e521c8f 100644
--- a/ALG/ALG_INI.SRC
+++ b/ALG/ALG_INI.SRC
@@ -3,7 +3,7 @@
  * $Id$
  */
 
-_FAC_MODULE('ALG','Basis: Vastgoed- en ruimtebeheer')
+_FAC_MODULE('ALG','lcl_module_ALG')
 
 DEF_FAC_MESSAGE ('ALG_OPENST_MELDING', 'heeft openstaande melding', '');
 DEF_FAC_MESSAGE ('ALG_BEVAT_OBJECT', 'bevat object', '');
diff --git a/BES/BES_INI.SRC b/BES/BES_INI.SRC
index 4d89989b..44f0f21a 100644
--- a/BES/BES_INI.SRC
+++ b/BES/BES_INI.SRC
@@ -4,7 +4,7 @@
  *  $Id$
  */
 
-_FAC_MODULE('BES','Bestellingenmodule')
+_FAC_MODULE('BES','lcl_module_BES')
 
 DEF_STATUS('bestelling', 1, 'lcl_bes_afgewezen');
 DEF_STATUS('bestelling', 2, 'lcl_bes_new');
diff --git a/BEZ/BEZ_INI.SRC b/BEZ/BEZ_INI.SRC
index 9f3b974b..a29d6d65 100644
--- a/BEZ/BEZ_INI.SRC
+++ b/BEZ/BEZ_INI.SRC
@@ -3,7 +3,7 @@
  *  $Id$
  */
 
-_FAC_MODULE('BEZ','Bezoekersregistratie')
+_FAC_MODULE('BEZ','lcl_module_BEZ')
 
 INSERT INTO bez_actie (bez_actie_omschrijving) VALUES ('Onbekend');
 INSERT INTO bez_actie (bez_actie_omschrijving) VALUES ('Ontvanger bellen');
diff --git a/CAD/CAD_INI.SRC b/CAD/CAD_INI.SRC
index 4a1299c6..ddd3b769 100644
--- a/CAD/CAD_INI.SRC
+++ b/CAD/CAD_INI.SRC
@@ -4,7 +4,7 @@
  *  $Id$
  */
 
-_FAC_MODULE('CAD','Facilitor Graphics')
+_FAC_MODULE('CAD','lcl_module_CAD')
 
 
 INSERT INTO cad_legenda (cad_legenda_omschrijving, cad_legenda_discreet) VALUES ('Default legenda', 1);
diff --git a/CARE/CARE_INI.SRC b/CARE/CARE_INI.SRC
index deec5dcf..8ac7a0a2 100644
--- a/CARE/CARE_INI.SRC
+++ b/CARE/CARE_INI.SRC
@@ -5,7 +5,7 @@
  * $Id$
  */
 
-_FAC_MODULE('CARE','Care-Webb')
+_FAC_MODULE('CARE','lcl_module_CARE')
 
 
 ------------ De eenvoudige bedrijfsstructuur vormgeven via 3 nivo's: bedrijf, afdeling en subafdeling ------------
@@ -867,7 +867,7 @@ AND UPPER(FAC_LOCALEITEMS_LCL) = 'LCL_MLD_BEHANDELAAR';
 
 
 -- BONS#31596: Iwmo factuurrapport via XSL
--- Rapport Iwmo) FACTUURrapport voor Iwmo: 
+-- Rapport Iwmo) FACTUURrapport voor Iwmo:
 INSERT INTO fac_usrrap
             (fac_usrrap_omschrijving,
              fac_usrrap_view_name,
@@ -1519,7 +1519,7 @@ INSERT INTO fac_usrrap
              0
     FROM fac_functie WHERE fac_functie_code = 'WEB_MLDBAC';
 
--- Rapport R) FACTUURrapport met detailgegevens client per beschikking - variant R:    
+-- Rapport R) FACTUURrapport met detailgegevens client per beschikking - variant R:
 INSERT INTO fac_usrrap
             (fac_usrrap_omschrijving,
              fac_usrrap_view_name,
@@ -1566,8 +1566,8 @@ INSERT INTO fac_usrrap
              fac_functie_key,
              0
     FROM fac_functie WHERE fac_functie_code = 'WEB_MLDBAC';
-    
--- BONS#36043: Totaallijst clienten in zorg (outerjoin uren):    
+
+-- BONS#36043: Totaallijst clienten in zorg (outerjoin uren):
 INSERT INTO fac_usrrap
             (fac_usrrap_omschrijving,
              fac_usrrap_view_name,
@@ -1586,7 +1586,7 @@ INSERT INTO fac_usrrap
              'Totaal lijst cliënten in zorg (ook zonder uren)',
              fac_functie_key,
              0
-    FROM fac_functie WHERE fac_functie_code = 'WEB_MLDBAC';    
+    FROM fac_functie WHERE fac_functie_code = 'WEB_MLDBAC';
 
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -2158,7 +2158,7 @@ FROM  DUAL
 CONNECT BY LEVEL <= 1*52+1;
 
 INSERT INTO care_t_qvw_periodeweektabel
-SELECT 
+SELECT
     TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IYYY') jaar,
     DECODE(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 14, 13,FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1)  periode,
     TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IW') week,
@@ -2166,7 +2166,7 @@ SELECT
 FROM  DUAL
 CONNECT BY LEVEL <= 1*52+1
 UNION
-SELECT 
+SELECT
     TO_CHAR (SYSDATE + 7*(LEVEL), 'IYYY') jaar,
     DECODE(FLOOR((TO_CHAR (SYSDATE + 7*(LEVEL),'IW') - 1) /4) + 1, 14, 13,FLOOR((TO_CHAR (SYSDATE + 7*(LEVEL),'IW') - 1) /4) + 1)  periode,
     TO_CHAR (SYSDATE + 7*(LEVEL), 'IW') week,
diff --git a/CNT/CNT_INI.SRC b/CNT/CNT_INI.SRC
index 9b9904db..b25583aa 100644
--- a/CNT/CNT_INI.SRC
+++ b/CNT/CNT_INI.SRC
@@ -5,7 +5,7 @@
 /*
 ** Bij installatie van modules moet de tabel FAC_MODULE gevuld of ge-update worden.
 */
-_FAC_MODULE('CNT','Contractbeheer')
+_FAC_MODULE('CNT','lcl_module_CNT')
 
 /*
 **      De MESSAGES van de CNT module.
diff --git a/CTR/CTR_INI.SRC b/CTR/CTR_INI.SRC
index 53b0c9b0..88993cec 100644
--- a/CTR/CTR_INI.SRC
+++ b/CTR/CTR_INI.SRC
@@ -5,7 +5,7 @@
  */
 
 
-_FAC_MODULE('CTR','Periodieke taken')
+_FAC_MODULE('CTR','lcl_module_CTR')
 
 INSERT INTO ins_tab_discipline (ins_discipline_module, ins_discipline_omschrijving) values ('CTR', 'Controle');
 INSERT INTO ctr_disc_params(ctr_ins_discipline_key, ctr_disc_params_controle_type)
diff --git a/FAC/FAC_INI.SRC b/FAC/FAC_INI.SRC
index 6410a8b9..b41467e2 100644
--- a/FAC/FAC_INI.SRC
+++ b/FAC/FAC_INI.SRC
@@ -5,10 +5,10 @@
 /*
  *      Register the FAC module
  */
-_FAC_MODULE('FAC','Facilitor algemeen')
-_FAC_MODULE('FAQ','Kennisbank')
-_FAC_MODULE('PDA','Facilitor Mobile')
-_FAC_MODULE('UDR','User Defined Reporting')
+_FAC_MODULE('FAC', 'lcl_module_FAC')
+_FAC_MODULE('FAQ', 'lcl_module_FAQ')
+_FAC_MODULE('PDA', 'lcl_module_PDA')
+_FAC_MODULE('UDR', 'lcl_module_UDR')
 
 INSERT INTO fac_version (fac_version_date, fac_version_lang) VALUES (SYSDATE, 'NL');
 
diff --git a/FAC/FAC_LCL.SRC b/FAC/FAC_LCL.SRC
index b4737bac..c95c937a 100644
--- a/FAC/FAC_LCL.SRC
+++ b/FAC/FAC_LCL.SRC
@@ -5206,6 +5206,8 @@ FAC_LCL('res_ruimte_volgnummer', 'Volgnummer', 'Sequence number', 'Folgenummer',
 FAC_LCL('res_ruimte_info_url', 'Omschrijvings URL', 'Description URL', 'Umschreibungs URL', 'URL de description')
 FAC_LCL('res_ruimte_begintijd', 'Openingstijd', 'Opening hours', 'Öffnungszeit', 'Heures d''ouverture')
 FAC_LCL('res_ruimte_eindtijd', 'Sluitingstijd', 'Closing time', 'Schlusszeit', 'Temps de fermeture')
+FAC_LCL('res_ruimte_begintijdblok', 'Lunchblokkade begin', 'Lunch block begin', '@@', '@@')
+FAC_LCL('res_ruimte_eindtijdblok', 'Lunchblokkade begin', 'Lunch block end', '@@', '@@')
 FAC_LCL('res_ruimte_min_duur', 'Minimale reserveringsduur', 'Minimum reservation duration', 'Minimaler Reservierungs Dauer', 'Durée réservation minimal')
 FAC_LCL('res_artikel_begintijd', 'Begintijd', 'Start time', 'Anfangszeit', 'Heure de début')
 FAC_LCL('res_artikel_eindtijd', 'Eindtijd', 'End time', 'Endzeit', 'Heure de fin')
@@ -5601,6 +5603,29 @@ FAC_LCL('lcl_noti_RAPMAI', 'Rapport ##KEY##',           'Report ##KEY##', 'Beric
 FAC_LCL('lcl_noti_CNTMAI', 'Contract ##KEY##',          'Contract ##KEY##', 'Vertrag  ##KEY##', '@@')
 FAC_LCL('lcl_noti_FINMAI', 'Factuur ##KEY##',           'Invoice ##KEY##', 'Rechnung ##KEY##', '@@')
 
+// Modules
+FAC_LCL('lcl_module_FAC', 'Facilitor algemeen',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_FAQ', 'Kennisbank',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_PDA', 'Facilitor Mobile',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_UDR', 'User Defined Reporting',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_ALG', 'Basis: Vastgoed- en ruimtebeheer',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_BES', 'Bestellingenmodule',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_BEZ', 'Bezoekersregistratie',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_CAD', 'Facilitor Graphics',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_CARE', 'Care-Webb',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_CNT', 'Contractbeheer',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_CTR', 'Periodieke taken',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_FIN', 'Facturen',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_INS', 'Objectbeheer',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_SLE', 'Sleutelbeheer',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_KPI', 'Key Performance Indicators',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_MLD', 'Servicedesk',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_MRK', 'Facilitor Marktplaats',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_MSG', 'Facilitor Messenger',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_PRJ', 'Projecten',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_PRS', 'Basis: Organisatie- en personenbeheer',    '@@', '@@', '@@')
+FAC_LCL('lcl_module_RES', 'Reserveringsmodule',    '@@', '@@', '@@')
+
 FAC_LCL('lcl_terms_conditions', 'Algemene voorwaarden', 'Terms and conditions', 'Geschäftsbedingungen', 'Termes et conditions')
 FAC_LCL('lcl_terms_filename', 'Algemene voorwaarden 1.0.txt', 'Terms and conditions 1.0.txt', 'Geschäftsbedingungen 1.0.txt', 'Termes et conditions 1.0.txt')
 FAC_LCL('lcl_terms_title', 'U moet de Algemene voorwaarden accepteren om verder te gaan', 'You must accept the Terms and conditions to continue', 'Sie müssen die Geschäftsbedingungen akzeptieren, um weiter zu gehen', 'Vous devez accepter les Termes et conditions pour continuer')
diff --git a/FIN/FIN_INI.SRC b/FIN/FIN_INI.SRC
index 57c64495..3d146f24 100644
--- a/FIN/FIN_INI.SRC
+++ b/FIN/FIN_INI.SRC
@@ -3,7 +3,7 @@
  *  $Id$
  */
 
-_FAC_MODULE('FIN','Facturen')
+_FAC_MODULE('FIN','lcl_module_FIN')
 
 DEF_STATUS('factuur', 1, 'lcl_fin_afgewezen');
 DEF_STATUS('factuur', 2, 'lcl_fin_ingevoerd');
diff --git a/INS/INS_INI.SRC b/INS/INS_INI.SRC
index 8ce7c745..65c695f3 100644
--- a/INS/INS_INI.SRC
+++ b/INS/INS_INI.SRC
@@ -4,8 +4,8 @@
  * $Id$
  */
 
-_FAC_MODULE('INS','Objectbeheer')
-_FAC_MODULE('SLE','Sleutelbeheer')
+_FAC_MODULE('INS','lcl_module_INS')
+_FAC_MODULE('SLE','lcl_module_SLE')
 
 INSERT INTO fac_usrrap
             (fac_usrrap_omschrijving, fac_usrrap_view_name,
diff --git a/KPI/KPI_INI.SRC b/KPI/KPI_INI.SRC
index 9980e1b4..989ca605 100644
--- a/KPI/KPI_INI.SRC
+++ b/KPI/KPI_INI.SRC
@@ -5,7 +5,7 @@
  */
 /* TODO lcl */
 
-_FAC_MODULE('KPI','Key Performance Indicators')
+_FAC_MODULE('KPI','lcl_module_KPI')
 
 ----- Grafieken -----
 INSERT INTO fac_usrgraph
diff --git a/MLD/MLD_INI.SRC b/MLD/MLD_INI.SRC
index 8da19e06..2543848a 100644
--- a/MLD/MLD_INI.SRC
+++ b/MLD/MLD_INI.SRC
@@ -5,7 +5,7 @@
  */
 
 /* Installation of modules should fill or update this one */
-_FAC_MODULE('MLD','Servicedesk')
+_FAC_MODULE('MLD','lcl_module_MLD')
 
 INSERT INTO mld_typeopdr (mld_typeopdr_key, mld_typeopdr_omschrijving,
         mld_typeopdr_upper, mld_typeopdr_module)
diff --git a/MRK/MRK_INI.SRC b/MRK/MRK_INI.SRC
index cc192b01..73d58c0f 100644
--- a/MRK/MRK_INI.SRC
+++ b/MRK/MRK_INI.SRC
@@ -1,11 +1,11 @@
-#ifdef MRK 
+#ifdef MRK
 /*
  * $Revision$
  * $Id$
  */
 
- 
-_FAC_MODULE('MRK','Facilitor Marktplaats')
+
+_FAC_MODULE('MRK','lcl_module_MRK')
 
 insert into ins_tab_discipline (ins_discipline_module, ins_discipline_omschrijving) values ('MRK', 'Aangeboden');
 insert into ins_tab_discipline (ins_discipline_module, ins_discipline_omschrijving) values ('MRK', 'Gevraagd');
diff --git a/MSG/MSG_INI.SRC b/MSG/MSG_INI.SRC
index 5628c2a5..0fb1d4f3 100644
--- a/MSG/MSG_INI.SRC
+++ b/MSG/MSG_INI.SRC
@@ -3,8 +3,8 @@
 /*  $Revision$
  *  $Id$
  */
- 
-_FAC_MODULE('MSG','Facilitor Messenger')
+
+_FAC_MODULE('MSG','lcl_module_MSG')
 
 REGISTERONCE('$Id$')
 
diff --git a/PRJ/PRJ_INI.SRC b/PRJ/PRJ_INI.SRC
index 1b1efba8..e4a0a866 100644
--- a/PRJ/PRJ_INI.SRC
+++ b/PRJ/PRJ_INI.SRC
@@ -4,7 +4,7 @@
  *  $Id$
  */
 
-_FAC_MODULE('PRJ','Projecten')
+_FAC_MODULE('PRJ','lcl_module_PRJ')
 
 
 INSERT INTO cad_legenda (cad_legenda_omschrijving, cad_legenda_discreet) VALUES ('Default project legenda', 1);
diff --git a/PRS/PRS_INI.SRC b/PRS/PRS_INI.SRC
index 2ccddfdf..29fb28eb 100644
--- a/PRS/PRS_INI.SRC
+++ b/PRS/PRS_INI.SRC
@@ -4,7 +4,7 @@
  *  $Id$
  */
 
-_FAC_MODULE('PRS','Basis: Organisatie- en personenbeheer')
+_FAC_MODULE('PRS','lcl_module_PRS')
 
 DEF_FAC_MESSAGE ('prs_r_prs_contactpersoon_key2','Er zijn nog referenties van contracten naar deze contactpersoon.'   ,'There are still references from contracts to this contract.');
 
diff --git a/RES/RES_INI.SRC b/RES/RES_INI.SRC
index 738eafe7..db833a5d 100644
--- a/RES/RES_INI.SRC
+++ b/RES/RES_INI.SRC
@@ -6,7 +6,7 @@
 /*
  * Bij installatie van modules moet de tabel FAC_MODULE gevuld of ge-update worden.
  */
-_FAC_MODULE('RES','Reserveringsmodule')
+_FAC_MODULE('RES','lcl_module_RES')
 
 insert into res_cyclus (res_cyclus_key, res_cyclus_naam, res_cyclus_periode) values(1, 'Eenmalig'   ,  0);
 insert into res_cyclus (res_cyclus_key, res_cyclus_naam, res_cyclus_periode) values(2, 'Dagelijks'  ,  1);
diff --git a/_UP/DB29to30.src b/_UP/DB29to30.src
index e66e4707..ac4f345f 100644
--- a/_UP/DB29to30.src
+++ b/_UP/DB29to30.src
@@ -27,7 +27,7 @@ INSERT INTO fac_import_app (fac_import_app_code, fac_import_app_oms, fac_functie
   SELECT 'KPN', 'FIP: Aanmaken/bijwerken van kostenplaatsen', fac_functie_key
      FROM fac_functie
     WHERE fac_functie_code = 'WEB_PRSSYS';
-    
+
 /////////////////////////////////////////////////////////////////////////////////////////// FSN#37722
 CREATE INDEX fac_i_imp_factuur2 ON fac_imp_factuur (fac_import_key);
 
@@ -304,6 +304,12 @@ ALTER TABLE fac_usrrap
       DEFAULT 1 NOT NULL
    CONSTRAINT fac_c_fac_usrrap_ratio CHECK (fac_usrrap_ratio IN (0,1,2,3));
 
+/////////////////////////////////////////////////////////////////////////////////////////// FSN#36125
+
+-- Nu definitief de lcl's invullen
+UPDATE fac_module
+   SET fac_module_remark = 'lcl_module_' || fac_module_name;
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////