diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
index b4fced27a8b..abade897ab4 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
@@ -59,6 +59,9 @@ public interface ISystemProfile extends IRSEModelObject {
 	String getName();
 
 	/**
+	 * Sets the name of the profile.
+	 * Profile names must not contain three consecutive underscores "___", since these are used
+	 * to separate a profile name from a filter pool name in a filter pool reference.
 	 * @param value The new value of the Name attribute
 	 */
 	void setName(String value);
diff --git a/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/RSEFileSystemContributor.java b/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/RSEFileSystemContributor.java
index 2bb6fb7a988..c2d81a178f3 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/RSEFileSystemContributor.java
+++ b/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/RSEFileSystemContributor.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -18,6 +18,7 @@
  *    - Also remove unnecessary class RSEFileCache and obsolete branding files.
  * Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
  * Martin Oberhuber (Wind River) - [189441] fix EFS operations on Windows (Local) systems
+ * David Dykstal (IBM) - [235840] externalizing dialog title
  ********************************************************************************/
 
 
@@ -46,7 +47,7 @@ public class RSEFileSystemContributor extends FileSystemContributor {
 
 	public URI browseFileSystem(String initialPath, Shell shell) {
 		
-		SystemRemoteFolderDialog dlg = new SystemRemoteFolderDialog(shell, "Select Folder"); //$NON-NLS-1$
+		SystemRemoteFolderDialog dlg = new SystemRemoteFolderDialog(shell);
 		
 		if (!initialPath.equals("")) { //$NON-NLS-1$
 			
diff --git a/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/messages.properties b/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/messages.properties
index 5493bfdd9c5..da9940a02a9 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/messages.properties
+++ b/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/messages.properties
@@ -8,9 +8,10 @@
 # David Dykstal (IBM) - initial contribution
 # Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
 # Remy Chi Jian Suen (IBM) - [202098][efs][nls] Improve error message when creating a remote project with existing name
+# David Dykstal (IBM) - [cleanup] using messageformat_var instead of messageformat_none
 ################################################################################
 
-# NLS_MESSAGEFORMAT_NONE
+# NLS_MESSAGEFORMAT_VAR
 # NLS_ENCODING=UTF-8
 
 CreateRemoteProjectActionDelegate_CREATING_TITLE=Creating Remote Project