From 5099bca4c9ce61937e6af558402f681e46014df7 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Thu, 19 Nov 2009 11:10:04 +0000
Subject: changed pretty much everything from english to danish in field names

---
 server/xml/macros/90d_linse-1.0.xml                | 44 ++++++++++----------
 server/xml/macros/akselaengde-1.0.xml              | 10 ++---
 server/xml/macros/aktuelle-1.0.xml                 | 16 ++++----
 server/xml/macros/amd_procedure-1.0.xml            |  4 +-
 server/xml/macros/autorefraktion-1.0.xml           | 48 +++++++++++-----------
 server/xml/macros/central_corneatykkelse-1.0.xml   | 20 ++++-----
 server/xml/macros/cycloplegisk_refraktion-1.0.xml  |  4 +-
 server/xml/macros/egen_brille-1.0.xml              | 16 ++++----
 server/xml/macros/example.xml                      | 10 ++---
 server/xml/macros/fluorescens_faser-1.0.xml        |  4 +-
 server/xml/macros/fluorescens_injektion-1.0.xml    |  4 +-
 server/xml/macros/fluorescens_konklusion-1.0.xml   | 12 +++---
 server/xml/macros/header-1.0.xml                   | 10 ++---
 server/xml/macros/henvisning-1.0.xml               |  8 ++--
 server/xml/macros/informeret_samtykke-1.0.xml      | 10 ++---
 .../intravitreal_injektion_indikation-1.0.xml      |  4 +-
 server/xml/macros/manifest_refraktion-1.0.xml      |  4 +-
 server/xml/macros/oct_konklusion-1.0.xml           | 26 ++++++------
 server/xml/macros/oct_maaling-1.0.xml              | 16 ++++----
 server/xml/macros/oejendrypning-1.0.xml            |  8 ++--
 server/xml/macros/oejentryk-1.0.xml                | 20 ++++-----
 server/xml/macros/pupilstoerrelse-1.0.xml          | 12 +++---
 server/xml/macros/ref-spaltelampe-1.0.xml          |  8 ++--
 server/xml/macros/ref_90d_linse-1.0.xml            |  8 ++--
 server/xml/macros/ref_aktuelle-1.0.xml             | 18 ++++----
 .../ref_behandling-kirurgisk_procedure-1.0.xml     |  8 ++--
 .../xml/macros/ref_efterkontrol-aktuelle-1.0.xml   |  6 +--
 .../xml/macros/ref_efterkontrol-overskrift-1.0.xml |  6 +--
 server/xml/macros/spaltelampe-1.0.xml              | 38 ++++++++---------
 server/xml/macros/spaltelampe-template-1.0.xml     |  8 ++--
 server/xml/macros/subjektiv_evaluering-1.0.xml     |  4 +-
 server/xml/macros/tidligere_alment-1.0.xml         |  4 +-
 server/xml/macros/tidligere_oejensygdomme-1.0.xml  |  4 +-
 server/xml/macros/tobaksrygning-1.0.xml            |  4 +-
 server/xml/macros/tonometri-1.0.xml                | 20 ++++-----
 server/xml/macros/topografi-1.0.xml                | 12 +++---
 server/xml/macros/visus-1.0.xml                    |  8 ++--
 server/xml/macros/visus-autoref-1.0.xml            |  8 ++--
 server/xml/macros/visus-egen_korr-1.0.xml          |  8 ++--
 .../xml/macros/visus-manifest_refraktion-1.0.xml   |  8 ++--
 server/xml/macros/visus-template-1.0.xml           |  8 ++--
 server/xml/macros/visus-uden_korr-1.0.xml          |  8 ++--
 server/xml/macros/vurdering_af_fundus-1.0.xml      | 14 +++----
 server/xml/macros/yderligere_diagnostik-1.0.xml    |  6 +--
 44 files changed, 263 insertions(+), 263 deletions(-)

diff --git a/server/xml/macros/90d_linse-1.0.xml b/server/xml/macros/90d_linse-1.0.xml
index 8a632c9..d18d9be 100644
--- a/server/xml/macros/90d_linse-1.0.xml
+++ b/server/xml/macros/90d_linse-1.0.xml
@@ -18,17 +18,17 @@
 
     if ( getValue('90d_linse.mangler.odxt') == '' and getValue('90d_linse.mangler.osin') == '' )
     then
-      out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.odxt')
-          .. ' på o.dxt og ' .. getValue('90d_linse.fundus_visibility.osin')..' på venstre.\n'
+      out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.indblik.odxt')
+          .. ' på o.dxt og ' .. getValue('90d_linse.indblik.osin')..' på venstre.\n'
     else
       if ( getValue('90d_linse.mangler.odxt') == '' )
       then
-        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.odxt')
+        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.indblik.odxt')
            .. ' på o.dxt.\n'
       end
       if ( getValue('90d_linse.mangler.osin') == '' )
       then
-        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.osin')
+        out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.indblik.osin')
            ..' på o.sin.\n'
       end
     end
@@ -38,22 +38,22 @@
       if ( getValue('90d_linse.implikation.odxt') == 'retinal hævelse' )
       then
         out = out .. 'På o.dxt findes der retinal hævelse'
-        if ( getValue('90d_linse.randbl.odxt') ~= '' and getValue('90d_linse.exsudater.odxt') ~= '')
+        if ( getValue('90d_linse.randbloedninger.odxt') ~= '' and getValue('90d_linse.exsudaterater.odxt') ~= '')
         then
           out = out .. ' med randblødning og exhudater.\n'
         end
   
-        if ( getValue('90d_linse.randbl.odxt') == '' and getValue('90d_linse.exsudater.odxt') ~= '')
+        if ( getValue('90d_linse.randbloedninger.odxt') == '' and getValue('90d_linse.exsudaterater.odxt') ~= '')
         then
           out = out .. ' med exhudater.\n'
         end
   
-        if ( getValue('90d_linse.randbl.odxt') ~= '' and getValue('90d_linse.exsudater.odxt') == '')
+        if ( getValue('90d_linse.randbloedninger.odxt') ~= '' and getValue('90d_linse.exsudaterater.odxt') == '')
         then
           out = out .. ' med randblødning.\n'
         end
   
-        if ( getValue('90d_linse.randbl.odxt') == '' and getValue('90d_linse.exsudater.odxt') == '')
+        if ( getValue('90d_linse.randbloedninger.odxt') == '' and getValue('90d_linse.exsudaterater.odxt') == '')
         then
           out = out .. '.\n'
         end
@@ -70,22 +70,22 @@
       if ( getValue('90d_linse.implikation.osin') == 'retinal hævelse' )
       then
         out = out .. 'På o.sin findes der retinal hævelse'
-        if ( getValue('90d_linse.randbl.osin') ~= '' and getValue('90d_linse.exsudater.osin') ~= '')
+        if ( getValue('90d_linse.randbloedninger.osin') ~= '' and getValue('90d_linse.exsudaterater.osin') ~= '')
         then
           out = out .. ' med randblødning og exhudater.\n'
         end
   
-        if ( getValue('90d_linse.randbl.osin') == '' and getValue('90d_linse.exsudater.osin') ~= '')
+        if ( getValue('90d_linse.randbloedninger.osin') == '' and getValue('90d_linse.exsudaterater.osin') ~= '')
         then
           out = out .. ' med exhudater.\n'
         end
   
-        if ( getValue('90d_linse.randbl.osin') ~= '' and getValue('90d_linse.exsudater.osin') == '')
+        if ( getValue('90d_linse.randbloedninger.osin') ~= '' and getValue('90d_linse.exsudaterater.osin') == '')
         then
           out = out .. ' med randblødning.\n'
         end
   
-        if ( getValue('90d_linse.randbl.osin') == '' and getValue('90d_linse.exsudater.osin') == '')
+        if ( getValue('90d_linse.randbloedninger.osin') == '' and getValue('90d_linse.exsudaterater.osin') == '')
         then
           out = out .. '.\n'
         end
@@ -118,11 +118,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -138,11 +138,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -200,7 +200,7 @@
 	<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
 	  
 	  <!-- Indblik -->
-	  <combobox name="90d_linse.fundus_visibility.odxt" value="">
+	  <combobox name="90d_linse.indblik.odxt" value="">
 	    <item caption="Klart" value="klart"/>
 	    <item caption="Let sløret" value="let sløret"/>
 	    <item caption="Meget sløret" value="meget sløret"/>
@@ -215,9 +215,9 @@
 	  </radiobuttons>
 
 	  <frame name="retinal_haevelse_odxt" layout="vbox">
-	    <checkbox name="90d_linse.randbl.odxt" caption="Randblødning"
+	    <checkbox name="90d_linse.randbloedninger.odxt" caption="Randblødning"
 		      truevalue="randblødning" falsevalue="" value=""/>
-	    <checkbox name="90d_linse.exsudater.odxt" caption="Exsudater"
+	    <checkbox name="90d_linse.exsudaterater.odxt" caption="Exsudater"
 		      truevalue="exsudater" falsevalue="" value=""/>
 	  </frame>
 
@@ -233,7 +233,7 @@
 	<frame name="left_eye_frame" caption="o.sin" layout="vbox">
 	  
 	  <!-- Indblik -->
-	  <combobox name="90d_linse.fundus_visibility.osin" value="">
+	  <combobox name="90d_linse.indblik.osin" value="">
 	    <item caption="Klart" value="klart"/>
 	    <item caption="Let sløret" value="let sløret"/>
 	    <item caption="Meget sløret" value="meget sløret"/>
@@ -248,9 +248,9 @@
 	  </radiobuttons>
 
 	  <frame name="retinal_haevelse_osin" layout="vbox">
-	    <checkbox name="90d_linse.randbl.osin" caption="Randblødning"
+	    <checkbox name="90d_linse.randbloedninger.osin" caption="Randblødning"
 		      truevalue="randblødning" falsevalue="" value=""/>
-	    <checkbox name="90d_linse.exsudater.osin" caption="Exsudater"
+	    <checkbox name="90d_linse.exsudaterater.osin" caption="Exsudater"
 		      truevalue="exsudater" falsevalue="" value=""/>
 	  </frame>
 
diff --git a/server/xml/macros/akselaengde-1.0.xml b/server/xml/macros/akselaengde-1.0.xml
index af42444..087ce80 100644
--- a/server/xml/macros/akselaengde-1.0.xml
+++ b/server/xml/macros/akselaengde-1.0.xml
@@ -4,7 +4,7 @@
     out = ''
     if ( getValue('akselaengde.mangler.odxt') == '' or getValue('akselaengde.mangler.osin') == '' )
     then
-      out = out .. 'Akselængde: ' .. getValue('akselaengde.method') .. '\n'
+      out = out .. 'Akselængde: ' .. getValue('akselaengde.metode') .. '\n'
     end
 
     if ( getValue('akselaengde.mangler.odxt') == '' )
@@ -33,11 +33,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -53,11 +53,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/aktuelle-1.0.xml b/server/xml/macros/aktuelle-1.0.xml
index 076d483..5ec3edf 100644
--- a/server/xml/macros/aktuelle-1.0.xml
+++ b/server/xml/macros/aktuelle-1.0.xml
@@ -43,8 +43,8 @@
 
     if ( getValue('aktuelle.symptomer.odxt') ~= '' or  getValue('aktuelle.symptomer.osin') ~= '' )
     then
-      out = out .. 'Symptomerne er opstået ' .. getValue('aktuelle.when') 
-                .. ' og efterfølgende ' .. getValue('aktuelle.then')
+      out = out .. 'Symptomerne er opstået ' .. getValue('aktuelle.opstaaet') 
+                .. ' og efterfølgende ' .. getValue('aktuelle.efterfoelgende')
     end
 
     return out
@@ -85,7 +85,7 @@
 		      formatlanguage="lua"
 		      format=
 		     "
-		     days = (os.time() - tonumber(getValue('date_odxt'))) / (60 * 60 * 24)
+		     days = (os.time() - tonumber(getValue('dato_odxt'))) / (60 * 60 * 24)
 		     num = 0
 		     identifier = ''
 		     suffix = ''
@@ -152,7 +152,7 @@
 	    
 	    <frame layout="vbox">
 	      <label caption="Dato:"/>
-	      <datetime name="date_odxt" fuzziness="3" map="now"/>
+	      <datetime name="dato_odxt" fuzziness="3" map="now"/>
 	      <label caption=""/>
 	    </frame>
 	    
@@ -169,7 +169,7 @@
 		      formatlanguage="lua"
 		      format=
 		    "
-		     days = (os.time() - tonumber(getValue('date_osin'))) / (60 * 60 * 24)
+		     days = (os.time() - tonumber(getValue('dato_osin'))) / (60 * 60 * 24)
 		     num = 0
 		     identifier = ''
 		     suffix = ''
@@ -236,7 +236,7 @@
 	    
 	    <frame layout="vbox">
 	      <label caption="Dato:"/>
-	      <datetime name="date_osin" fuzziness="3" map="now"/>
+	      <datetime name="dato_osin" fuzziness="3" map="now"/>
 	      <label caption=""/>
 	    </frame>
 	    
@@ -252,7 +252,7 @@
 
       <frame layout="vbox">
 	<label caption="Opstået:"/>
-	<radiobuttons name="aktuelle.when" value="." layout="hbox">
+	<radiobuttons name="aktuelle.opstaaet" value="." layout="hbox">
 	  <radiobutton caption="Pludseligt"
 		       value="pludseligt"/>
 	  <radiobutton caption="Gradvist"
@@ -263,7 +263,7 @@
       
       <frame layout="vbox">
 	<label caption="Efterfølgende:"/>
-	<combobox name="aktuelle.then" value="og har efterfølgende været uændrede">
+	<combobox name="aktuelle.efterfoelgende" value="og har efterfølgende været uændrede">
 	  <item caption="Uændret" value="uændrede"/>
 	  <item caption="Forværret" value="forværret"/>
 	  <item caption="Forbedret" value="forbedret"/>
diff --git a/server/xml/macros/amd_procedure-1.0.xml b/server/xml/macros/amd_procedure-1.0.xml
index 9613202..ac8112d 100644
--- a/server/xml/macros/amd_procedure-1.0.xml
+++ b/server/xml/macros/amd_procedure-1.0.xml
@@ -6,7 +6,7 @@ vædet i Lidokain 20 mg/ml med Adrenalin.
 Injektionsstedet nedadtil temporalt i konjunktiva 3,5 mm fra limbus
 afmærkes med passer. Gennem 30 gauge kanyle gives 0,05 ml:
 
-Lucentis ${lucentis_treatment.oeje}
+Lucentis ${lucentis_behandling.oeje}
 
 Der dryppes med oculoguttae Tobrex over injektionsstedet.
 Herefter medgives oculoguttae Tobrex til drypning x 2 i 2 døgn i det
@@ -26,7 +26,7 @@ behandling.
 Injektionsstedet nedadtil temporalt i konjunktiva afmærkes med passer 3,5 mm fra limbus."/>
       <frame layout="hbox">
 	<label width="250" caption="Med 30 gauge kanyle gives 0,05 ml Lucentis"/>
-	<radiobuttons name="lucentis_treatment.oeje">
+	<radiobuttons name="lucentis_behandling.oeje">
 	  <radiobutton value="o.dxt" caption="o.dxt"/>
 	  <radiobutton value="o.sin" caption="o.sin"/>
 	</radiobuttons>
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml
index a4e882e..756129b 100644
--- a/server/xml/macros/autorefraktion-1.0.xml
+++ b/server/xml/macros/autorefraktion-1.0.xml
@@ -2,31 +2,31 @@
 <macro name="autorefraktion" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('autorefractor.mangler.odxt') == '' )
+    if ( getValue('autorefraktion.mangler.odxt') == '' )
     then
-      out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.sfere.odxt') .. ' sf'
-      if ( getValue('autorefractor.cyl.odxt') ~= '' )
+      out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefraktion.sf.odxt') .. ' sf'
+      if ( getValue('autorefraktion.cyl.odxt') ~= '' )
       then
-        out = out .. ', ' .. getValue('autorefractor.cyl.odxt') .. ' cyl'
+        out = out .. ', ' .. getValue('autorefraktion.cyl.odxt') .. ' cyl'
       end
-      if ( getValue('autorefractor.grader.odxt') ~= '' )
+      if ( getValue('autorefraktion.grader.odxt') ~= '' )
       then
-        out = out .. ', ' .. getValue('autorefractor.grader.odxt') .. ' grader\n'
+        out = out .. ', ' .. getValue('autorefraktion.grader.odxt') .. ' grader\n'
       else
         out = out .. '\n'
       end
     end
 
-    if ( getValue('autorefractor.mangler.osin') == '' )
+    if ( getValue('autorefraktion.mangler.osin') == '' )
     then
-      out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.sfere.osin') .. ' sf'
-      if ( getValue('autorefractor.cyl.osin') ~= '' )
+      out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefraktion.sf.osin') .. ' sf'
+      if ( getValue('autorefraktion.cyl.osin') ~= '' )
       then
-        out = out .. ', ' .. getValue('autorefractor.cyl.osin') .. ' cyl'
+        out = out .. ', ' .. getValue('autorefraktion.cyl.osin') .. ' cyl'
       end
-      if ( getValue('autorefractor.grader.osin') ~= '' )
+      if ( getValue('autorefraktion.grader.osin') ~= '' )
       then
-        out = out .. ', ' .. getValue('autorefractor.grader.osin') .. ' grader\n'
+        out = out .. ', ' .. getValue('autorefraktion.grader.osin') .. ' grader\n'
       else
         out = out .. '\n'
       end
@@ -50,11 +50,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -70,11 +70,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -150,24 +150,24 @@
       <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.dxt"
-		  name="autorefractor.mangler.odxt" script="right_eye"
+		  name="autorefraktion.mangler.odxt" script="right_eye"
 		  map="missing_eye_odxt_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  
 	  <frame layout="vbox">
 	    <label caption="Sf:"/>
-	    <lineedit name="autorefractor.sfere.odxt"
+	    <lineedit name="autorefraktion.sf.odxt"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Cyl:"/>
-	    <lineedit name="autorefractor.cyl.odxt"
+	    <lineedit name="autorefraktion.cyl.odxt"
 		      regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
-	    <lineedit name="autorefractor.grader.odxt"
+	    <lineedit name="autorefraktion.grader.odxt"
 		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	  
@@ -177,24 +177,24 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="autorefractor.mangler.osin" script="left_eye"
+		  name="autorefraktion.mangler.osin" script="left_eye"
 		  map="missing_eye_osin_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  
 	  <frame layout="vbox">
 	    <label caption="Sf:"/>
-	    <lineedit name="autorefractor.sfere.osin"
+	    <lineedit name="autorefraktion.sf.osin"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Cyl:"/>
-	    <lineedit name="autorefractor.cyl.osin"
+	    <lineedit name="autorefraktion.cyl.osin"
 		      regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
-	    <lineedit name="autorefractor.grader.osin"
+	    <lineedit name="autorefraktion.grader.osin"
 		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	</frame>
diff --git a/server/xml/macros/central_corneatykkelse-1.0.xml b/server/xml/macros/central_corneatykkelse-1.0.xml
index 2abf1c7..fd74b71 100644
--- a/server/xml/macros/central_corneatykkelse-1.0.xml
+++ b/server/xml/macros/central_corneatykkelse-1.0.xml
@@ -4,17 +4,17 @@
     out = ''
     if ( getValue('central_corneatykkelse.mangler.odxt') == '' or getValue('central_corneatykkelse.mangler.osin') == '' )
     then
-      out = out .. 'Central corneatykkelse, ' .. getValue('central_corneatykkelse.method') .. ':\n'
+      out = out .. 'Central corneatykkelse, ' .. getValue('central_corneatykkelse.metode') .. ':\n'
     end
 
     if ( getValue('central_corneatykkelse.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('central_corneatykkelse.thickness.odxt') .. ' mm\n'
+      out = out .. 'o.dxt: ' .. getValue('central_corneatykkelse.tykkelse.odxt') .. ' mm\n'
     end
 
     if ( getValue('central_corneatykkelse.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('central_corneatykkelse.thickness.osin') .. ' mm\n'
+      out = out .. 'o.sin: ' .. getValue('central_corneatykkelse.tykkelse.osin') .. ' mm\n'
     end
 
     return out
@@ -33,11 +33,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -53,11 +53,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -112,7 +112,7 @@
 	  <frame layout="vbox">
 	    <label caption="Tykkelse:"/>
 	    <frame layout="hbox">
-	      <lineedit name="central_corneatykkelse.thickness.odxt" script="lt1gt0"
+	      <lineedit name="central_corneatykkelse.tykkelse.odxt" script="lt1gt0"
 			regexp="\d{1},\d{3}" value=""/>
 	      <label caption="mm"/>
 	    </frame>
@@ -130,7 +130,7 @@
 	  <frame layout="vbox">
 	    <label caption="Tykkelse:"/>
 	    <frame layout="hbox">
-	      <lineedit name="central_corneatykkelse.thickness.osin" script="lt1gt0"
+	      <lineedit name="central_corneatykkelse.tykkelse.osin" script="lt1gt0"
 			regexp="\d{1},\d{3}" value=""/>
 	      <label caption="mm"/>
 	    </frame>
@@ -141,7 +141,7 @@
 
     <frame name="device_frame" layout="vbox">
       <label caption="Undersøgelse foretaget med:"/>
-      <combobox name="central_corneatykkelse.method" value="">
+      <combobox name="central_corneatykkelse.metode" value="">
 	<item caption="Automatisk CCT" value="Automatisk CCT"/>
 	<item caption="Pentacam" value="Pentacam"/>
 	<item caption="Optisk pachymetri" value="Optisk pachymetri"/>
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index 697ed47..cdef363 100644
--- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml
+++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
@@ -154,7 +154,7 @@
 	  
 	  <frame layout="vbox">
 	    <label caption="Sf:"/>
-	    <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sfere.odxt"
+	    <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sf.odxt"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
@@ -180,7 +180,7 @@
 	  
 	  <frame layout="vbox">
 	    <label caption="Sf:"/>
-	    <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sfere.osin"
+	    <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sf.osin"
 		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	  </frame>
 	  <frame layout="vbox">
diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml
index 4143e3d..f705d0d 100644
--- a/server/xml/macros/egen_brille-1.0.xml
+++ b/server/xml/macros/egen_brille-1.0.xml
@@ -51,11 +51,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -71,11 +71,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -92,7 +92,7 @@
         -- convert . to ,
         value = string.gsub(value, '[.]', ',')
         timestamp = brillemaaler.sf.timestamp.osin
-        source = brillemaaler.sf.source.osin
+        source = brillemaaler.sf.kilde.osin
       end
       return value, timestamp, source
     </map>
@@ -108,7 +108,7 @@
         -- convert . to ,
         value = string.gsub(value, '[.]', ',')
         timestamp = brillemaaler.cyl.timestamp.osin
-        source = brillemaaler.cyl.source.osin
+        source = brillemaaler.cyl.kilde.osin
       end
       return value, timestamp, source
     </map>
@@ -124,7 +124,7 @@
         -- convert . to ,
         value = string.gsub(value, '[.]', ',')
         timestamp = brillemaaler.sf.timestamp.odxt
-        source = brillemaaler.sf.source.odxt
+        source = brillemaaler.sf.kilde.odxt
       end
       return value, timestamp, source
     </map>
@@ -140,7 +140,7 @@
         -- convert . to ,
         value = string.gsub(value, '[.]', ',')
         timestamp = brillemaaler.cyl.timestamp.odxt
-        source = brillemaaler.cyl.source.odxt
+        source = brillemaaler.cyl.kilde.odxt
       end
       return value, timestamp, source
     </map>
diff --git a/server/xml/macros/example.xml b/server/xml/macros/example.xml
index eef6a18..ff502ed 100644
--- a/server/xml/macros/example.xml
+++ b/server/xml/macros/example.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<macro name="example" version="1.0" resume="Axis: $.grader}\nCylinder: ${cyl}\nSphere: $.sfere}\n">
+<macro name="example" version="1.0" resume="Axis: $.grader}\nCylinder: ${cyl}\nSphere: $.sf}\n">
   <queries>
     <query class="lensmeter" ttl="10000" automap="true"/>
   </queries>
@@ -30,9 +30,9 @@
   </maps>
   <scripts>
     <script language="lua" name="theanswer">
-     .sfere = tonumber(getValue(.sfere'))
+     .sf = tonumber(getValue(.sf'))
      .grader = tonumber(getValue(.grader'))
-      if(.sfere ==.grader )
+      if(.sf ==.grader )
       then
         setValue('cyl', name)
         return true
@@ -62,10 +62,10 @@
       </frame>
     </frame>
     <frame name="linse_frame" caption="FlereLinser:" layout="vbox">
-      <multilist name="multilisttest" value="" layout="vbox" format="Sphere: $.sferecombo}, Cyl: ${multcyl}.">
+      <multilist name="multilisttest" value="" layout="vbox" format="Sphere: $.sfcombo}, Cyl: ${multcyl}.">
         <frame name="linse_frameb" layout="hbox">
           <label name="b" width="100" caption="Sphere:"/>
-	  <combobox name=.sferecombo" width="100" value="val_lad" type="search">
+	  <combobox name=.sfcombo" width="100" value="val_lad" type="search">
 	    <item caption="sap" value="val_sap"/>
 	    <item caption="sat" value="val_sat"/>
 	    <item caption="sad" value="val_sad"/>
diff --git a/server/xml/macros/fluorescens_faser-1.0.xml b/server/xml/macros/fluorescens_faser-1.0.xml
index e2a623f..47f204d 100644
--- a/server/xml/macros/fluorescens_faser-1.0.xml
+++ b/server/xml/macros/fluorescens_faser-1.0.xml
@@ -7,7 +7,7 @@
   <resume>Fluorescens angiografi viser god fyldning af det retinale kartræ.
 
 Svarende til det retinale ødem ses der i de tidlige faser
-${fluorescens.early_fases}.
+${fluorescens.tidlige_faser}.
 
 Gennem de angiografiske faser udvikles der
 ${fluorescens.angiografi_faser}.</resume>
@@ -32,7 +32,7 @@ ${fluorescens.angiografi_faser}.</resume>
       </frame>
 
       <label caption="Tidlige faser:"/>
-      <combobox name="fluorescens.early_fases" value="">
+      <combobox name="fluorescens.tidlige_faser" value="">
 	<item caption="Hyperfluorescens" value="Hyperfluorescens" />
 	<item caption="Hypofluorescens" value="Hypofluorescens" />
 	<item caption="Normalt fluorescensmønster" value="Normalt fluorescens mønster" />
diff --git a/server/xml/macros/fluorescens_injektion-1.0.xml b/server/xml/macros/fluorescens_injektion-1.0.xml
index dffdb4d..e95ec81 100644
--- a/server/xml/macros/fluorescens_injektion-1.0.xml
+++ b/server/xml/macros/fluorescens_injektion-1.0.xml
@@ -5,7 +5,7 @@
   -->
 <macro name="fluorescens_injektion" version="1.0">
   <resume>I henhold til ovenstående ordination foretages der fluorescein angiografi efter afdelingens retningslinier.
-Injektion af fluorescein ved: ${fluorescens_injektion.initials}</resume>
+Injektion af fluorescein ved: ${fluorescens_injektion.initialer}</resume>
   <queries>
   </queries>
   <maps>
@@ -28,7 +28,7 @@ Injektion af fluorescein ved: ${fluorescens_injektion.initials}</resume>
 
     <frame layout="hbox">
       <label width="300" caption="Fluorescein injektion foretaget af (initialer):"/>
-      <lineedit name="fluorescens_injektion.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
+      <lineedit name="fluorescens_injektion.initialer" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
       <spacer />
     </frame>
 
diff --git a/server/xml/macros/fluorescens_konklusion-1.0.xml b/server/xml/macros/fluorescens_konklusion-1.0.xml
index b8b6235..06dd6f7 100644
--- a/server/xml/macros/fluorescens_konklusion-1.0.xml
+++ b/server/xml/macros/fluorescens_konklusion-1.0.xml
@@ -21,13 +21,13 @@
     then
       out = out .. getValue('fluorescens.konklusion.) .. '\n'
       out = out .. 'Membranen er beliggende:'
-                .. getValue('fluorescens.membrane.position') .. '\n'
+                .. getValue('fluorescens.membran.position') .. '\n'
       out = out .. 'Membranstørrelse:' 
-                .. getValue('fluorescens.membrane.size') .. 'µm\n'
+                .. getValue('fluorescens.membran.stoerrelse') .. 'µm\n'
     else
       if( getValue('fluorescens.konklusion.) == 'andet' )
       then
-        out = out .. getValue('fluorescens.konklusion.other') .. '\n'
+        out = out .. getValue('fluorescens.konklusion.andet') .. '\n'
       else
         out = out .. getValue('fluorescens.konklusion.) .. '\n'
       end
@@ -94,7 +94,7 @@
 
     <frame name="andet_frame" layout="hbox">
       <label caption="Andet:"/>
-      <lineedit name="fluorescens.konklusion.other" value=""/>
+      <lineedit name="fluorescens.konklusion.andet" value=""/>
     </frame>
 
     <frame name="yderligere_info_frame" layout="vbox">
@@ -102,7 +102,7 @@
 
       <frame layout="hbox">
 	<label caption="Membran beliggenhed:" width="150"/>
-	<combobox name="fluorescens.membrane.position" value="">
+	<combobox name="fluorescens.membran.position" value="">
 	  <item caption="Subfovealt" value="Subfovealt" />
 	  <item caption="Juxtafovealt" value="Juxtafovealt" />
 	  <item caption="Extrafovealt" value="Extrafovealt" />
@@ -112,7 +112,7 @@
       
       <frame layout="hbox">
 	<label caption="Membranstørrelse:" width="150"/>
-	<lineedit name="fluorescens.membrane.size" regexp="[0-9,.-]+" value=""/>
+	<lineedit name="fluorescens.membran.stoerrelse" regexp="[0-9,.-]+" value=""/>
 	<label caption="µm" />
 	<spacer/>
       </frame>
diff --git a/server/xml/macros/header-1.0.xml b/server/xml/macros/header-1.0.xml
index 93af95f..5e9ee89 100644
--- a/server/xml/macros/header-1.0.xml
+++ b/server/xml/macros/header-1.0.xml
@@ -18,11 +18,11 @@
       timestamp = 0
       source = 'pentominos'
 
-      if(cpr and cpr.cpr and cpr.cpr.value and cpr.cpr.timestamp and cpr.cpr.source)
+      if(cpr and cpr.cpr and cpr.cpr.value and cpr.cpr.timestamp and cpr.cpr.kilde)
       then
         value = string.sub(cpr.cpr.value,1,6) .. '-' .. string.sub(cpr.cpr.value,7,11)
         timestamp = cpr.cpr.timestamp
-        source = cpr.cpr.source
+        source = cpr.cpr.kilde
       end
 
       return value, timestamp, source
@@ -50,14 +50,14 @@
     <frame layout="vbox">
       <frame layout="hbox">
         <label width="100" caption="Henvisende læge:"/>
-        <lineedit name="referral.doctor" map="henvisning.doctor" readonly="true"
+        <lineedit name="henvisning.laege" map="henvisning.laege" readonly="true"
 		  value="Henvisnings informationer kunne ikke findes"/>
       </frame>
       <frame layout="hbox">
         <label width="100" caption="Henvisningskode:"/>
-        <lineedit name="referral.diagnosecode" map="henvisning.code" value="-" readonly="true"/>
+        <lineedit name="henvisning.diagnose_kode" map="henvisning.code" value="-" readonly="true"/>
         <label width="60" caption="Diagnose:"/>
-        <lineedit width="100" name="referral.diagnose" map="henvisning.diagnose" value="-" readonly="true"/>
+        <lineedit width="100" name="henvisning.diagnose" map="henvisning.diagnose" value="-" readonly="true"/>
       </frame>
     </frame>
 
diff --git a/server/xml/macros/henvisning-1.0.xml b/server/xml/macros/henvisning-1.0.xml
index b0a8f56..49ed8c4 100644
--- a/server/xml/macros/henvisning-1.0.xml
+++ b/server/xml/macros/henvisning-1.0.xml
@@ -7,7 +7,7 @@
     Nye min størrelser på lineedits, så navnet altid kan ses.
   -->
 <macro name="henvisning" version="1.0">
-  <resume>Henvist fra øjenlæge ${referral.doctor} til forundersøgelse for ${referral.diagnose}</resume>
+  <resume>Henvist fra øjenlæge ${henvisning.laege} til forundersøgelse for ${henvisning.diagnose}</resume>
   <queries>
     <query service="pentominos" class="referral" ttl="1000000"/>
   </queries>
@@ -24,14 +24,14 @@
     <frame layout="vbox">
       <frame layout="hbox">
         <label width="100" caption="Henvisende læge:"/>
-        <lineedit name="referral.doctor" map="henvisning.doctor"
+        <lineedit name="henvisning.laege" map="henvisning.laege"
 		  value="Henvisnings informationer kunne ikke findes"/>
       </frame>
       <frame layout="hbox">
         <label width="100" caption="Henvisningskode:"/>
-        <lineedit name="referral.diagnosecode" map="henvisning.code" value="-"/>
+        <lineedit name="henvisning.diagnose_kode" map="henvisning.code" value="-"/>
         <label width="60" caption="Diagnose:"/>
-        <lineedit width="100" name="referral.diagnose"
+        <lineedit width="100" name="henvisning.diagnose"
 		  map="henvisning.diagnose" value="-"/>
       </frame>
     </frame>
diff --git a/server/xml/macros/informeret_samtykke-1.0.xml b/server/xml/macros/informeret_samtykke-1.0.xml
index efe15ab..98e2f27 100644
--- a/server/xml/macros/informeret_samtykke-1.0.xml
+++ b/server/xml/macros/informeret_samtykke-1.0.xml
@@ -13,11 +13,11 @@
   <resume language="lua">
     out = 'Pt informeres om muligheden for behandling og de risici og bivirkninger, som kan være forbundet hermed. Specielt informeres om, behandlingen foregår ved en injektion i øjet i lokalbedøvelse, samt at der kræves månedlig kontrol for at vurdere om behandlingen skal gentages. Endvidere at behandlingen kan være forbundet med smerter og irritation det første døgn, og i sjældne tilfælde kan medføre infektion. På baggrund af den givne behandling indvilliger patienten i at få foretaget behandlingen.\n\n'
 
-    out = out .. 'Der er givet informeret samtykke, ' .. getValue('amd.consent') .. '.\n'
+    out = out .. 'Der er givet informeret samtykke, ' .. getValue('amd.samtykke') .. '.\n'
 
-    if( getValue('amd.agreements') ~= '' )
+    if( getValue('amd.aftaler') ~= '' )
     then
-      out = out .. 'Yderligere aftaler med patienten: ' .. getValue('amd.agreements')
+      out = out .. 'Yderligere aftaler med patienten: ' .. getValue('amd.aftaler')
     end
 
     return out
@@ -40,11 +40,11 @@
 
     <label height="80" caption="Pt informeres om muligheden for behandling og de risici og bivirkninger, som kan være forbundet hermed. Specielt informeres om, behandlingen foregår ved en injektion i øjet i lokalbedøvelse, samt at der kræves månedlig kontrol for at vurdere om behandlingen skal gentages. Endvidere at behandlingen kan være forbundet med smerter og irritation det første døgn, og i sjældne tilfælde kan medføre infektion. På baggrund af den givne behandling indvilliger patienten i at få foretaget behandlingen."/>
     <checkbox caption="Der er givet informeret samtykke."
-	      name="amd.consent" value="" truevalue="JA"
+	      name="amd.samtykke" value="" truevalue="JA"
 	      falsevalue="" script="check"/>
 
     <label caption="Yderligere aftaler med patienten:"/>
-    <lineedit name="amd.agreements" value=""/>
+    <lineedit name="amd.aftaler" value=""/>
 
     <!-- Knapper -->
     <frame layout="hbox">
diff --git a/server/xml/macros/intravitreal_injektion_indikation-1.0.xml b/server/xml/macros/intravitreal_injektion_indikation-1.0.xml
index cab9d11..18763dc 100644
--- a/server/xml/macros/intravitreal_injektion_indikation-1.0.xml
+++ b/server/xml/macros/intravitreal_injektion_indikation-1.0.xml
@@ -2,7 +2,7 @@
 <macro name="intravitreal_injektion_indikation" version="1.0">
   <resume>Der findes indikation for intravitreal injektion med Lucentis.
 Pt. klargøres i henhold til afdelingens instruks.
-Klargøring udført af: ${intravitreal.initials}
+Klargøring udført af: ${intravitreal.initialer}
 </resume>
   <queries>
   </queries>
@@ -15,7 +15,7 @@ Klargøring udført af: ${intravitreal.initials}
       <label caption="Der er fundet indikation for intravitreal injektion med Lucentis og patienten klargøres i henhold til afdelingens instruks."/>
       <frame layout="hbox">
 	<label caption="Initialer:"/>
-	<lineedit name="intravitreal.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}"/>
+	<lineedit name="intravitreal.initialer" regexp="[a-zæøåA-ZÆØÅ]{2,5}"/>
       </frame>
     </frame>
     <frame layout="hbox">
diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index 5c0b90c..46b6f35 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -162,7 +162,7 @@
 	  <frame layout="hbox">
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="manifest_refraktion.sf.odxt" map="manifest_refraktion.sfere.odxt"
+	      <lineedit name="manifest_refraktion.sf.odxt" map="manifest_refraktion.sf.odxt"
 			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
@@ -190,7 +190,7 @@
 	  <frame layout="hbox">
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="manifest_refraktion.sf.osin" map="manifest_refraktion.sfere.osin"
+	      <lineedit name="manifest_refraktion.sf.osin" map="manifest_refraktion.sf.osin"
 			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
diff --git a/server/xml/macros/oct_konklusion-1.0.xml b/server/xml/macros/oct_konklusion-1.0.xml
index d8f9bdb..27de1e4 100644
--- a/server/xml/macros/oct_konklusion-1.0.xml
+++ b/server/xml/macros/oct_konklusion-1.0.xml
@@ -21,18 +21,18 @@
 
       if ( getValue('oct.mangler.odxt') == '' )
       then
-        out = out .. 'OCT o.dxt ' .. getValue('oct.description.odxt') .. '.\n'
+        out = out .. 'OCT o.dxt ' .. getValue('oct.beskrivelse.odxt') .. '.\n'
       end
 
       if ( getValue('oct.mangler.osin') == '' )
       then
-        out = out .. 'OCT o.sin ' .. getValue('oct.description.osin') .. '.\n'
+        out = out .. 'OCT o.sin ' .. getValue('oct.beskrivelse.osin') .. '.\n'
       end
     end
 
-    if ( getValue('oct.comments') ~= '' )
+    if ( getValue('oct.kommentarer') ~= '' )
     then
-      out = out .. getValue('oct.comments') .. '\n'
+      out = out .. getValue('oct.kommentarer') .. '\n'
     end
 
     return out
@@ -53,11 +53,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -73,11 +73,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -119,12 +119,12 @@
 	  <frame layout="vbox">
 	    <frame layout="hbox">
 	      <label caption="Tykkelse:"/>
-	      <lineedit name="oct.thickness.odxt" value="" readonly="true"/>
+	      <lineedit name="oct.tykkelse.odxt" value="" readonly="true"/>
 	      <label caption="µm"/>
 	    </frame>
 	    <label caption=""/>
 	  </frame>
-	  <altcombobox name="oct.description.odxt" type="select" value="normal" layout="vbox">
+	  <altcombobox name="oct.beskrivelse.odxt" type="select" value="normal" layout="vbox">
 	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
 	    <item caption="Serøs amotio" value="serøs amotio"/>
 	    <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
@@ -149,12 +149,12 @@
 	  <frame layout="vbox">
 	    <frame layout="hbox">
 	      <label caption="Tykkelse:"/>
-	      <lineedit name="oct.thickness.osin" value="" readonly="true"/>
+	      <lineedit name="oct.tykkelse.osin" value="" readonly="true"/>
 	      <label caption="µm"/>
 	    </frame>
 	    <label caption=""/>
 	  </frame>
-	  <altcombobox name="oct.description.osin" type="select" value="normal" layout="vbox">
+	  <altcombobox name="oct.beskrivelse.osin" type="select" value="normal" layout="vbox">
 	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
 	    <item caption="Serøs amotio" value="serøs amotio"/>
 	    <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
@@ -173,7 +173,7 @@
 
     <frame layout="vbox">
       <label caption="Kommentarer:"/>
-      <lineedit name="oct.comments" value=""/>
+      <lineedit name="oct.kommentarer" value=""/>
     </frame>
 
     <!-- Knapper -->
diff --git a/server/xml/macros/oct_maaling-1.0.xml b/server/xml/macros/oct_maaling-1.0.xml
index 06871cd..0a961b6 100644
--- a/server/xml/macros/oct_maaling-1.0.xml
+++ b/server/xml/macros/oct_maaling-1.0.xml
@@ -20,12 +20,12 @@
 
       if ( getValue('oct.mangler.odxt') == '' )
       then
-        out = out .. 'OCT o.dxt ' .. getValue('oct.thickness.odxt') .. ' µm\n'
+        out = out .. 'OCT o.dxt ' .. getValue('oct.tykkelse.odxt') .. ' µm\n'
       end
 
       if ( getValue('oct.mangler.osin') == '' )
       then
-        out = out .. 'OCT o.sin ' .. getValue('oct.thickness.osin') .. ' µm\n'
+        out = out .. 'OCT o.sin ' .. getValue('oct.tykkelse.osin') .. ' µm\n'
       end
 
     end
@@ -48,11 +48,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -68,11 +68,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -120,7 +120,7 @@
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  <label caption="Tykkelse:"/>
-	  <lineedit name="oct.thickness.odxt" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	  <lineedit name="oct.tykkelse.odxt" regexp="\d{1,5}" script="lt10000gt0" value=""/>
 	  <label caption="µm"/>
 	</frame>
       </frame>
@@ -133,7 +133,7 @@
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  <label caption="Tykkelse:"/>
-	  <lineedit name="oct.thickness.osin" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	  <lineedit name="oct.tykkelse.osin" regexp="\d{1,5}" script="lt10000gt0" value=""/>
 	  <label caption="µm"/>
 	</frame>
 	
diff --git a/server/xml/macros/oejendrypning-1.0.xml b/server/xml/macros/oejendrypning-1.0.xml
index a9dc6e7..c3f61a3 100644
--- a/server/xml/macros/oejendrypning-1.0.xml
+++ b/server/xml/macros/oejendrypning-1.0.xml
@@ -15,8 +15,8 @@
   <resume language="lua">
     out = 'I henhold til øjenafdelingens retningslinier dryppes der med:\n'
     out = out .. getValue('ocgtt.preparation') .. '\n'
-    out = out .. 'Drypning er foretaget af: ' .. getValue('ocgtt.initials')
-          .. ', den ' .. os.date('%e. %b %Y %k:%M', tonumber(getValue('ocgtt.date')))
+    out = out .. 'Drypning er foretaget af: ' .. getValue('ocgtt.initialer')
+          .. ', den ' .. os.dato('%e. %b %Y %k:%M', tonumber(getValue('ocgtt.dato')))
     return out
 </resume>
   <queries>
@@ -62,9 +62,9 @@
 
     <frame layout="hbox">
       <label width="200" caption="Drypning foretaget af (initialer):"/>
-      <lineedit name="ocgtt.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
+      <lineedit name="ocgtt.initialer" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
       <label width="50" caption=" den "/>
-      <datetime name="ocgtt.date" fuzziness="5" map="now" value=""/>
+      <datetime name="ocgtt.dato" fuzziness="5" map="now" value=""/>
     </frame>
 
     <!-- Knapper -->
diff --git a/server/xml/macros/oejentryk-1.0.xml b/server/xml/macros/oejentryk-1.0.xml
index fb6cca4..5bba613 100644
--- a/server/xml/macros/oejentryk-1.0.xml
+++ b/server/xml/macros/oejentryk-1.0.xml
@@ -22,17 +22,17 @@
 
     if ( getValue('tonometer.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('tonometer.pressure.odxt') .. ' mmHg\n'
+      out = out .. 'o.dxt: ' .. getValue('tonometer.tryk.odxt') .. ' mmHg\n'
     end
 
     if ( getValue('tonometer.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('tonometer.pressure.odxt') .. ' mmHg\n'
+      out = out .. 'o.sin: ' .. getValue('tonometer.tryk.odxt') .. ' mmHg\n'
     end
 
     if ( getValue('tonometer.mangler.odxt') == '' or getValue('tonometer.mangler.osin') == '' )
     then
-      out = out .. getValue('tonometer.device') .. '.\n'
+      out = out .. getValue('tonometer.apparat') .. '.\n'
     end
 
     return out
@@ -53,11 +53,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -73,11 +73,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -147,7 +147,7 @@
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometer.pressure.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometer.tryk.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -162,7 +162,7 @@
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometer.pressure.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometer.tryk.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -172,7 +172,7 @@
 
     <frame name="device_frame" layout="vbox">
       <label caption="Tonometer måling foretaget med:"/>
-      <combobox name="tonometer.device" value="">
+      <combobox name="tonometer.apparat" value="">
 	<item caption="Applanationstonometer" value="Appl"/>
 	<item caption="Lufttonometer" value="Luft"/>
       </combobox>
diff --git a/server/xml/macros/pupilstoerrelse-1.0.xml b/server/xml/macros/pupilstoerrelse-1.0.xml
index 0eb7fd1..a5f5134 100644
--- a/server/xml/macros/pupilstoerrelse-1.0.xml
+++ b/server/xml/macros/pupilstoerrelse-1.0.xml
@@ -4,7 +4,7 @@
     out = ''
     if ( getValue('pupilstoerrelse.mangler.odxt') == '' or getValue('pupilstoerrelse.mangler.osin') == '' )
     then
-      out = out .. 'Pupilstørrelse, ' .. getValue('pupilstoerrelse.method') .. ':\n'
+      out = out .. 'Pupilstørrelse, ' .. getValue('pupilstoerrelse.metode') .. ':\n'
     end
 
     if ( getValue('pupilstoerrelse.mangler.odxt') == '' )
@@ -33,11 +33,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -53,11 +53,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -141,7 +141,7 @@
 
     <frame name="device_frame" layout="vbox">
       <label caption="Måling foretaget med:"/>
-      <combobox name="pupilstoerrelse.method" value="">
+      <combobox name="pupilstoerrelse.metode" value="">
 	<item caption="Fotografisk pupillometer" value="Fotografisk pupillometer"/>
 	<item caption="NIDEK pupillometer" value="NIDEK pupillometer"/>
       </combobox>
diff --git a/server/xml/macros/ref-spaltelampe-1.0.xml b/server/xml/macros/ref-spaltelampe-1.0.xml
index 95866fe..2986033 100644
--- a/server/xml/macros/ref-spaltelampe-1.0.xml
+++ b/server/xml/macros/ref-spaltelampe-1.0.xml
@@ -216,11 +216,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -236,11 +236,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/ref_90d_linse-1.0.xml b/server/xml/macros/ref_90d_linse-1.0.xml
index 43576e3..523cbff 100644
--- a/server/xml/macros/ref_90d_linse-1.0.xml
+++ b/server/xml/macros/ref_90d_linse-1.0.xml
@@ -60,11 +60,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -80,11 +80,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/ref_aktuelle-1.0.xml b/server/xml/macros/ref_aktuelle-1.0.xml
index 98e12f4..2fc4d4f 100644
--- a/server/xml/macros/ref_aktuelle-1.0.xml
+++ b/server/xml/macros/ref_aktuelle-1.0.xml
@@ -2,13 +2,13 @@
 <macro name="ref_aktuelle" version="1.0">
   <resume language="lua">
     out = ''
-    out = out .. 'Patienten anvender ' .. getValue('ref_aktuelle.currently_use') .. '.\n'
-    out = out .. 'Brillestyrken har været stabil i ' .. getValue('ref_aktuelle.stability') .. '. '
-    if ( getValue('ref_aktuelle.further_comments') ~= '' )
+    out = out .. 'Patienten anvender ' .. getValue('ref_aktuelle.bruger_nu') .. '.\n'
+    out = out .. 'Brillestyrken har været stabil i ' .. getValue('ref_aktuelle.stabilitet') .. '. '
+    if ( getValue('ref_aktuelle.yderligere_kommentarer') ~= '' )
     then
-      out = out .. getValue('ref_aktuelle.further_comments') .. '. '
+      out = out .. getValue('ref_aktuelle.yderligere_kommentarer') .. '. '
     end
-    out = out .. 'Såfremt det er muligt at operere, forventer patienten ' .. getValue('ref_aktuelle.expectations') .. '.'
+    out = out .. 'Såfremt det er muligt at operere, forventer patienten ' .. getValue('ref_aktuelle.forventninger') .. '.'
     return out
   </resume>
   <queries>
@@ -21,7 +21,7 @@
     <frame layout="hbox">
       <frame layout="vbox">
 	<label caption="Patienten benytter:"/>
-	<combobox name="ref_aktuelle.currently_use" layout="vbox">
+	<combobox name="ref_aktuelle.bruger_nu" layout="vbox">
 	  <item caption="Briller" value="Briller"/>
 	  <item caption="Hårde kontaktlinser" value="hårde kontaktlinser"/>
 	  <item caption="Bløde kontaktlinser" value="bløde kontaktlinser"/>
@@ -30,7 +30,7 @@
       </frame>
       <frame layout="vbox">
 	<label caption="Brillestyrken har været stabil i:"/>
-	<combobox name="ref_aktuelle.stability" layout="vbox">
+	<combobox name="ref_aktuelle.stabilitet" layout="vbox">
 	  <item caption="Under ½ år" value="under ½ år"/>
 	  <item caption="½ år" value="½ år"/>
 	  <item caption="1 år" value="1 år"/>
@@ -39,9 +39,9 @@
       </frame>
     </frame>
     <label caption="Yderligere kommentarer:"/>
-    <textedit name="ref_aktuelle.further_comments"/>
+    <textedit name="ref_aktuelle.yderligere_kommentarer"/>
     <label caption="Såfremt det er muligt at operere, forventer patienten:"/>
-    <altcombobox name="ref_aktuelle.expectations" layout="vbox">
+    <altcombobox name="ref_aktuelle.forventninger" layout="vbox">
       <item caption="At kunne undvære briller eller kontaktlinser" value="at kunne undvære briller eller kontaktlinser"/>
       <item caption="At brillestyrken reduceres" value="at brillestyrken reduceres"/>
       <altitem caption="Andet" value="andet" innerwidget="expectations_andet">
diff --git a/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml b/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
index a0e6803..a35e2c8 100644
--- a/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
+++ b/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
@@ -6,9 +6,9 @@
 
     if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'LASIK' )
     then
-      out = out .. 'LASIK flappen skæres med ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.method') .. '.\n'
+      out = out .. 'LASIK flappen skæres med ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.metode') .. '.\n'
 
-      if ( getValue('ref_behandling.kirurgisk_procedure.lasik.method') == 'femtosekundlaser' )
+      if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'femtosekundlaser' )
       then
         out = out .. 'Flapdiameter: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.flapdiameter') .. ' mm\n'
         out = out .. 'Flaptykkelse: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.flaptykkelse') .. ' um\n'
@@ -142,7 +142,7 @@
       return true
     </script>
     <script language="lua" name="femtosekundlaser_check">
-      if ( getValue('ref_behandling.kirurgisk_procedure.lasik.method') == 'femtosekundlaser' )
+      if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'femtosekundlaser' )
       then
         enable('femtosekundlaser')
       else
@@ -297,7 +297,7 @@
     <!-- LASIK frame -->
       <frame name="lasik_frame1" caption="LASIK" layout="vbox">
 	<label caption="LASIK flappen skæres med:"/>
-	<altcombobox name="ref_behandling.kirurgisk_procedure.lasik.method" value="" layout="vbox" script="femtosekundlaser_check">
+	<altcombobox name="ref_behandling.kirurgisk_procedure.lasik.metode" value="" layout="vbox" script="femtosekundlaser_check">
 	  <item caption="Ikke udfyldt" value=""/>
 	  <item caption="Moria M2 90 SU" value="Moria M2 90 SU"/>
 	  <item caption="Moria M2 130" value="Moria M2 130"/>
diff --git a/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml b/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml
index 58f773e..1eeecc0 100644
--- a/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml
+++ b/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml
@@ -19,9 +19,9 @@
     then
     out = out .. 'Tilfredshed: ' .. getValue('ref_efterkontrol-aktuelle.tilfredshed') .. '\n'
     end
-    if ( getValue('ref_efterkontrol-aktuelle.other_comments') ~= '' )
+    if ( getValue('ref_efterkontrol-aktuelle.andet_comments') ~= '' )
     then
-      out = out .. getValue('ref_efterkontrol-aktuelle.other_comments')
+      out = out .. getValue('ref_efterkontrol-aktuelle.andet_comments')
     end
     return out
   </resume>
@@ -77,7 +77,7 @@
 	<item caption="Meget tilfreds" value="Meget tilfreds"/>
       </combobox>
       <label caption="Øvrige kommentarer:"/>
-      <textedit name="ref_efterkontrol-aktuelle.other_comments"/>
+      <textedit name="ref_efterkontrol-aktuelle.andet_comments"/>
     </frame>
     
     <!-- Knapper -->
diff --git a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
index 8c005f2..0d885aa 100644
--- a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
+++ b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
@@ -2,8 +2,8 @@
 <macro name="ref_efterkontrol.overskrift" version="1.0">
   <resume language="lua">
     out = ''
-    out = out .. 'Refraktiv kirurgi ' .. getValue('ref_efterkontrol.overskrift.type') .. ' efterkontrol efter ' .. getValue('ref_efterkontrol.overskrift.months')
-    if ( getValue('ref_efterkontrol.overskrift.months') == '1' )
+    out = out .. 'Refraktiv kirurgi ' .. getValue('ref_efterkontrol.overskrift.type') .. ' efterkontrol efter ' .. getValue('ref_efterkontrol.overskrift.maaneder')
+    if ( getValue('ref_efterkontrol.overskrift.maaneder') == '1' )
     then
       out = out .. ' måned påbegyndes.'
     else
@@ -32,7 +32,7 @@
     </frame>
     <frame layout="hbox">
       <label caption="Seneste besøg for"/>
-      <lineedit name="ref_efterkontrol.overskrift.months"/>
+      <lineedit name="ref_efterkontrol.overskrift.maaneder"/>
       <label caption="måneder siden."/>
       <spacer/>
     </frame>
diff --git a/server/xml/macros/spaltelampe-1.0.xml b/server/xml/macros/spaltelampe-1.0.xml
index 4a3b76e..6b2128b 100644
--- a/server/xml/macros/spaltelampe-1.0.xml
+++ b/server/xml/macros/spaltelampe-1.0.xml
@@ -14,26 +14,26 @@
 <macro name="spaltelampe" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('slit_lamp.mangler.odxt') == '' or  getValue('slit_lamp.mangler.osin') == '' )
+    if ( getValue('spaltelampe.mangler.odxt') == '' or  getValue('spaltelampe.mangler.osin') == '' )
     then
       out = out .. 'Spl:\n'
     end
 
-    if ( getValue('slit_lamp.mangler.odxt') == '' )
+    if ( getValue('spaltelampe.mangler.odxt') == '' )
     then
-      out = out .. 'Linsen, højre side: ' .. getValue('slit_lamp.observation.odxt') .. '\n'
-      if ( getValue('slit_lamp.yderligere.odxt') ~= '' )
+      out = out .. 'Linsen, højre side: ' .. getValue('spaltelampe.observation.odxt') .. '\n'
+      if ( getValue('spaltelampe.yderligere.odxt') ~= '' )
       then
-        out = out .. 'Supplerende:\n' .. getValue('slit_lamp.yderligere.odxt') .. '\n'
+        out = out .. 'Supplerende:\n' .. getValue('spaltelampe.yderligere.odxt') .. '\n'
       end
     end
 
-    if ( getValue('slit_lamp.mangler.osin') == '' )
+    if ( getValue('spaltelampe.mangler.osin') == '' )
     then
-      out = out .. 'Linsen, venstre side: ' .. getValue('slit_lamp.observation.osin') .. '\n'
-      if ( getValue('slit_lamp.yderligere.osin') ~= '' )
+      out = out .. 'Linsen, venstre side: ' .. getValue('spaltelampe.observation.osin') .. '\n'
+      if ( getValue('spaltelampe.yderligere.osin') ~= '' )
       then
-        out = out .. 'Supplerende:\n' .. getValue('slit_lamp.yderligere.osin') .. '\n'
+        out = out .. 'Supplerende:\n' .. getValue('spaltelampe.yderligere.osin') .. '\n'
       end
     end
 
@@ -55,11 +55,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -75,11 +75,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -113,7 +113,7 @@
       <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.dxt"
-		  name="slit_lamp.mangler.odxt" script="right_eye"
+		  name="spaltelampe.mangler.odxt" script="right_eye"
 		  map="missing_eye_odxt_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
@@ -123,7 +123,7 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="slit_lamp.observation.odxt" layout="vbox" value="Ingen katarakt">
+	      <altcombobox name="spaltelampe.observation.odxt" layout="vbox" value="Ingen katarakt">
 		<item caption="Ingen katarakt" value="Ingen katarakt"/>
 		<item caption="Katarakt grad 1" value="Katarakt grad 1"/>
 		<item caption="Katarakt grad 2" value="Katarakt grad 2"/>
@@ -137,14 +137,14 @@
 	    </frame>
 	  </frame>
 	  <label caption="Supplerende:"/>
-	  <textedit name="slit_lamp.yderligere.odxt" value=""/>
+	  <textedit name="spaltelampe.yderligere.odxt" value=""/>
 	</frame>
       </frame>
 
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="slit_lamp.mangler.osin" script="left_eye"
+		  name="spaltelampe.mangler.osin" script="left_eye"
 		  map="missing_eye_osin_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.sin" layout="vbox">
@@ -154,7 +154,7 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="slit_lamp.observation.osin" layout="vbox" value="Ingen katarakt">
+	      <altcombobox name="spaltelampe.observation.osin" layout="vbox" value="Ingen katarakt">
 		<item caption="Ingen katarakt" value="Ingen katarakt"/>
 		<item caption="Katarakt grad 1" value="Katarakt grad 1"/>
 		<item caption="Katarakt grad 2" value="Katarakt grad 2"/>
@@ -168,7 +168,7 @@
 	    </frame>
 	  </frame>
 	  <label caption="Supplerende:"/>
-	  <textedit name="slit_lamp.yderligere.osin" value=""/>
+	  <textedit name="spaltelampe.yderligere.osin" value=""/>
 	</frame>
       </frame>
 
diff --git a/server/xml/macros/spaltelampe-template-1.0.xml b/server/xml/macros/spaltelampe-template-1.0.xml
index a983226..db22dc5 100644
--- a/server/xml/macros/spaltelampe-template-1.0.xml
+++ b/server/xml/macros/spaltelampe-template-1.0.xml
@@ -216,11 +216,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -236,11 +236,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/subjektiv_evaluering-1.0.xml b/server/xml/macros/subjektiv_evaluering-1.0.xml
index 299558d..5c1b50e 100644
--- a/server/xml/macros/subjektiv_evaluering-1.0.xml
+++ b/server/xml/macros/subjektiv_evaluering-1.0.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <macro name="subjektiv_evaluering" version="1.0">
-  <resume>Subjektivt er symptomerne ${amd.subjective_evaluation}.</resume>
+  <resume>Subjektivt er symptomerne ${amd.subjektiv_evaluering}.</resume>
   <queries>
   </queries>
   <maps>
@@ -12,7 +12,7 @@
 
     <label caption="Subjektivt er symptomerne:"/>
 
-    <combobox name="amd.subjective_evaluation" value="">
+    <combobox name="amd.subjektiv_evaluering" value="">
       <item caption="Bedret" value="bedret"/>
       <item caption="Uændret" value="uændret"/>
       <item caption="Forværret" value="forværret"/>
diff --git a/server/xml/macros/tidligere_alment-1.0.xml b/server/xml/macros/tidligere_alment-1.0.xml
index 86cfe21..02f64c4 100644
--- a/server/xml/macros/tidligere_alment-1.0.xml
+++ b/server/xml/macros/tidligere_alment-1.0.xml
@@ -9,7 +9,7 @@
   -->
 <macro name="tidligere_alment" version="1.0">
   <resume>Tidligere alment:
-${previous_common_diseases}</resume>
+${tidligere_almene_sygdomme}</resume>
   <queries>
   </queries>
   <maps>
@@ -19,7 +19,7 @@ ${previous_common_diseases}</resume>
   <widgets caption="Tidligere alment (B.1.3)"
           layout="vbox">
 
-    <altcombobox name="previous_common_diseases" layout="vbox" value="Intet relevant">
+    <altcombobox name="tidligere_almene_sygdomme" layout="vbox" value="Intet relevant">
       <item caption="Intet relevant" value="Intet relevant"/>
       <altitem caption="Anfør detaljer" value="detaljer" innerwidget="detaljer" layout="vbox">
 	<label caption="Udfyld detaljer:"/>
diff --git a/server/xml/macros/tidligere_oejensygdomme-1.0.xml b/server/xml/macros/tidligere_oejensygdomme-1.0.xml
index f86bd94..753b35c 100644
--- a/server/xml/macros/tidligere_oejensygdomme-1.0.xml
+++ b/server/xml/macros/tidligere_oejensygdomme-1.0.xml
@@ -13,7 +13,7 @@
   -->
 <macro name="tidligere_oejensygdomme" version="1.0">
   <resume>Tidligere øjensygdomme:
-${previous_eye_diseases}
+${tidligere_oejensygdomme}
 ${missing_eye_odxt}
 ${missing_eye_osin}</resume>
   <queries>
@@ -25,7 +25,7 @@ ${missing_eye_osin}</resume>
   <widgets caption="Tidligere øjensygdomme (B.2.1.2)"
           layout="vbox">
 
-    <altcombobox name="previous_eye_diseases" value="Ingen relevante" layout="vbox">
+    <altcombobox name="tidligere_oejensygdomme" value="Ingen relevante" layout="vbox">
       <item caption="Ingen relevante" value="Ingen relevante"/>
       <altitem caption="Anfør detaljer" value="detaljer" innerwidget="detaljer" layout="vbox">
 	<label caption="Udfyld detaljer:"/>
diff --git a/server/xml/macros/tobaksrygning-1.0.xml b/server/xml/macros/tobaksrygning-1.0.xml
index 64c6251..83c01e7 100644
--- a/server/xml/macros/tobaksrygning-1.0.xml
+++ b/server/xml/macros/tobaksrygning-1.0.xml
@@ -5,7 +5,7 @@
   -->
 <macro name="tobaksrygning" version="1.0">
   <resume>Tobaksrygning:
-${tobacco}</resume>
+${tobak.forbrug}</resume>
   <queries>
   </queries>
   <maps>
@@ -15,7 +15,7 @@ ${tobacco}</resume>
   <widgets caption="Tobaksrygning (B.2.1.1)"
           layout="vbox">
 
-    <altcombobox name="tobacco" value="Har aldrig røget" layout="vbox"
+    <altcombobox name="tobak.forbrug" value="Har aldrig røget" layout="vbox"
 		 help="En enhed kan være cigaret, cerut, cigar, pibestop eller tilsvarende.">
       <item caption="Har aldrig røget" value="Har aldrig røget"/>
       <item caption="Har røget tidligere" value="Har røget tidligere"/>
diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml
index 7cf9d0e..c2f9fca 100644
--- a/server/xml/macros/tonometri-1.0.xml
+++ b/server/xml/macros/tonometri-1.0.xml
@@ -4,17 +4,17 @@
     out = ''
     if ( getValue('tonometri.mangler.odxt') == '' or getValue('tonometri.mangler.osin') == '' )
     then
-      out = out .. getValue('tonometri.method') .. ':\n'
+      out = out .. getValue('tonometri.metode') .. ':\n'
     end
 
     if ( getValue('tonometri.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('tonometri.pressure.odxt') .. ' mmHg\n'
+      out = out .. 'o.dxt: ' .. getValue('tonometri.tryk.odxt') .. ' mmHg\n'
     end
 
     if ( getValue('tonometri.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('tonometri.pressure.osin') .. ' mmHg\n'
+      out = out .. 'o.sin: ' .. getValue('tonometri.tryk.osin') .. ' mmHg\n'
     end
 
     return out
@@ -35,11 +35,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -55,11 +55,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
@@ -129,7 +129,7 @@
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometri.pressure.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometri.tryk.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -144,7 +144,7 @@
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometri.pressure.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometri.tryk.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -154,7 +154,7 @@
 
     <frame name="device_frame" layout="vbox">
       <label caption="Tonometri foretaget med:"/>
-      <combobox name="tonometri.method" value="">
+      <combobox name="tonometri.metode" value="">
 	<item caption="Lufttonometri" value="Lufttonometri"/>
 	<item caption="Applanationstonometri" value="Applanationstonometri"/>
 	<item caption="Eye Care tonometri" value="Eye Care tonometri"/>
diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml
index 7eedcfa..1396540 100644
--- a/server/xml/macros/topografi-1.0.xml
+++ b/server/xml/macros/topografi-1.0.xml
@@ -4,17 +4,17 @@
     out = ''
     if ( getValue('topografi.mangler.odxt') == '' or getValue('topografi.mangler.osin') == '' )
     then
-      out = out .. 'Topografi, ' .. getValue('topografi.method') .. ':\n'
+      out = out .. 'Topografi, ' .. getValue('topografi.metode') .. ':\n'
     end
 
     if ( getValue('topografi.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('topografi.judgement.odxt') .. '\n'
+      out = out .. 'o.dxt: ' .. getValue('topografi.bedoemmelse.odxt') .. '\n'
     end
 
     if ( getValue('topografi.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('topografi.judgement.osin') .. '\n'
+      out = out .. 'o.sin: ' .. getValue('topografi.bedoemmelse.osin') .. '\n'
     end
 
     return out
@@ -84,7 +84,7 @@
           layout="vbox">
 
     <label caption="Metode:"/>
-    <altcombobox name="topografi.method" value="Pentacam" layout="vbox">
+    <altcombobox name="topografi.metode" value="Pentacam" layout="vbox">
       <item caption="Pentacam" value="Pentacam"/>
       <item caption="Atlas" value="Atlas"/>
       <item caption="Atlas og Pentacam" value="Atlas og Pentacam"/>
@@ -107,7 +107,7 @@
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  
 	  <frame layout="vbox">
-	    <altcombobox name="topografi.judgement.odxt" layout="vbox">
+	    <altcombobox name="topografi.bedoemmelse.odxt" layout="vbox">
 	      <item caption="Symmetrisk cornea" value="Symmetrisk cornea"/>
 	      <item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
 	      <item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
@@ -135,7 +135,7 @@
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 
 	  <frame layout="vbox">
-	    <altcombobox name="topografi.judgement.osin" layout="vbox">
+	    <altcombobox name="topografi.bedoemmelse.osin" layout="vbox">
 	      <item caption="Symmetrisk cornea" value="Symmetrisk cornea"/>
 	      <item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
 	      <item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 9319005..71d6b13 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -70,11 +70,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -90,11 +90,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/visus-autoref-1.0.xml b/server/xml/macros/visus-autoref-1.0.xml
index b64e476..6d19cc1 100644
--- a/server/xml/macros/visus-autoref-1.0.xml
+++ b/server/xml/macros/visus-autoref-1.0.xml
@@ -102,11 +102,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -122,11 +122,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/visus-egen_korr-1.0.xml b/server/xml/macros/visus-egen_korr-1.0.xml
index 4f4d29f..fef6f3c 100644
--- a/server/xml/macros/visus-egen_korr-1.0.xml
+++ b/server/xml/macros/visus-egen_korr-1.0.xml
@@ -162,11 +162,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -182,11 +182,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 35236f6..974b888 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -162,11 +162,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -182,11 +182,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index 1e6cb13..7c9c3ca 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -182,11 +182,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -202,11 +202,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml
index 05d0d39..e60e031 100644
--- a/server/xml/macros/visus-uden_korr-1.0.xml
+++ b/server/xml/macros/visus-uden_korr-1.0.xml
@@ -142,11 +142,11 @@
         then
           value = ''
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_odxt.timestamp
-          source = missing_eye_odxt.source
+          source = missing_eye_odxt.kilde
         end
       end
       return value, timestamp, source
@@ -162,11 +162,11 @@
         then
           value = ''
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         else
           value = 'mangler'
           timestamp = missing_eye_osin.timestamp
-          source = missing_eye_osin.source
+          source = missing_eye_osin.kilde
         end
       end
       return value, timestamp, source
diff --git a/server/xml/macros/vurdering_af_fundus-1.0.xml b/server/xml/macros/vurdering_af_fundus-1.0.xml
index f7ca475..e76a81c 100644
--- a/server/xml/macros/vurdering_af_fundus-1.0.xml
+++ b/server/xml/macros/vurdering_af_fundus-1.0.xml
@@ -7,19 +7,19 @@
 <macro name="vurdering_af_fundus" version="1.0">
   <resume language="lua">
     out = '90-D undersøgelse:\nDer findes '
-    if(getValue('fundus.randh') == '' and getValue('fundus.exsud') == '')
+    if(getValue('fundus.randhaemorrhagier') == '' and getValue('fundus.exsudater') == '')
     then
       out = out .. 'ingen randhæmorrhagier eller exsudater'
     else
-      if(getValue('fundus.randh') ~= '' and getValue('fundus.exsud') ~= '')
+      if(getValue('fundus.randhaemorrhagier') ~= '' and getValue('fundus.exsudater') ~= '')
       then
         out = out .. 'randhæmorrhagier og exsudater'
       else
-        if(getValue('fundus.randh') ~= '')
+        if(getValue('fundus.randhaemorrhagier') ~= '')
         then
           out = out .. 'randhæmorrhagier, men ingen exsudater'
         end
-        if(getValue('fundus.exsud') ~= '')
+        if(getValue('fundus.exsudater') ~= '')
         then
           out = out .. 'ingen randhæmorrhagier, men exsudater'
         end
@@ -37,16 +37,16 @@
   <widgets caption="Vurdering af fundus (B.2.5)"
           layout="vbox">
 
-    <combobox name="fundus.source" value="">
+    <combobox name="fundus.kilde" value="">
       <item caption="Fundus foto" value="Fundus foto"/>
       <item caption="90-D linse undersøgelse" value="90-D linse undersøgelse"/>
     </combobox>
 
     <label caption="viser"/>
 
-    <checkbox name="fundus.randh" caption="Randhæmorrhagier"
+    <checkbox name="fundus.randhaemorrhagier" caption="Randhæmorrhagier"
 	      truevalue="Randhæmorrhagier" falsevalue="" value=""/>
-    <checkbox name="fundus.exsud" caption="Exsudater"
+    <checkbox name="fundus.exsudater" caption="Exsudater"
 	      truevalue="Exsudater" falsevalue="" value=""/>
 
     <!-- Knapper -->
diff --git a/server/xml/macros/yderligere_diagnostik-1.0.xml b/server/xml/macros/yderligere_diagnostik-1.0.xml
index dc6c3c7..eab7421 100644
--- a/server/xml/macros/yderligere_diagnostik-1.0.xml
+++ b/server/xml/macros/yderligere_diagnostik-1.0.xml
@@ -5,7 +5,7 @@
   -->
 <macro name="yderligere_diagnostik" version="1.0">
   <resume>${amd_preop.konklusion. ${amd_preop.konklusion.oeje}
-${amd_preop.konklusion.yderligere}${amd_preop.konklusion.terminated}.</resume>
+${amd_preop.konklusion.yderligere}${amd_preop.konklusion.afsluttes}.</resume>
   <queries>
   </queries>
   <maps>
@@ -14,7 +14,7 @@ ${amd_preop.konklusion.yderligere}${amd_preop.konklusion.terminated}.</resume>
     <script language="lua" name="afsluttes">
       if value == 'Der findes ingen indikation for yderligere udredning af AMD.'
       then
-        setValue('amd_preop.konklusion.terminated', ' - Afsluttes')
+        setValue('amd_preop.konklusion.afsluttes', ' - Afsluttes')
       end
       return true
     </script>
@@ -44,7 +44,7 @@ ${amd_preop.konklusion.yderligere}${amd_preop.konklusion.terminated}.</resume>
       </frame>
       <label caption="Supplerende:"/>
       <textedit name="amd_preop.konklusion.yderligere" value=""/>
-      <checkbox caption="Afsluttes" name="amd_preop.konklusion.terminated"
+      <checkbox caption="Afsluttes" name="amd_preop.konklusion.afsluttes"
 		truevalue=" - Afsluttes" falsevalue="" value=""/>
     </frame>
     
-- 
cgit v1.2.3