diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java
index a78933a..fd045c0 100644
--- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java
@@ -15,7 +15,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedExcep
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
 import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistTargetColumn;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.DefNewColumn;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnMockUp;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
@@ -213,10 +213,10 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements
 		// comboDefColumn
 		ExtractCodelistDefColumnPropertiesCombo props = GWT
 				.create(ExtractCodelistDefColumnPropertiesCombo.class);
-		ListStore<DefNewColumn> storeComboDefColumn = new ListStore<DefNewColumn>(
+		ListStore<ColumnMockUp> storeComboDefColumn = new ListStore<ColumnMockUp>(
 				props.id());
 
-		final ComboBox<DefNewColumn> comboDefColumn = new ComboBox<DefNewColumn>(
+		final ComboBox<ColumnMockUp> comboDefColumn = new ComboBox<ColumnMockUp>(
 				storeComboDefColumn, props.label());
 		Log.debug("ComboDefColumn created");
 
@@ -229,8 +229,8 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements
 			}
 
 			@Override
-			public void completedDefColumnCreation(DefNewColumn defNewColumn) {
-				comboDefColumn.setValue(defNewColumn, true);
+			public void completedDefColumnCreation(ColumnMockUp columnMockUp) {
+				comboDefColumn.setValue(columnMockUp, true);
 
 			}
 
@@ -272,10 +272,10 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements
 		// comboDefColumn
 		ExtractCodelistDefColumnPropertiesCombo props = GWT
 				.create(ExtractCodelistDefColumnPropertiesCombo.class);
-		ListStore<DefNewColumn> storeComboDefColumn = new ListStore<DefNewColumn>(
+		ListStore<ColumnMockUp> storeComboDefColumn = new ListStore<ColumnMockUp>(
 				props.id());
 
-		final ComboBox<DefNewColumn> comboDefColumn = new ComboBox<DefNewColumn>(
+		final ComboBox<ColumnMockUp> comboDefColumn = new ComboBox<ColumnMockUp>(
 				storeComboDefColumn, props.label());
 		comboDefColumn.setItemId(COMBO_DEF_COLUMN);
 
@@ -290,8 +290,8 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements
 			}
 
 			@Override
-			public void completedDefColumnCreation(DefNewColumn defNewColumn) {
-				comboDefColumn.setValue(defNewColumn, true);
+			public void completedDefColumnCreation(ColumnMockUp columnMockUp) {
+				comboDefColumn.setValue(columnMockUp, true);
 
 			}
 
@@ -509,9 +509,9 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements
 
 			if (connection == null) {
 				@SuppressWarnings("unchecked")
-				ComboBox<DefNewColumn> comboDefColumn = ((ComboBox<DefNewColumn>) fieldLabel
+				ComboBox<ColumnMockUp> comboDefColumn = ((ComboBox<ColumnMockUp>) fieldLabel
 						.getWidget());
-				DefNewColumn defNewColumn = comboDefColumn.getValue();
+				ColumnMockUp defNewColumn = comboDefColumn.getValue();
 				Log.debug("Retrieved: " + defNewColumn.toString());
 				ExtractCodelistTargetColumn extractCodelistTargetColumn = new ExtractCodelistTargetColumn(
 						colCurrent, defNewColumn);
@@ -531,9 +531,9 @@ public class TargetColumnsSelectionPanel extends FramedPanel implements
 
 				if (checkNew.getValue()) {
 					@SuppressWarnings("unchecked")
-					ComboBox<DefNewColumn> comboDefColumn = (ComboBox<DefNewColumn>) flowButton
+					ComboBox<ColumnMockUp> comboDefColumn = (ComboBox<ColumnMockUp>) flowButton
 							.getItemByItemId(COMBO_DEF_COLUMN);
-					DefNewColumn defNewColumn = comboDefColumn.getValue();
+					ColumnMockUp defNewColumn = comboDefColumn.getValue();
 					Log.debug("Retrieved: " + defNewColumn.toString());
 					ExtractCodelistTargetColumn extractCodelistTargetCol = new ExtractCodelistTargetColumn(
 							colCurrent, defNewColumn);