diff --git a/src/tmltranslator/ctranslator/Buffer.java b/src/tmltranslator/ctranslator/Buffer.java
index fc5ce337fe956a325f6af8b1cacbb87de23584e0..8f4dddb67d1970ccc0bbe5abd59a4bc56fdb26e1 100755
--- a/src/tmltranslator/ctranslator/Buffer.java
+++ b/src/tmltranslator/ctranslator/Buffer.java
@@ -53,6 +53,8 @@ import tmltranslator.*;
 
 public class Buffer	{
 
+	public static final String[] bufferTypesList = { "FEP buffer", "MAPPER buffer", "ADAIF buffer", "INTERLEAVER Buffer", "MAIN MEMORY buffer" };
+
 	public String CR = "\n";
 	public String TAB = "\t";
 	public String TAB2 = "\t\t";
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index ff9a0be4cfd208f27424784fb37db310414344e8..e957d40c7d98aabe5431239caf3d9760f87f90d0 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -53,8 +53,8 @@ import javax.swing.*;
 import java.util.*;
 
 import ui.*;
-
 import ui.tmldd.*;
+import tmltranslator.ctranslator.*;
 
 
 public class JDialogMemoryNode extends javax.swing.JDialog implements ActionListener  {
@@ -75,7 +75,6 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
 		//Panel3: code generation
 		protected int bufferType = 0;	//it is the index in the ArrayList of String
 		protected JComboBox bufferTypesCB;
-		protected Vector<String> bufferTypesListS = new Vector<String>();
     
     // Main Panel
     private JButton closeButton;
@@ -122,11 +121,6 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
         panel3.setLayout(gridbag3);
         panel3.setBorder(new javax.swing.border.TitledBorder("Code generation"));
         panel3.setPreferredSize(new Dimension(300, 200));
-				bufferTypesListS.add( "FepBuffer" );
-				bufferTypesListS.add( "MapperBuffer" );
-				bufferTypesListS.add( "AdaifBuffer" );
-				bufferTypesListS.add( "InterleaverBuffer" );
-				bufferTypesListS.add( "MainMemoryBuffer" );
         
 		c1.gridwidth = 1;
         c1.gridheight = 1;
@@ -164,7 +158,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
         c3.weightx = 1.0;
   		  panel3.add(new JLabel("Buffer type:"), c3);
 	    	c3.gridwidth = GridBagConstraints.REMAINDER; //end row
-    		bufferTypesCB = new JComboBox( bufferTypesListS );
+    		bufferTypesCB = new JComboBox( new Vector<String>( Arrays.asList( Buffer.bufferTypesList ) ) );
 				bufferTypesCB.setSelectedIndex( bufferType  );
 				panel3.add( bufferTypesCB, c3 );
         
diff --git a/src/ui/window/JDialogPortArtifact.java b/src/ui/window/JDialogPortArtifact.java
index a67b992911645bcdee30394dd741018d72594964..274fff872189de4d84985ba4ad87a16377ec550f 100755
--- a/src/ui/window/JDialogPortArtifact.java
+++ b/src/ui/window/JDialogPortArtifact.java
@@ -130,7 +130,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
 
         panel3 = new JPanel();
         panel3.setLayout(gridbag2);
-        panel3.setBorder(new javax.swing.border.TitledBorder("Buffer attributes"));
+        panel3.setBorder(new javax.swing.border.TitledBorder("Code generation: buffer attributes"));
         panel3.setPreferredSize(new Dimension(650, 350));
         
 		c1.gridwidth = 1;