diff --git a/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java b/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java
index 0b4671ee60..b890d28ba3 100644
--- a/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java
+++ b/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java
@@ -282,7 +282,7 @@ void handleAddProperty() {
             String defaultValue = dialog.getDefaultValue();
             Parameter parameter = new Parameter(name, defaultValue, Parameter.Type.fromValue(type));
 
-            this.parameterMap.put(name, parameter);
+            this.parameterMap.put(Parameter.PREFIX+name, parameter);
             
             // update UI from model
             this.propertiesViewer.refresh();
@@ -326,14 +326,14 @@ void handleRemoveProperty() {
         assert (selectedProperty != null);
 
         // update model
-        parameterMap.remove(selectedProperty.getName());
+        parameterMap.remove(Parameter.PREFIX+selectedProperty.getName());
 
         // update UI
         this.propertiesViewer.refresh();
         
         if (this.wsProfileDetailsWizardPage!=null){
         	wsProfileDetailsWizardPage.setParameterMap(this.parameterMap);
-        	wsProfileDetailsWizardPage.getProfileProperties().remove(selectedProperty.getName());
+        	wsProfileDetailsWizardPage.getProfileProperties().remove(Parameter.PREFIX+selectedProperty.getName());
         	wsProfileDetailsWizardPage.urlPreviewText.setText(wsProfileDetailsWizardPage.updateUrlPreview().toString());
         }else{
         	propertyPage.setParameterMap(this.parameterMap);
diff --git a/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java b/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java
index 5c283f97c1..1979ce8c49 100644
--- a/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java
+++ b/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/PropertyPage.java
@@ -350,7 +350,7 @@ private StringBuilder buildParameterString() {
 	    	  }else{
 	    		  parameterString.append("&");   //$NON-NLS-1$  
 	    	  }
-	    	  parameterString.append(key).append("=").append(value.getDefaultValue()); //$NON-NLS-1$
+	    	  parameterString.append(value.getName()).append("=").append(value.getDefaultValue()); //$NON-NLS-1$
 	      }
 	    }
 
@@ -501,7 +501,6 @@ private void initControls() {
     private void loadParameters(Properties props) {
     	for( Object key : props.keySet() )  {
     		String keyStr = (String)key;
-    		
     		if( keyStr.startsWith(Parameter.PREFIX)) {
     			Parameter newParam = new Parameter(keyStr, props.getProperty((String)key));
     			parameterMap.put(newParam.getName(), newParam);
diff --git a/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/WSProfileDetailsWizardPage.java b/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/WSProfileDetailsWizardPage.java
index 3da68528ea..25cdab615c 100644
--- a/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/WSProfileDetailsWizardPage.java
+++ b/plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/WSProfileDetailsWizardPage.java
@@ -315,7 +315,7 @@ private String buildParameterString() throws UnsupportedEncodingException {
 				} else {
 					parameterString.append("&"); //$NON-NLS-1$  
 				}
-				parameterString.append(encodeString(key)).append("=").append(encodeString(value.getDefaultValue())); //$NON-NLS-1$
+				parameterString.append(encodeString(value.getName())).append("=").append(encodeString(value.getDefaultValue())); //$NON-NLS-1$
 			}
 		}