--- a/ch.sahits.codegen.java.gui/fragments/SWTGUI.java
+++ b/ch.sahits.codegen.java.gui/fragments/SWTGUI.java
@@ -30,7 +30,7 @@
 import ch.sahits.model.gui.IFormGroup;
 import ch.sahits.model.gui.IFormImageButton;
 import ch.sahits.model.gui.IFormInput;
-import ch.sahits.model.gui.IFormLable;
+import ch.sahits.model.gui.IFormLabel;
 import ch.sahits.model.gui.IFormList;
 import ch.sahits.model.gui.IFormPasswordInput;
 import ch.sahits.model.gui.IFormRadioButton;
@@ -85,7 +85,7 @@
 	 				}
 	 				case CHECK_BOX:{
 	 					IFormGroup grp = (IFormGroup)group.elements().get(1);
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					String name1 = guiHelper.toName(lbl);
 	 					List<IFormElement> ch = grp.elements();
 	 					String[] name2 = new String[ch.size()];
@@ -113,7 +113,7 @@
 	 					break;
 	 				}
 	 				case COMBO:{
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					IFormCombo combo =(IFormCombo)group.elements().get(1);
 	 					String name1 = guiHelper.toName(lbl);
 	 					String name2 = guiHelper.toName(combo);	 					
@@ -121,7 +121,7 @@
 	 					break;
 	 				}
 	 				case FILE_BROWSE:{
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					IFormFileUpload txt =(IFormFileUpload)group.elements().get(1);
 	 					String name1 = guiHelper.toName(lbl);
 	 					String name2 = guiHelper.toName(txt);
@@ -136,7 +136,7 @@
 	 					break;
 	 				}
 	 				case INPUT:{
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					IFormInput txt =(IFormInput)group.elements().get(1);
 	 					String name1 = guiHelper.toName(lbl);
 	 					String name2 = guiHelper.toName(txt);
@@ -144,7 +144,7 @@
 	 					break;	 					
 	 				}
 	 				case LIST:{
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					IFormList list =(IFormList)group.elements().get(1);
 	 					String name1 = guiHelper.toName(lbl);
 	 					String name2 = guiHelper.toName(list);
@@ -152,7 +152,7 @@
 	 					break;	 						 					
 	 				}
 	 				case PASSWORD:{
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					IFormPasswordInput txt =(IFormPasswordInput)group.elements().get(1);
 	 					String name1 = guiHelper.toName(lbl);
 	 					String name2 = guiHelper.toName(txt);
@@ -161,7 +161,7 @@
 	 				}
 	 				case RADIO_BUTTON:{
 	 					IFormGroup grp = (IFormGroup)group.elements().get(1);
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					String name1 = guiHelper.toName(lbl);
 	 					List<IFormElement> ch = grp.elements();
 	 					String[] name2 = new String[ch.size()];
@@ -199,7 +199,7 @@
 	 					break;
 	 				}
 	 				case TEXT:{
-	 					IFormLable lbl = (IFormLable) group.elements().get(0);
+	 					IFormLabel lbl = (IFormLabel) group.elements().get(0);
 	 					IFormInput txt =(IFormInput)group.elements().get(1);
 	 					String name1 = guiHelper.toName(lbl);
 	 					String name2 = guiHelper.toName(txt);
@@ -213,20 +213,20 @@
 		}
 	}
 	/**
-	 * Create a text input field with preceeding lable
-	 * @param parent container
-	 * @param lbl Lable field
+	 * Create a text input field with preceeding label
+	 * @param parent container
+	 * @param lbl Label field
 	 * @param txt Text input field
-	 * @param lableText text of the lable
-	 * @param lblVisibility is the lable visible
+	 * @param labelText text of the label
+	 * @param lblVisibility is the label visible
 	 * @param inputVisibility is the input field visible
 	 * @param inputEditable ist the input field enabled and editibla
 	 * @param inputTooltip tooltip of the input field may be null
 	 * @param inputText text of the input field may be null
 	 */
-	private void createInput(Composite parent,Label lbl, Text txt,String lableText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText){
-		lbl = new Label(parent,SWT.NULL);
-		lbl.setText(lableText);
+	private void createInput(Composite parent,Label lbl, Text txt,String labelText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText){
+		lbl = new Label(parent,SWT.NULL);
+		lbl.setText(labelText);
 		lbl.setVisible(lblVisibility);
 		txt = new Text(parent,SWT.BORDER | SWT.SINGLE);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -240,20 +240,20 @@
 			txt.setText(inputText);
 	}
 	/**
-	 * Create a text input field with preceeding lable
-	 * @param parent container
-	 * @param lbl Lable field
+	 * Create a text input field with preceeding label
+	 * @param parent container
+	 * @param lbl Label field
 	 * @param txt Text input field
-	 * @param lableText text of the lable
-	 * @param lblVisibility is the lable visible
+	 * @param labelText text of the label
+	 * @param lblVisibility is the label visible
 	 * @param inputVisibility is the input field visible
 	 * @param inputEditable ist the input field enabled and editibla
 	 * @param inputTooltip tooltip of the input field may be null
 	 * @param inputText text of the input field may be null
 	 */
-	private void createPassword(Composite parent,Label lbl, Text txt,String lableText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText){
-		lbl = new Label(parent,SWT.NULL);
-		lbl.setText(lableText);
+	private void createPassword(Composite parent,Label lbl, Text txt,String labelText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText){
+		lbl = new Label(parent,SWT.NULL);
+		lbl.setText(labelText);
 		lbl.setVisible(lblVisibility);
 		txt = new Text(parent,SWT.BORDER | SWT.PASSWORD);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -334,7 +334,7 @@
 	/**
 	 * Create checkboxes
 	 * @param parent container
-	 * @param lbl Lable field
+	 * @param lbl Label field
 	 * @param btn Array of Button fields
 	 * @param lblText Label text
 	 * @param text Array of texts of the buttons
@@ -379,7 +379,7 @@
 	/**
 	 * Create  radio Buttons
 	 * @param parent container
-	 * @param lbl Lable field
+	 * @param lbl Label field
 	 * @param btn Array of Button fields
 	 * @param lblText label text
 	 * @param text Array of texts of the buttons
@@ -425,21 +425,21 @@
 	}
 	
 	/**
-	 * Create a text input field with preceeding lable
-	 * @param parent container
-	 * @param lbl Lable field
+	 * Create a text input field with preceeding label
+	 * @param parent container
+	 * @param lbl Label field
 	 * @param list Combo field
-	 * @param lableText text of the lable
-	 * @param lblVisibility is the lable visible
+	 * @param labelText text of the label
+	 * @param lblVisibility is the label visible
 	 * @param inputVisibility is the input field visible
 	 * @param inputEditable ist the input field enabled and editibla
 	 * @param tooltip tooltip of the input field may be null
 	 * @param defaultSelection index of the default selection
 	 * @param elements List of all elements
 	 */
-	private void createCombo(Composite parent,Label lbl, Combo combo,String lableText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String tooltip, int defaultSelection,List<String> elements) {
-		lbl = new Label(parent,SWT.NULL);
-		lbl.setText(lableText);
+	private void createCombo(Composite parent,Label lbl, Combo combo,String labelText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String tooltip, int defaultSelection,List<String> elements) {
+		lbl = new Label(parent,SWT.NULL);
+		lbl.setText(labelText);
 		lbl.setVisible(lblVisibility);
 		combo = new Combo(parent,SWT.DROP_DOWN);
 		combo.setVisible(inputVisibility);
@@ -458,21 +458,21 @@
 	}
 	
 	/**
-	 * Create a text input field with preceeding lable
-	 * @param parent container
-	 * @param lbl Lable field
+	 * Create a text input field with preceeding label
+	 * @param parent container
+	 * @param lbl Label field
 	 * @param list txt Input field
 	 * @param btn Browse button
-	 * @param lableText text of the lable
-	 * @param lblVisibility is the lable visible
+	 * @param labelText text of the label
+	 * @param lblVisibility is the label visible
 	 * @param inputVisibility is the input field visible
 	 * @param inputEditable ist the input field enabled and editibla
 	 * @param inputTooltip tooltip of the input field may be null
 	 * @param inputText text of the input field may be null
 	 */
-	private void createFileBrowse(Composite parent,Label lbl,final Text txt, Button btn,String lableText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText,String btnText,final String[] fileTypes){
-		lbl = new Label(parent,SWT.NULL);
-		lbl.setText(lableText);
+	private void createFileBrowse(Composite parent,Label lbl,final Text txt, Button btn,String labelText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText,String btnText,final String[] fileTypes){
+		lbl = new Label(parent,SWT.NULL);
+		lbl.setText(labelText);
 		lbl.setVisible(lblVisibility);
 		Composite cont = new Composite(parent,SWT.NULL);
 		FillLayout fl = new FillLayout(SWT.HORIZONTAL);
@@ -518,21 +518,21 @@
 	
 	
 	/**
-	 * Create a text input field with preceeding lable
-	 * @param parent container
-	 * @param lbl Lable field
+	 * Create a text input field with preceeding label
+	 * @param parent container
+	 * @param lbl Label field
 	 * @param list List field
-	 * @param lableText text of the lable
-	 * @param lblVisibility is the lable visible
+	 * @param labelText text of the label
+	 * @param lblVisibility is the label visible
 	 * @param inputVisibility is the input field visible
 	 * @param inputEditable ist the input field enabled and editibla
 	 * @param tooltip tooltip of the input field may be null
 	 * @param elements List of all elements
 	 * @param multiselect selection of several elements allowed
 	 */
-	private void createList(Composite parent,Label lbl, org.eclipse.swt.widgets.List list,String lableText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String tooltip,List<String> elements,boolean multiselect) {
-		lbl = new Label(parent,SWT.NULL);
-		lbl.setText(lableText);
+	private void createList(Composite parent,Label lbl, org.eclipse.swt.widgets.List list,String labelText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String tooltip,List<String> elements,boolean multiselect) {
+		lbl = new Label(parent,SWT.NULL);
+		lbl.setText(labelText);
 		lbl.setVisible(lblVisibility);
 		if (multiselect){
 			list = new org.eclipse.swt.widgets.List(parent,SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
@@ -553,20 +553,20 @@
 		});
 	}	
 	/**
-	 * Create a text input field with preceeding lable
-	 * @param parent container
-	 * @param lbl Lable field
+	 * Create a text input field with preceeding label
+	 * @param parent container
+	 * @param lbl Label field
 	 * @param txt Text input field
-	 * @param lableText text of the lable
-	 * @param lblVisibility is the lable visible
+	 * @param labelText text of the label
+	 * @param lblVisibility is the label visible
 	 * @param inputVisibility is the input field visible
 	 * @param inputEditable ist the input field enabled and editibla
 	 * @param inputTooltip tooltip of the input field may be null
 	 * @param inputText text of the input field may be null
 	 */
-	private void createTextArea(Composite parent,Label lbl, Text txt,String lableText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText){
-		lbl = new Label(parent,SWT.NULL);
-		lbl.setText(lableText);
+	private void createTextArea(Composite parent,Label lbl, Text txt,String labelText, boolean lblVisibility, boolean inputVisibility,boolean inputEditable,String inputTooltip,String inputText){
+		lbl = new Label(parent,SWT.NULL);
+		lbl.setText(labelText);
 		lbl.setVisible(lblVisibility);
 		txt = new Text(parent,SWT.BORDER | SWT.WRAP| SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);