diff --git a/.classpath b/.classpath
index b43235b..3e9559a 100644
--- a/.classpath
+++ b/.classpath
@@ -23,23 +23,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/home/costantino/Downloads/gwt-2.7.0/gwt-user.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/costantino/Downloads/gwt-2.7.0/doc/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/home/costantino/Downloads/gwt-2.7.0/gwt-codeserver.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/costantino/Downloads/gwt-2.7.0/doc/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/home/costantino/Downloads/gwt-2.7.0/gwt-dev.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/costantino/Downloads/gwt-2.7.0/doc/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/home/costantino/Downloads/gwt-2.7.0/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="lib" path="/home/costantino/Downloads/gwt-2.7.0/validation-api-1.0.0.GA.jar" sourcepath="/home/costantino/Downloads/gwt-2.7.0/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry excluding="**" kind="src" output="${webappDirectory}/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/AddResourceToDataset.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/AddResourceToDataset.ui.xml
index d176f65..71f397c 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/AddResourceToDataset.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/AddResourceToDataset.ui.xml
@@ -58,7 +58,7 @@
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE" placeholder="http://example.com/image.jpg"
-							b:id="url" title="Dataset title" ui:field="resourceUrlTextBox" />
+							b:id="url" title="Product's title" ui:field="resourceUrlTextBox" />
 					</b:Controls>
 				</b:ControlGroup>
 
@@ -95,7 +95,7 @@
 			</b:Fieldset>
 		</b:Form>
 
-		<b:Button title="Go to dataset" ui:field="goToDatasetButton"
-			block="true" visible="true">Go to Dataset</b:Button>
+		<b:Button title="Go to Product" ui:field="goToDatasetButton"
+			block="true" visible="true">Go to Product</b:Button>
 	</g:HTMLPanel>
 </ui:UiBinder> 
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml
index 10df3af..41a25ed 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml
@@ -56,23 +56,23 @@
 					visible="false" ui:field="infoBlock" styleName="{style.block-alert-style}"></b:AlertBlock>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="title" title="Dataset title">
+					<b:ControlLabel for="title" title="Product title">
 						<font color="red">*</font>
 						Title :
 					</b:ControlLabel>
 					<b:Controls>
-						<b:TextBox alternateSize="LARGE" placeholder="Dataset title"
-							b:id="title" title="Dataset title" ui:field="titleTextBox" />
+						<b:TextBox alternateSize="LARGE" placeholder="Product title"
+							b:id="title" title="Product title" ui:field="titleTextBox" />
 					</b:Controls>
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="description" title="Dataset description">
+					<b:ControlLabel for="description" title="Product description">
 						Description:
 					</b:ControlLabel>
 					<b:Controls>
-						<b:TextArea placeholder="eg. Some useful notes about the data"
-							alternateSize="LARGE" b:id="description" title="Dataset description"
+						<b:TextArea placeholder="eg. Some useful notes about the product"
+							alternateSize="LARGE" b:id="description" title="Product description"
 							ui:field="descriptionTextarea"></b:TextArea>
 					</b:Controls>
 				</b:ControlGroup>
@@ -80,17 +80,17 @@
 				<!-- TAGS Panel -->
 
 				<b:ControlGroup>
-					<b:ControlLabel for="tags" title="Dataset tags">
+					<b:ControlLabel for="tags" title="Product tags">
 						Tags:
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE"
-							placeholder="Enter one or more tag for the dataset" b:id="tags"
+							placeholder="Enter one or more tag for the product" b:id="tags"
 							ui:field="tagsEnterTextBox" />
 						<span style="float:right; width:256px; color: #aaaaaa;">
 							<b:Icon type="INFO_SIGN" size="TWO_TIMES" />
 							Tags are meaningful information that can be associated to the
-							dataset and by means of them
+							product and by means of them
 							it can be retrieved. A tag cannot
 							contain white spaces and can contain only alphanumeric
 							characters.
@@ -108,7 +108,7 @@
 				<b:ControlGroup>
 					<b:ControlLabel for="licenses" title="License">License:</b:ControlLabel>
 					<b:Controls>
-						<b:ListBox b:id="licenses" title="Dataset license"
+						<b:ListBox b:id="licenses" title="Product license"
 							width="60%" ui:field="licenseListbox">
 						</b:ListBox>
 						<span style="float:right; width:256px; color: #aaaaaa;">
@@ -122,15 +122,15 @@
 				<b:ControlGroup>
 					<b:ControlLabel for="visibility" title="Visibility">Visibility:</b:ControlLabel>
 					<b:Controls>
-						<b:ListBox b:id="visibility" title="Dataset visibility"
+						<b:ListBox b:id="visibility" title="Product visibility"
 							width="60%" ui:field="visibilityListbox">
 							<g:item title="private">Private</g:item>
 							<g:item enabled="true" title="public">Public</g:item>
 						</b:ListBox>
 						<span style="float:right; width:256px; color: #aaaaaa;">
 							<b:Icon type="INFO_SIGN" size="TWO_TIMES" />
-							Private datasets can only be accessed by certain users, while
-							public datasets can be accessed by anyone.
+							Private products can only be accessed by certain users, while
+							public products can be accessed by anyone.
 						</span>
 					</b:Controls>
 				</b:ControlGroup>
@@ -145,63 +145,63 @@
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="version" title="Dataset version">
+					<b:ControlLabel for="version" title="Product version">
 						Version:
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE" placeholder="1.0" b:id="version"
-							title="Dataset version" ui:field="versionTextbox" />
+							title="Product version" ui:field="versionTextbox" />
 					</b:Controls>
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="author" title="Dataset author">
+					<b:ControlLabel for="author" title="Product author">
 						<font color="red">*</font>
 						Author:
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE" placeholder="Joe Bloggs"
-							enabled="false" b:id="author" title="Dataset author" ui:field="authorTextbox" />
+							enabled="false" b:id="author" title="Product author" ui:field="authorTextbox" />
 					</b:Controls>
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="email" title="Dataset author's email">
+					<b:ControlLabel for="email" title="Product author's email">
 						<font color="red">*</font>
 						Author Email:
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE" placeholder="joe.bloggs@example.com"
-							enabled="false" b:id="email" title="Dataset author" ui:field="authorEmailTextbox" />
+							enabled="false" b:id="email" title="Product author" ui:field="authorEmailTextbox" />
 					</b:Controls>
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="maintainer" title="Dataset maintainer">
+					<b:ControlLabel for="maintainer" title="Product maintainer">
 						Maintainer:
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE" placeholder="Joe Bloggs"
-							b:id="maintainer" title="Dataset maintainer" ui:field="maintainerTextbox" />
+							b:id="maintainer" title="Product maintainer" ui:field="maintainerTextbox" />
 					</b:Controls>
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="emailMaintaner" title="Dataset author's email">
+					<b:ControlLabel for="emailMaintaner" title="Product author's email">
 						Maintainer Email:
 					</b:ControlLabel>
 					<b:Controls>
 						<b:TextBox alternateSize="LARGE" placeholder="maintainer@example.com"
-							b:id="emailMaintaner" title="Dataset author" ui:field="maintainerEmailTextbox" />
+							b:id="emailMaintaner" title="Product author" ui:field="maintainerEmailTextbox" />
 					</b:Controls>
 				</b:ControlGroup>
 
 				<b:ControlGroup>
-					<b:ControlLabel for="metadataProfilesFormat" title="Metadata profile formats">Product
+					<b:ControlLabel for="metadataProfilesFormat" title="Product profile formats">Product
 						Profile:</b:ControlLabel>
 					<b:Controls>
 						<b:ListBox b:id="metadataProfilesFormat" alternateSize="LARGE"
-							title="The metadata profile format to be used" ui:field="metadataProfilesFormatListbox">
+							title="The product profile format to be used" ui:field="metadataProfilesFormatListbox">
 							<g:item enabled="true" title="None">none</g:item>
 						</b:ListBox>
 					</b:Controls>
@@ -247,11 +247,11 @@
 						<span style="float:right; width:256px; color: #aaaaaa;">
 							<b:Icon type="INFO_SIGN" size="TWO_TIMES" />
 							Custom fields are customable metadata that will be added to the
-							dataset.
+							product.
 							You have to choose a unique key for the field and a value
 							for this. You
 							can remove them at any time until you create the
-							dataset.
+							product.
 						</span>
 						<b:Button icon="PLUS_SIGN" title="Add Custom Field"
 							ui:field="addCustomFieldButton"></b:Button>
@@ -262,13 +262,13 @@
 					visible="false">
 					<b:Controls>
 						<b:CheckBox
-							title="Automatically add the folder content to the dataset as resource"
+							title="Automatically add the folder content to the product as resource"
 							checked="true" ui:field="addResourcesCheckBox">
 							<b>Add folder content as resources</b>
 						</b:CheckBox>
 						<span style="float:right; width:256px; color: #aaaaaa;">
 							<b:Icon type="INFO_SIGN" size="TWO_TIMES" />
-							Automatically add folder content as resources of the dataset
+							Automatically add folder content as resources of the product
 						</span>
 					</b:Controls>
 				</b:ControlGroup>
@@ -278,16 +278,16 @@
 					visible="false" ui:field="onCreateAlertBlock" styleName="{style.block-alert-style}">
 				</b:AlertBlock>
 
-				<b:Button title="Add resources to the just created dataset"
+				<b:Button title="Add resources to the just created product"
 					block="true" type="PRIMARY" visible="false" ui:field="addResourcesButton">Add Resources</b:Button>
 
-				<b:Button title="Create dataset" ui:field="createButton"
+				<b:Button title="Create product" ui:field="createButton"
 					type="PRIMARY" block="true">Create</b:Button>
 				<b:Button title="Go Back" ui:field="goBackButton" block="true">Go
 					Back</b:Button>
 
-				<b:Button title="Go to dataset" ui:field="goToDatasetButton"
-					block="true" visible="false">Go to Dataset</b:Button>
+				<b:Button title="Go to product" ui:field="goToDatasetButton"
+					block="true" visible="false">Go to Product</b:Button>
 
 			</b:Fieldset>
 		</b:Form>