diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
index 960a0129a84..d8fe70b59fc 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
@@ -22,7 +22,7 @@ public interface IUniversalDStoreConstants
 {
 
 
-	public static final String PLUGIN_ID ="com.ibm.etools.systems.universal";
+	public static final String PLUGIN_ID ="org.eclipse.rse.connectorservice.dstore";
 	
 	public static final String PREFIX = PLUGIN_ID + ".";
 	
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java
index 0bd0666c6a4..525516f36df 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java
@@ -23,7 +23,7 @@ public interface IUniversalDStoreMessages
 {
 
 
-	public static final String PLUGIN_ID ="com.ibm.etools.systems.universal";
+	public static final String PLUGIN_ID ="org.eclipse.rse.connectorservice.dstore";
 	public static final String PREFIX = PLUGIN_ID+".";
 	// Resource Bundle ids
 	public static final String RESID_PREFIX = PREFIX+"ui.";	
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java
index 5253cd2ee61..b4b9daa4fec 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java
@@ -63,7 +63,7 @@ public class ImageRegistry {
 	/**
 	 * Insert the method's description here.
 	 * Creation date: (2/16/2001 4:57:29 PM)
-	 * @return com.ibm.jface.resource.ImageDescriptor
+	 * @return ImageDescriptor
 	 * @param name java.lang.String
 	 */
 	public static ImageDescriptor getImageDescriptor(String name) {