Package rename to include "internet"

69 files changed, 258 insertions, 258 deletions

diff --git a/plugins/org.eclipse.wst.internet.monitor.core/.cvsignore b/plugins/org.eclipse.wst.internet.monitor.core/.cvsignore
index 1f46f49d9..8ca260ded 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/.cvsignore
+++ b/plugins/org.eclipse.wst.internet.monitor.core/.cvsignore
@@ -2,4 +2,4 @@ bin
 monitorcore.jar
 build.xml
 temp.folder
-org.eclipse.wst.monitor.core_3.0.0.jar
+org.eclipse.wst.internet.monitor.core_3.0.0.jar
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/.options b/plugins/org.eclipse.wst.internet.monitor.core/.options
index 7cad962b2..3d7045926 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/.options
+++ b/plugins/org.eclipse.wst.internet.monitor.core/.options
@@ -1,6 +1,6 @@
-# Debugging options for the org.eclipse.wst.monitor.core plugin
+# Debugging options for the org.eclipse.wst.internet.monitor.core plugin
 
 # Turn on general debugging
-org.eclipse.wst.monitor.core/debug=false
+org.eclipse.wst.internet.monitor.core/debug=false
 
-org.eclipse.wst.monitor.core/parsing=false
+org.eclipse.wst.internet.monitor.core/parsing=false
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/ContentFilterDelegate.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/ContentFilterDelegate.java
index c2f218f13..472fba9b8 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/ContentFilterDelegate.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/ContentFilterDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 
 import java.io.IOException;
 /**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IContentFilter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IContentFilter.java
index eed79fc08..01fbd160a 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IContentFilter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IContentFilter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 
 import java.io.IOException;
 /**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IMonitor.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java
index ee5a9adec..af3769606 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IMonitor.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 /**
  * Represents the monitor that monitors the network traffic between a server and a client.
  * <p>
@@ -70,7 +70,7 @@ public interface IMonitor {
 	/**
 	 * Returns whether this monitor is a working copy. Monitors which return
 	 * <code>true</code> to this method can be safely cast to 
-	 * <code>org.eclipse.wst.monitor.core.IMonitorWorkingCopy</code>
+	 * <code>org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy</code>
 	 * 
 	 * @return whether this monitor is a working copy
 	 */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IMonitorListener.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitorListener.java
index dc461ae8f..3e4d10783 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IMonitorListener.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitorListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 /**
  * Listener that listen to the monitor add, remove and changes.
  * 
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IMonitorWorkingCopy.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitorWorkingCopy.java
index 50c81f966..c9d630052 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IMonitorWorkingCopy.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitorWorkingCopy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 /**
  * Represents a working copy of a monitor. A working copy is a copy that the attributes can be changed.
  * <p>
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IProtocolAdapter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IProtocolAdapter.java
index 994ade910..d6c45ae71 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IProtocolAdapter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IProtocolAdapter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 /**
  * A protocol adapter allows the monitor to support a new protocol between a client
  * and server, and manages the message passing between the two.
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IRequest.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IRequest.java
index c68741570..5af863dc6 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IRequest.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IRequest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 
 import java.util.Date;
 import java.util.List;
@@ -30,7 +30,7 @@ public interface IRequest extends IAdaptable{
 	 * Return the protocol adapter of the request.
 	 * [issue: should we rename this to getProtocolAdapter?]
 	 * 
-	 * @return org.eclipse.wst.monitor.core.IProtocolAdapter
+	 * @return org.eclipse.wst.internet.monitor.core.IProtocolAdapter
 	 */
 	public IProtocolAdapter getType();
 
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IRequestListener.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IRequestListener.java
index 85fcb9111..02dbb08a1 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IRequestListener.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IRequestListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 /**
  * A listener for changes to the requests.
  * 
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IResendRequest.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IResendRequest.java
index d996d8f1f..4a59b1e40 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/IResendRequest.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IResendRequest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 /**
  * A representation of a request that is to be resent. This interface is not
  * meant to be implemented by clients.
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/MonitorCore.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/MonitorCore.java
index f286c059a..ab7f045fb 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/MonitorCore.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/MonitorCore.java
@@ -8,17 +8,17 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 
-import org.eclipse.wst.monitor.core.internal.MonitorManager;
-import org.eclipse.wst.monitor.core.internal.MonitorPlugin;
-import org.eclipse.wst.monitor.core.internal.Trace;
-import org.eclipse.wst.monitor.core.internal.http.ResendHTTPRequest;
+import org.eclipse.wst.internet.monitor.core.internal.MonitorManager;
+import org.eclipse.wst.internet.monitor.core.internal.MonitorPlugin;
+import org.eclipse.wst.internet.monitor.core.internal.Trace;
+import org.eclipse.wst.internet.monitor.core.internal.http.ResendHTTPRequest;
 /**
  * Base class for obtaining references to monitor models. This class also provide methods
  * to do operations on the monitor.
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/ProtocolAdapterDelegate.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/ProtocolAdapterDelegate.java
index a0ff9a482..d06c64c99 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/ProtocolAdapterDelegate.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/ProtocolAdapterDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core;
+package org.eclipse.wst.internet.monitor.core;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -29,7 +29,7 @@ public abstract class ProtocolAdapterDelegate {
 	 *      [issue: the in/out streams are opened here but I don't see any API to be used for 
 	 *              closing the opened steam. Are the opened streams supposed to be cleaned up? ]
 	 *    * passing information from the output socket (server) back to the client.
-	 *    * creating and populating new org.eclipse.wst.monitor.core.IRequest objects as necessary.
+	 *    * creating and populating new org.eclipse.wst.internet.monitor.core.IRequest objects as necessary.
 	 * 
 	 * @param monitor the monitor that uses this protocol adapter
 	 * @param in the input socket of the monitor client
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/AcceptThread.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/AcceptThread.java
index 1ccf65083..6f1eccb56 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/AcceptThread.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/AcceptThread.java
@@ -8,12 +8,12 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.InterruptedIOException;
 import java.net.*;
 
-import org.eclipse.wst.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
 /**
  * The actual TCP/IP monitoring server. This is a thread that
  * listens on a port and relays a call to another server.
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Connection.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Connection.java
index 003444cc3..a11526da4 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Connection.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Connection.java
@@ -1,4 +1,4 @@
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.net.Socket;
 /**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/ContentFilter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
index efc07fe20..43a0a60c1 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/ContentFilter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
@@ -8,13 +8,13 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.IOException;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.monitor.core.ContentFilterDelegate;
-import org.eclipse.wst.monitor.core.IContentFilter;
-import org.eclipse.wst.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.ContentFilterDelegate;
+import org.eclipse.wst.internet.monitor.core.IContentFilter;
+import org.eclipse.wst.internet.monitor.core.IRequest;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/DefaultThread.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/DefaultThread.java
index 0973ca1f3..78481a079 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/DefaultThread.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/DefaultThread.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.*;
 /**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/IMemento.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
index 270e7e4d1..40ad5711e 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/IMemento.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.util.List;
 /**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Monitor.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Monitor.java
index f297402dd..b191bc5fd 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Monitor.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Monitor.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
-import org.eclipse.wst.monitor.core.*;
+import org.eclipse.wst.internet.monitor.core.*;
 /**
  * 
  */
@@ -32,42 +32,42 @@ public class Monitor implements IMonitor {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitor#getId()
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitor#getId()
 	 */
 	public String getId() {
 		return id;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitor#getRemoteHost()
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitor#getRemoteHost()
 	 */
 	public String getRemoteHost() {
 		return remoteHost;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitor#getRemotePort()
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitor#getRemotePort()
 	 */
 	public int getRemotePort() {
 		return remotePort;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitor#getLocalPort()
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitor#getLocalPort()
 	 */
 	public int getLocalPort() {
 		return localPort;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitor#isHTTPEnabled()
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitor#isHTTPEnabled()
 	 */
 	public IProtocolAdapter getProtocolAdapter() {
 		return type;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitor#isRunning()
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitor#isRunning()
 	 */
 	public boolean isRunning() {
 		return MonitorManager.getInstance().isRunning(this);
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/MonitorManager.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
index 1c5078120..2e87eba27 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/MonitorManager.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.monitor.core.*;
+import org.eclipse.wst.internet.monitor.core.*;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/MonitorPlugin.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
index 9fd7353c7..370920f97 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/MonitorPlugin.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
@@ -8,19 +8,19 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.util.*;
 
 import org.eclipse.core.runtime.*;
-import org.eclipse.wst.monitor.core.IContentFilter;
-import org.eclipse.wst.monitor.core.IProtocolAdapter;
-import org.eclipse.wst.monitor.core.IRequestListener;
+import org.eclipse.wst.internet.monitor.core.IContentFilter;
+import org.eclipse.wst.internet.monitor.core.IProtocolAdapter;
+import org.eclipse.wst.internet.monitor.core.IRequestListener;
 /**
  * The monitor core plugin.
  */
 public class MonitorPlugin extends Plugin {
-	public static final String PLUGIN_ID = "org.eclipse.wst.monitor.core";
+	public static final String PLUGIN_ID = "org.eclipse.wst.internet.monitor.core";
 
 	private static MonitorPlugin singleton;
 	
@@ -41,7 +41,7 @@ public class MonitorPlugin extends Plugin {
 	/**
 	 * Returns the singleton instance of this plugin.
 	 *
-	 * @return org.eclipse.wst.monitor.core.MonitorPlugin
+	 * @return org.eclipse.wst.internet.monitor.core.MonitorPlugin
 	 */
 	public static MonitorPlugin getInstance() {
 		return singleton;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/MonitorWorkingCopy.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorWorkingCopy.java
index 2c3f72e62..dc4d326fe 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/MonitorWorkingCopy.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorWorkingCopy.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
-import org.eclipse.wst.monitor.core.*;
+import org.eclipse.wst.internet.monitor.core.*;
 /**
  * 
  */
@@ -29,35 +29,35 @@ public class MonitorWorkingCopy extends Monitor implements IMonitorWorkingCopy {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitorWorkingCopy#setRemoteHost(java.lang.String)
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitorWorkingCopy#setRemoteHost(java.lang.String)
 	 */
 	public void setId(String newId) {
 		id = newId;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitorWorkingCopy#setRemoteHost(java.lang.String)
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitorWorkingCopy#setRemoteHost(java.lang.String)
 	 */
 	public void setRemoteHost(String host) {
 		remoteHost = host;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitorWorkingCopy#setRemotePort(int)
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitorWorkingCopy#setRemotePort(int)
 	 */
 	public void setRemotePort(int port) {
 		remotePort = port;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitorWorkingCopy#setLocalPort(int)
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitorWorkingCopy#setLocalPort(int)
 	 */
 	public void setLocalPort(int port) {
 		localPort = port;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.IMonitorWorkingCopy#setType(IType)
+	 * @see org.eclipse.wst.internet.monitor.internal.IMonitorWorkingCopy#setType(IType)
 	 */
 	public void setProtocolAdapter(IProtocolAdapter t) {
 		type = t;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/ProtocolAdapter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapter.java
index 28bac4e02..0c1be310f 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/ProtocolAdapter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapter.java
@@ -8,14 +8,14 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.IOException;
 import java.net.Socket;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.monitor.core.IMonitor;
-import org.eclipse.wst.monitor.core.IProtocolAdapter;
-import org.eclipse.wst.monitor.core.ProtocolAdapterDelegate;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.IProtocolAdapter;
+import org.eclipse.wst.internet.monitor.core.ProtocolAdapterDelegate;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Request.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Request.java
index 71d4f0b7e..1f599a2b1 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Request.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Request.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -16,8 +16,8 @@ import java.util.List;
 import java.util.Properties;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.monitor.core.IProtocolAdapter;
-import org.eclipse.wst.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IProtocolAdapter;
+import org.eclipse.wst.internet.monitor.core.IRequest;
 /**
  * A single TCP/IP request/response pair.
  */
@@ -268,7 +268,7 @@ public class Request implements IRequest {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.IRequest#addResendRequest(org.eclipse.wst.monitor.core.IRequest)
+	 * @see org.eclipse.wst.internet.monitor.core.IRequest#addResendRequest(org.eclipse.wst.internet.monitor.core.IRequest)
 	 */
 	public void addResendRequest(IRequest resendReq)
 	{
@@ -279,7 +279,7 @@ public class Request implements IRequest {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.IRequest#getResendRequests()
+	 * @see org.eclipse.wst.internet.monitor.core.IRequest#getResendRequests()
 	 */
 	public List getResendRequests()
 	{
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/SocketWrapper.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/SocketWrapper.java
index 42ff8b7b9..7d0e17b46 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/SocketWrapper.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/SocketWrapper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/TCPIPProtocolAdapter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/TCPIPProtocolAdapter.java
index 37683bd0d..918c2acfb 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/TCPIPProtocolAdapter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/TCPIPProtocolAdapter.java
@@ -8,14 +8,14 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.IOException;
 import java.net.Socket;
 
-import org.eclipse.wst.monitor.core.IMonitor;
-import org.eclipse.wst.monitor.core.ProtocolAdapterDelegate;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.ProtocolAdapterDelegate;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Trace.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Trace.java
index 9c4666abf..82c684aa5 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/Trace.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Trace.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 /**
  * Helper class to route trace output.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/XMLMemento.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java
index 81cff338b..a3d00673e 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/XMLMemento.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal;
+package org.eclipse.wst.internet.monitor.core.internal;
 
 import java.io.*;
 import java.util.*;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPConnection.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java
index e4da3a06e..6a208fbc6 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPConnection.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal.http;
+package org.eclipse.wst.internet.monitor.core.internal.http;
 
-import org.eclipse.wst.monitor.core.IMonitor;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.internal.Trace;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.internal.Trace;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPProtocolAdapter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPProtocolAdapter.java
index 0436d8856..25210bd9b 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPProtocolAdapter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPProtocolAdapter.java
@@ -8,14 +8,14 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal.http;
+package org.eclipse.wst.internet.monitor.core.internal.http;
 
 import java.io.IOException;
 import java.net.Socket;
 
-import org.eclipse.wst.monitor.core.IMonitor;
-import org.eclipse.wst.monitor.core.ProtocolAdapterDelegate;
-import org.eclipse.wst.monitor.core.internal.Connection;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.ProtocolAdapterDelegate;
+import org.eclipse.wst.internet.monitor.core.internal.Connection;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPRequest.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPRequest.java
index b48847a2f..7575d2ec0 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPRequest.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPRequest.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal.http;
+package org.eclipse.wst.internet.monitor.core.internal.http;
 
-import org.eclipse.wst.monitor.core.MonitorCore;
-import org.eclipse.wst.monitor.core.internal.Request;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.internal.Request;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPThread.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java
index de396b788..901cb84a0 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/HTTPThread.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java
@@ -8,12 +8,12 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal.http;
+package org.eclipse.wst.internet.monitor.core.internal.http;
 
 import java.io.*;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.internal.Connection;
-import org.eclipse.wst.monitor.core.internal.Trace;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.internal.Connection;
+import org.eclipse.wst.internet.monitor.core.internal.Trace;
 /**
  * Monitor server I/O thread.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/ResendHTTPConnection.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/ResendHTTPConnection.java
index 0e046a49c..904f75f37 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/ResendHTTPConnection.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/ResendHTTPConnection.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal.http;
+package org.eclipse.wst.internet.monitor.core.internal.http;
 
-import org.eclipse.wst.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IRequest;
 /**
  * A resend HTTP connection wraps an HTTP connection to send an existing request.
  */
@@ -23,7 +23,7 @@ public class ResendHTTPConnection extends HTTPConnection{
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.internal.http.HTTPConnection#getRequestResponse(int)
+	 * @see org.eclipse.wst.internet.monitor.core.internal.http.HTTPConnection#getRequestResponse(int)
 	 */
 	protected IRequest getRequestResponse(int i) {
 		return existingRequest;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/ResendHTTPRequest.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/ResendHTTPRequest.java
index 7683f1cad..98fc8a662 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/monitor/core/internal/http/ResendHTTPRequest.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/ResendHTTPRequest.java
@@ -8,16 +8,16 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.core.internal.http;
+package org.eclipse.wst.internet.monitor.core.internal.http;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.Socket;
 
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IResendRequest;
-import org.eclipse.wst.monitor.core.internal.Connection;
-import org.eclipse.wst.monitor.core.internal.SocketWrapper;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IResendRequest;
+import org.eclipse.wst.internet.monitor.core.internal.Connection;
+import org.eclipse.wst.internet.monitor.core.internal.SocketWrapper;
 /**
  * Wraps an existing request to create an HTTP request that can be sent. The
  * response is ignored. Only the request is important in this case.
@@ -49,7 +49,7 @@ public class ResendHTTPRequest extends HTTPRequest implements IResendRequest {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.IResendRequest#sendRequest()
+	 * @see org.eclipse.wst.internet.monitor.core.IResendRequest#sendRequest()
 	 */
 	public void sendRequest() {
 		try {
@@ -80,7 +80,7 @@ public class ResendHTTPRequest extends HTTPRequest implements IResendRequest {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.internal.Request#addToRequest(byte[])
+	 * @see org.eclipse.wst.internet.monitor.core.internal.Request#addToRequest(byte[])
 	 */
 	public void addToRequest(byte[] addRequest) {
 		// Don't want to add to the request as we already have the request.
@@ -113,21 +113,21 @@ public class ResendHTTPRequest extends HTTPRequest implements IResendRequest {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.internal.http.HTTPRequest#getRequestContent()
+	 * @see org.eclipse.wst.internet.monitor.core.internal.http.HTTPRequest#getRequestContent()
 	 */
 	protected byte[] getRequestContent() {
 		return content;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.internal.http.HTTPRequest#getRequestHeader()
+	 * @see org.eclipse.wst.internet.monitor.core.internal.http.HTTPRequest#getRequestHeader()
 	 */
 	protected byte[] getRequestHeader() {
 		return header;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.core.IResendRequest#getOriginalRequest()
+	 * @see org.eclipse.wst.internet.monitor.core.IResendRequest#getOriginalRequest()
 	 */
 	public IRequest getOriginalRequest() {
 		return originalRequest;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/plugin.xml b/plugins/org.eclipse.wst.internet.monitor.core/plugin.xml
index d6b431492..214f3548b 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/plugin.xml
+++ b/plugins/org.eclipse.wst.internet.monitor.core/plugin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 
-<plugin id="org.eclipse.wst.monitor.core"
+<plugin id="org.eclipse.wst.internet.monitor.core"
   name="%pluginName"
   version="1.0.0"
   provider-name="%providerName"
-  class="org.eclipse.wst.monitor.core.internal.MonitorPlugin">
+  class="org.eclipse.wst.internet.monitor.core.internal.MonitorPlugin">
 
 <requires>
   <import plugin="org.eclipse.core.runtime"/>
@@ -21,14 +21,14 @@
 <extension-point name="%extensionPointContentFilters" id="contentFilters" schema="schema/contentFilters.exsd"/>
 <extension-point name="%extensionPointRequestListeners" id="requestListeners" schema="schema/requestListeners.exsd"/>
 
-<extension point="org.eclipse.wst.monitor.core.protocolAdapters">
+<extension point="org.eclipse.wst.internet.monitor.core.protocolAdapters">
   <protocolAdapter
     id="TCPIP"
-    class="org.eclipse.wst.monitor.core.internal.TCPIPProtocolAdapter"
+    class="org.eclipse.wst.internet.monitor.core.internal.TCPIPProtocolAdapter"
     name="%TCPIP"/>
   <protocolAdapter
     id="HTTP"
-    class="org.eclipse.wst.monitor.core.internal.http.HTTPProtocolAdapter"
+    class="org.eclipse.wst.internet.monitor.core.internal.http.HTTPProtocolAdapter"
     name="%HTTP"/>
 </extension>
 
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/schema/contentFilters.exsd b/plugins/org.eclipse.wst.internet.monitor.core/schema/contentFilters.exsd
index 0b2ae0a31..7cc72f558 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/schema/contentFilters.exsd
+++ b/plugins/org.eclipse.wst.internet.monitor.core/schema/contentFilters.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.wst.monitor.core">

+<schema targetNamespace="org.eclipse.wst.internet.monitor.core">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.wst.monitor.core" id="contentFilters" name="Content Filters"/>

+         <meta.schema plugin="org.eclipse.wst.internet.monitor.core" id="contentFilters" name="Content Filters"/>

       </appInfo>

       <documentation>

          This extension point is used to filter content received in a monitor.

@@ -58,11 +58,11 @@
          <attribute name="class" type="string" use="required">

             <annotation>

                <documentation>

-                  specifies the fully qualified name of a Java class that extends &lt;samp&gt;org.eclipse.wst.monitor.core.ContentFilterDelegate&lt;/samp&gt;.
+                  specifies the fully qualified name of a Java class that extends &lt;samp&gt;org.eclipse.wst.internet.monitor.core.ContentFilterDelegate&lt;/samp&gt;.
 Content filter instances of this type will delegate to instances of this class.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.wst.monitor.core.ContentFilterDelegate"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.wst.internet.monitor.core.ContentFilterDelegate"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -92,7 +92,7 @@ Content filter instances of this type will delegate to instances of this class.
 
 &lt;p&gt;
 &lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.wst.monitor.core.contentFilter&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.wst.internet.monitor.core.contentFilter&quot;&gt;
   &lt;filter
    id=&quot;com.example.ExampleIdentifier&quot;
    name=&quot;%exampleName&quot;
@@ -107,7 +107,7 @@ Content filter instances of this type will delegate to instances of this class.
          <meta.section type="apiInfo"/>

       </appInfo>

       <documentation>

-         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that extends the abstract class &lt;b&gt;org.eclipse.wst.monitor.core.ContentFilterDelegate&lt;/b&gt;.

+         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that extends the abstract class &lt;b&gt;org.eclipse.wst.internet.monitor.core.ContentFilterDelegate&lt;/b&gt;.

       </documentation>

    </annotation>

 

diff --git a/plugins/org.eclipse.wst.internet.monitor.core/schema/protocolAdapters.exsd b/plugins/org.eclipse.wst.internet.monitor.core/schema/protocolAdapters.exsd
index 9ec86fd48..0a770a705 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/schema/protocolAdapters.exsd
+++ b/plugins/org.eclipse.wst.internet.monitor.core/schema/protocolAdapters.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.wst.monitor.core">

+<schema targetNamespace="org.eclipse.wst.internet.monitor.core">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.wst.monitor.core" id="protocolAdapters" name="Protocol Adapters"/>

+         <meta.schema plugin="org.eclipse.wst.internet.monitor.core" id="protocolAdapters" name="Protocol Adapters"/>

       </appInfo>

       <documentation>

          This extension point is used to provide an adapter for a new protocol (e.g. HTTP). This allows different types of protocols to be monitored.

@@ -58,11 +58,11 @@
          <attribute name="class" type="string" use="required">

             <annotation>

                <documentation>

-                  specifies the fully qualified name of the Java class that extends &lt;samp&gt;org.eclipse.wst.monitor.core.ProtocolAdapterDelegate&lt;/samp&gt;
+                  specifies the fully qualified name of the Java class that extends &lt;samp&gt;org.eclipse.wst.internet.monitor.core.ProtocolAdapterDelegate&lt;/samp&gt;
 Protocol adapter instances of this type will delegate to instances of this class.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.wst.monitor.core.ProtocolAdapterDelegate"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.wst.internet.monitor.core.ProtocolAdapterDelegate"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -85,7 +85,7 @@ Protocol adapter instances of this type will delegate to instances of this class
 
 &lt;p&gt;
 &lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.wst.monitor.core.protocolAdapters&quot;&gt;
+&lt;extension point=&quot;org.eclipse.wst.internet.monitor.core.protocolAdapters&quot;&gt;
   &lt;protocolAdapter
     id=&quot;TCPIP&quot;
     class=&quot;com.example.TCPIPProtocolAdapter&quot;
@@ -101,7 +101,7 @@ Protocol adapter instances of this type will delegate to instances of this class
          <meta.section type="apiInfo"/>

       </appInfo>

       <documentation>

-         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that extends the abstract class &lt;b&gt;org.eclipse.wst.monitor.core.ProtocolAdapterDelegate&lt;/b&gt;.

+         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that extends the abstract class &lt;b&gt;org.eclipse.wst.internet.monitor.core.ProtocolAdapterDelegate&lt;/b&gt;.

       </documentation>

    </annotation>

 

diff --git a/plugins/org.eclipse.wst.internet.monitor.core/schema/requestListeners.exsd b/plugins/org.eclipse.wst.internet.monitor.core/schema/requestListeners.exsd
index ca3f52197..f09f0079a 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/schema/requestListeners.exsd
+++ b/plugins/org.eclipse.wst.internet.monitor.core/schema/requestListeners.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.wst.monitor.core">

+<schema targetNamespace="org.eclipse.wst.internet.monitor.core">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.wst.monitor.core" id="requestListeners" name="Request Listeners"/>

+         <meta.schema plugin="org.eclipse.wst.internet.monitor.core" id="requestListeners" name="Request Listeners"/>

       </appInfo>

       <documentation>

          This extension point is used to listen for new monitor traffic (requests), or changes to existing requests. The extension point will be called whenever the monitor adds, changes, or removes a request.

@@ -58,11 +58,11 @@
          <attribute name="class" type="string" use="required">

             <annotation>

                <documentation>

-                  specifies the fully qualified name of the Java class that implements &lt;samp&gt;org.eclipse.wst.monitor.core.IRequestListener&lt;/samp&gt;
+                  specifies the fully qualified name of the Java class that implements &lt;samp&gt;org.eclipse.wst.internet.monitor.core.IRequestListener&lt;/samp&gt;
 RequestListener instances of this type will delegate to instances of this class.

                </documentation>

                <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.wst.monitor.core.IRequestListener"/>

+                  <meta.attribute kind="java" basedOn="org.eclipse.wst.internet.monitor.core.IRequestListener"/>

                </appInfo>

             </annotation>

          </attribute>

@@ -78,7 +78,7 @@ RequestListener instances of this type will delegate to instances of this class.
 
 &lt;p&gt;
 &lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.wst.monitor.core.requestListeners&quot;&gt;
+&lt;extension point=&quot;org.eclipse.wst.internet.monitor.core.requestListeners&quot;&gt;
   &lt;requestListener
     id=&quot;com.example.requestListener&quot;
     class=&quot;com.example.MyRequestListener&quot;/&gt;
@@ -93,7 +93,7 @@ RequestListener instances of this type will delegate to instances of this class.
          <meta.section type="apiInfo"/>

       </appInfo>

       <documentation>

-         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that implements the interface &lt;b&gt;org.eclipse.wst.monitor.core.IRequestListener&lt;/b&gt;.

+         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that implements the interface &lt;b&gt;org.eclipse.wst.internet.monitor.core.IRequestListener&lt;/b&gt;.

       </documentation>

    </annotation>

 

diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/.cvsignore b/plugins/org.eclipse.wst.internet.monitor.ui/.cvsignore
index 5e94b5571..7d2f75bea 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/.cvsignore
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/.cvsignore
@@ -2,4 +2,4 @@ bin
 monitorui.jar
 build.xml
 temp.folder
-org.eclipse.wst.monitor.ui_3.0.0.jar
+org.eclipse.wst.internet.monitor.ui_3.0.0.jar
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/.project b/plugins/org.eclipse.wst.internet.monitor.ui/.project
index 7d1769e8f..f013cb2b9 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/.project
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/.project
@@ -3,7 +3,7 @@
 	<name>org.eclipse.wst.internet.monitor.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.wst.monitor.core</project>
+		<project>org.eclipse.wst.internet.monitor.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/ContentViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/ContentViewer.java
index 4e3fcf1da..97ea26a83 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/ContentViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/ContentViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui;
+package org.eclipse.wst.internet.monitor.ui;
 
 import org.eclipse.swt.widgets.Composite;
 /**
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/EditableContentViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/EditableContentViewer.java
index a6d582742..e34525dfa 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/EditableContentViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/EditableContentViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui;
+package org.eclipse.wst.internet.monitor.ui;
 /**
  * Editable viewer interface for viewing and editing requests and responses.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/ContextIds.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/ContextIds.java
index 68665b17d..7bcda23e8 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/ContextIds.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/ContextIds.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 /**
  * Constant ids for context help.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorComposite.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorComposite.java
index be1242c9c..eb7e2bfb6 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorComposite.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorComposite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -29,9 +29,9 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.monitor.core.IMonitor;
-import org.eclipse.wst.monitor.core.IMonitorWorkingCopy;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorContentProvider.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorContentProvider.java
index c756ded13..38e66c4a4 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorContentProvider.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorContentProvider.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
 /**
  * Monitor content provider.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorDialog.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorDialog.java
index bd7abd897..1de67d7be 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorDialog.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorDialog.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import java.net.InetAddress;
 
@@ -27,9 +27,9 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.monitor.core.IMonitorWorkingCopy;
-import org.eclipse.wst.monitor.core.IProtocolAdapter;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
+import org.eclipse.wst.internet.monitor.core.IProtocolAdapter;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorPreferencePage.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPreferencePage.java
index 2c1e974de..1128741f6 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorPreferencePage.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.layout.*;
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorPrefrencesDialog.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPrefrencesDialog.java
index df1a6993d..1269ba5a6 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorPrefrencesDialog.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorPrefrencesDialog.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.monitor.core.IMonitorWorkingCopy;
+import org.eclipse.wst.internet.monitor.core.IMonitorWorkingCopy;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorTableLabelProvider.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorTableLabelProvider.java
index 3856d5913..8687122aa 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorTableLabelProvider.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorTableLabelProvider.java
@@ -8,12 +8,12 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.monitor.core.IMonitor;
+import org.eclipse.wst.internet.monitor.core.IMonitor;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 /**
  * Monitor table label provider.
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorUIPlugin.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorUIPlugin.java
index 374cef0cd..be5902b9b 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/MonitorUIPlugin.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/MonitorUIPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import java.net.URL;
 import java.text.MessageFormat;
@@ -22,13 +22,13 @@ import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IActionFilter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IRequest;
 import org.osgi.framework.BundleContext;
 /**
  * The TCP/IP monitor UI plugin.
  */
 public class MonitorUIPlugin extends AbstractUIPlugin {
-	public static final String PLUGIN_ID = "org.eclipse.wst.monitor.ui";
+	public static final String PLUGIN_ID = "org.eclipse.wst.internet.monitor.ui";
 
 	private static MonitorUIPlugin singleton;
 
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/RequestActionFilter.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/RequestActionFilter.java
index 0872b665a..387e9604f 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/RequestActionFilter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/RequestActionFilter.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import org.eclipse.ui.IActionFilter;
-import org.eclipse.wst.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IRequest;
 /**
  * An action filter for requests.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/RequestListener.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/RequestListener.java
index c81a64bf9..cd082cce7 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/RequestListener.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/RequestListener.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IRequestListener;
-import org.eclipse.wst.monitor.ui.internal.view.MonitorView;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IRequestListener;
+import org.eclipse.wst.internet.monitor.ui.internal.view.MonitorView;
 /**
  * Open the monitor view if there is new activity.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/SWTUtil.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/SWTUtil.java
index 19b31853c..ef5fadd6b 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/SWTUtil.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/SWTUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/Trace.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/Trace.java
index 42a51c948..cf23e0bea 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/Trace.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/Trace.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal;
+package org.eclipse.wst.internet.monitor.ui.internal;
 /**
  * Helper class to route trace output.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/FilterAction.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/FilterAction.java
index 410f935a1..bd563a0d5 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/FilterAction.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/FilterAction.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.monitor.core.IContentFilter;
+import org.eclipse.wst.internet.monitor.core.IContentFilter;
 /**
  * 
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/IViewerManager.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/IViewerManager.java
index 0d7e79b4e..9c0ff0ae1 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/IViewerManager.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/IViewerManager.java
@@ -8,15 +8,15 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import java.util.List;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.monitor.core.IContentFilter;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.ui.ContentViewer;
-import org.eclipse.wst.monitor.ui.internal.viewers.HeaderViewer;
+import org.eclipse.wst.internet.monitor.core.IContentFilter;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.ui.ContentViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.viewers.HeaderViewer;
 /**
  * Manager interface for TCP/IP request and response message viewers
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/ModifyMessageAction.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/ModifyMessageAction.java
index ed27c9795..586a43c37 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/ModifyMessageAction.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/ModifyMessageAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -16,9 +16,9 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IResendRequest;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IResendRequest;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
 /**
  * Modify the selected message. Creates a new resendrequest and adds it
  * to the tree.
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/MonitorTreeContentProvider.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorTreeContentProvider.java
index 3496cf4b3..68efa1590 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/MonitorTreeContentProvider.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorTreeContentProvider.java
@@ -8,15 +8,15 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IResendRequest;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IResendRequest;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
 /**
  * Content provider for the monitor server view.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/MonitorView.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java
index 72f9a6db2..b06f116f9 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/MonitorView.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
@@ -33,8 +33,8 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.ui.*;
 import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.part.ViewPart;
-import org.eclipse.wst.monitor.core.*;
-import org.eclipse.wst.monitor.ui.internal.*;
+import org.eclipse.wst.internet.monitor.core.*;
+import org.eclipse.wst.internet.monitor.ui.internal.*;
 /**
  * View of TCP/IP activity.
  */
@@ -49,8 +49,8 @@ public class MonitorView extends ViewPart {
 	protected List responseViewers;
 
 	protected static SimpleDateFormat format = new SimpleDateFormat(MonitorUIPlugin.getResource("%viewDateFormat"));
-	protected static final String VIEW_ID = "org.eclipse.wst.monitor.view";
-	protected static final String DEFAULT_VIEWER = "org.eclipse.wst.monitor.viewers.byteviewer";
+	protected static final String VIEW_ID = "org.eclipse.wst.internet.monitor.view";
+	protected static final String DEFAULT_VIEWER = "org.eclipse.wst.internet.monitor.viewers.byteviewer";
 
 	protected IAction httpHeaderAction;
 	
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/ResendMessageAction.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/ResendMessageAction.java
index 385fbfafd..a56f65bb7 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/ResendMessageAction.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/ResendMessageAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -16,9 +16,9 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IResendRequest;
-import org.eclipse.wst.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IResendRequest;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
 /**
  * Resends the selected request and adds the result to the request/response tree.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/SendModifiedMessageAction.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/SendModifiedMessageAction.java
index 645df7f6f..f1a2ec9f2 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/SendModifiedMessageAction.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/SendModifiedMessageAction.java
@@ -8,18 +8,18 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IResendRequest;
-import org.eclipse.wst.monitor.ui.ContentViewer;
-import org.eclipse.wst.monitor.ui.EditableContentViewer;
-import org.eclipse.wst.monitor.ui.internal.viewers.HeaderViewer;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IResendRequest;
+import org.eclipse.wst.internet.monitor.ui.ContentViewer;
+import org.eclipse.wst.internet.monitor.ui.EditableContentViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.viewers.HeaderViewer;
 /**
  * Send a modified message.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/TreeLabelProvider.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/TreeLabelProvider.java
index 82ee82bdd..b335b0cfa 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/TreeLabelProvider.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/TreeLabelProvider.java
@@ -8,14 +8,14 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.IResendRequest;
-import org.eclipse.wst.monitor.ui.internal.MonitorUIPlugin;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.IResendRequest;
+import org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin;
 /**
  * A label provider for the monitor server view.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/ViewerManager.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/ViewerManager.java
index b176422c4..b90fc3b89 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/view/ViewerManager.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/ViewerManager.java
@@ -8,20 +8,20 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.view;
+package org.eclipse.wst.internet.monitor.ui.internal.view;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import org.eclipse.core.runtime.*;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.monitor.core.*;
-import org.eclipse.wst.monitor.ui.ContentViewer;
-import org.eclipse.wst.monitor.ui.EditableContentViewer;
-import org.eclipse.wst.monitor.ui.internal.MonitorUIPlugin;
-import org.eclipse.wst.monitor.ui.internal.Trace;
-import org.eclipse.wst.monitor.ui.internal.viewers.ByteViewer;
-import org.eclipse.wst.monitor.ui.internal.viewers.HeaderViewer;
+import org.eclipse.wst.internet.monitor.core.*;
+import org.eclipse.wst.internet.monitor.ui.ContentViewer;
+import org.eclipse.wst.internet.monitor.ui.EditableContentViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin;
+import org.eclipse.wst.internet.monitor.ui.internal.Trace;
+import org.eclipse.wst.internet.monitor.ui.internal.viewers.ByteViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.viewers.HeaderViewer;
 /**
  * 
  */
@@ -72,7 +72,7 @@ public class ViewerManager implements IViewerManager{
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.view.IViewerManager#setDisplayHeaderInfo(boolean)
+	 * @see org.eclipse.wst.internet.monitor.internal.view.IViewerManager#setDisplayHeaderInfo(boolean)
 	 */
 	public void setDisplayHeaderInfo(boolean b) {
 		displayHeaderInf = b;
@@ -88,7 +88,7 @@ public class ViewerManager implements IViewerManager{
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.internal.view.IViewerManager#getDisplayHeaderInfo()
+	 * @see org.eclipse.wst.internet.monitor.internal.view.IViewerManager#getDisplayHeaderInfo()
 	 */
 	public boolean getDisplayHeaderInfo() {
 		return displayHeaderInf;
@@ -247,14 +247,14 @@ public class ViewerManager implements IViewerManager{
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.internal.view.IViewerManager#getCurrentRequestViewer()
+	 * @see org.eclipse.wst.internet.monitor.ui.internal.view.IViewerManager#getCurrentRequestViewer()
 	 */
 	public ContentViewer getCurrentRequestViewer() {
 		return reqViewer;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.internal.view.IViewerManager#getCurrentRequestHeaderViewer()
+	 * @see org.eclipse.wst.internet.monitor.ui.internal.view.IViewerManager#getCurrentRequestHeaderViewer()
 	 */
 	public HeaderViewer getCurrentRequestHeaderViewer() {
 		return reqHeader;
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/ByteViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/ByteViewer.java
index 236c7ac1c..26f6912d4 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/ByteViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/ByteViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.viewers;
+package org.eclipse.wst.internet.monitor.ui.internal.viewers;
  
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
@@ -18,9 +18,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.monitor.core.MonitorCore;
-import org.eclipse.wst.monitor.ui.EditableContentViewer;
-import org.eclipse.wst.monitor.ui.internal.ContextIds;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.ui.EditableContentViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.ContextIds;
 /**
  * A basic byte viewer.
  */
@@ -29,14 +29,14 @@ public class ByteViewer extends EditableContentViewer {
 	protected Composite comp;
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#dispose()
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#dispose()
 	 */
 	public void dispose() {
 		comp.dispose();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#setContent()
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#setContent()
 	 */
 	public void setContent(byte[] b) {
 		String out = "";
@@ -54,7 +54,7 @@ public class ByteViewer extends EditableContentViewer {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#init(Composite)
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#init(Composite)
 	 */
 	public void init(Composite parent) {
 		comp = new Composite(parent, SWT.NONE);
@@ -76,14 +76,14 @@ public class ByteViewer extends EditableContentViewer {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IEditableContentViewer#setEditable(boolean)
+	 * @see org.eclipse.wst.internet.monitor.ui.IEditableContentViewer#setEditable(boolean)
 	 */
 	public void setEditable(boolean editable) {
 		text.setEditable(editable);
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IEditableContentViewer#getContent()
+	 * @see org.eclipse.wst.internet.monitor.ui.IEditableContentViewer#getContent()
 	 */
 	public byte[] getContent() {
 		if (text == null) {
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/HeaderViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/HeaderViewer.java
index fbeefaf09..f1616838e 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/HeaderViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/HeaderViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.viewers;
+package org.eclipse.wst.internet.monitor.ui.internal.viewers;
 
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
@@ -19,10 +19,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.monitor.core.IRequest;
-import org.eclipse.wst.monitor.core.MonitorCore;
-import org.eclipse.wst.monitor.ui.internal.ContextIds;
-import org.eclipse.wst.monitor.ui.internal.MonitorUIPlugin;
+import org.eclipse.wst.internet.monitor.core.IRequest;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.ui.internal.ContextIds;
+import org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin;
 /**
  * An transport (header) viewer.
  */
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/ImageViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/ImageViewer.java
index cb2da5bad..d07c13661 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/ImageViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/ImageViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.viewers;
+package org.eclipse.wst.internet.monitor.ui.internal.viewers;
 
 import java.io.ByteArrayInputStream;
 
@@ -19,8 +19,8 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.monitor.ui.ContentViewer;
-import org.eclipse.wst.monitor.ui.internal.MonitorUIPlugin;
+import org.eclipse.wst.internet.monitor.ui.ContentViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin;
 /**
  * An image viewer.
  */
@@ -30,7 +30,7 @@ public class ImageViewer extends ContentViewer {
 	protected Label messageLabel;
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#init(Composite)
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#init(Composite)
 	 */
 	public void init(Composite parent) {
 		rootComp = parent;
@@ -49,7 +49,7 @@ public class ImageViewer extends ContentViewer {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#setContent()
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#setContent()
 	 */
 	public void setContent(byte[] b) {
 		if (b == null || b.length == 0) {
@@ -85,7 +85,7 @@ public class ImageViewer extends ContentViewer {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#dispose()
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#dispose()
 	 */
 	public void dispose() {
 		viewerComp.dispose();
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/XMLViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/XMLViewer.java
index 4fa1dbd69..cedb8cd90 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/monitor/ui/internal/viewers/XMLViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/XMLViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.monitor.ui.internal.viewers;
+package org.eclipse.wst.internet.monitor.ui.internal.viewers;
  
 import java.io.*;
 
@@ -34,10 +34,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.monitor.core.MonitorCore;
-import org.eclipse.wst.monitor.ui.ContentViewer;
-import org.eclipse.wst.monitor.ui.internal.ContextIds;
-import org.eclipse.wst.monitor.ui.internal.MonitorUIPlugin;
+import org.eclipse.wst.internet.monitor.core.MonitorCore;
+import org.eclipse.wst.internet.monitor.ui.ContentViewer;
+import org.eclipse.wst.internet.monitor.ui.internal.ContextIds;
+import org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin;
 
 import org.w3c.dom.*;
 import org.xml.sax.*;
@@ -59,14 +59,14 @@ public class XMLViewer extends ContentViewer {
 	protected String originalEncoding;
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#dispose()
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#dispose()
 	 */
 	public void dispose() {
 		viewerComp.dispose();
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#setContent()
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#setContent()
 	 */
 	public void setContent(byte[] b) {
 		String out = "";		
@@ -129,7 +129,7 @@ public class XMLViewer extends ContentViewer {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.monitor.ui.IContentViewer#init(Composite)
+	 * @see org.eclipse.wst.internet.monitor.ui.IContentViewer#init(Composite)
 	 */
 	public void init(Composite parent) {
 		rootComp = parent;
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/plugin.xml b/plugins/org.eclipse.wst.internet.monitor.ui/plugin.xml
index a71efd983..c16606f72 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/plugin.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 
-<plugin id="org.eclipse.wst.monitor.ui"
+<plugin id="org.eclipse.wst.internet.monitor.ui"
   name="%pluginName"
   version="1.0.0"
   provider-name="%providerName"
-  class="org.eclipse.wst.monitor.ui.internal.MonitorUIPlugin">
+  class="org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin">
 
 <requires>
   <import plugin="org.eclipse.core.runtime"/>
   <import plugin="org.eclipse.ui.ide"/>
   <import plugin="org.eclipse.ui"/>
-  <import plugin="org.eclipse.wst.monitor.core"/>
+  <import plugin="org.eclipse.wst.internet.monitor.core"/>
 </requires>
 
 <runtime>
@@ -23,80 +23,80 @@
 <extension-point name="%extensionPointViewers" id="viewers" schema="schema/viewers.exsd"/>
 
 
-<extension point="org.eclipse.wst.monitor.core.requestListeners">
+<extension point="org.eclipse.wst.internet.monitor.core.requestListeners">
   <requestListener
-    id="org.eclipse.wst.monitor.ui.requestListener"
-    class="org.eclipse.wst.monitor.ui.internal.RequestListener"/>
+    id="org.eclipse.wst.internet.monitor.ui.requestListener"
+    class="org.eclipse.wst.internet.monitor.ui.internal.RequestListener"/>
 </extension>
 
 <extension point="org.eclipse.ui.views"> 
   <view
-    id="org.eclipse.wst.monitor.view"
+    id="org.eclipse.wst.internet.monitor.view"
     name="%viewTitle"
     category="org.eclipse.debug.ui"
-    class="org.eclipse.wst.monitor.ui.internal.view.MonitorView"
+    class="org.eclipse.wst.internet.monitor.ui.internal.view.MonitorView"
     icon="icons/cview16/monitorView.gif">
   </view>
 </extension>
 
 <extension point="org.eclipse.ui.preferencePages">
   <page
-    id="org.eclipse.wst.monitor.preferencePage"
+    id="org.eclipse.wst.internet.monitor.preferencePage"
     name="%preferenceTitle"
     category="org.eclipse.internet"
-    class="org.eclipse.wst.monitor.ui.internal.MonitorPreferencePage"/>
+    class="org.eclipse.wst.internet.monitor.ui.internal.MonitorPreferencePage"/>
 </extension>
 
-<extension point="org.eclipse.wst.monitor.ui.viewers">
+<extension point="org.eclipse.wst.internet.monitor.ui.viewers">
   <viewer
-    id="org.eclipse.wst.monitor.viewers.byteviewer"
-    class="org.eclipse.wst.monitor.ui.internal.viewers.ByteViewer"
+    id="org.eclipse.wst.internet.monitor.viewers.byteviewer"
+    class="org.eclipse.wst.internet.monitor.ui.internal.viewers.ByteViewer"
     type="requestresponse"
     label="%byteView"/>
   <viewer
-    id="org.eclipse.wst.monitor.viewers.imageviewer"
-    class="org.eclipse.wst.monitor.ui.internal.viewers.ImageViewer"
+    id="org.eclipse.wst.internet.monitor.viewers.imageviewer"
+    class="org.eclipse.wst.internet.monitor.ui.internal.viewers.ImageViewer"
     type="requestresponse"
     label="%imageView"/>
   <viewer
-    id="org.eclipse.wst.monitor.viewers.XMLViewer"
-    class="org.eclipse.wst.monitor.ui.internal.viewers.XMLViewer"
+    id="org.eclipse.wst.internet.monitor.viewers.XMLViewer"
+    class="org.eclipse.wst.internet.monitor.ui.internal.viewers.XMLViewer"
     type="requestresponse"
     label="%xmlView"/>
 </extension>
 
 <extension point="org.eclipse.ui.popupMenus">
     <objectContribution
-          objectClass="org.eclipse.wst.monitor.core.IRequest"
-          id="org.eclipse.wst.monitor.ui.modifyaction">
+          objectClass="org.eclipse.wst.internet.monitor.core.IRequest"
+          id="org.eclipse.wst.internet.monitor.ui.modifyaction">
        <filter name="requestsent" value="true"/>
        <action
              label="%actionResend"
              menubarPath="additions"
-             class="org.eclipse.wst.monitor.ui.internal.view.ResendMessageAction"
+             class="org.eclipse.wst.internet.monitor.ui.internal.view.ResendMessageAction"
              enablesFor="1"
-             id="org.eclipse.wst.monitor.ui.internal.view.ResendMessageAction"
+             id="org.eclipse.wst.internet.monitor.ui.internal.view.ResendMessageAction"
              icon="icons/elcl16/resendRequest.gif">
        </action>
        <action
              label="%actionModify"
              menubarPath="additions"
-             class="org.eclipse.wst.monitor.ui.internal.view.ModifyMessageAction"
+             class="org.eclipse.wst.internet.monitor.ui.internal.view.ModifyMessageAction"
              enablesFor="1"
-             id="org.eclipse.wst.monitor.ui.internal.view.ModifyMessageAction"
+             id="org.eclipse.wst.internet.monitor.ui.internal.view.ModifyMessageAction"
              icon="icons/etool16/editRequest.gif">
        </action>
     </objectContribution>
     <objectContribution
-          objectClass="org.eclipse.wst.monitor.core.IRequest"
-          id="org.eclipse.wst.monitor.ui.sendmodifyaction">
+          objectClass="org.eclipse.wst.internet.monitor.core.IRequest"
+          id="org.eclipse.wst.internet.monitor.ui.sendmodifyaction">
        <filter name="requestsent" value="false"/>    
        <action
              label="%actionModifyResend"
              menubarPath="additions"
-             class="org.eclipse.wst.monitor.ui.internal.view.SendModifiedMessageAction"
+             class="org.eclipse.wst.internet.monitor.ui.internal.view.SendModifiedMessageAction"
              enablesFor="1"
-             id="org.eclipse.wst.monitor.ui.internal.view.SendModifiedMessageAction"
+             id="org.eclipse.wst.internet.monitor.ui.internal.view.SendModifiedMessageAction"
              icon="icons/elcl16/resendRequest.gif">
        </action>
     </objectContribution>
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/schema/viewers.exsd b/plugins/org.eclipse.wst.internet.monitor.ui/schema/viewers.exsd
index 613f1887c..052ee01fc 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/schema/viewers.exsd
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/schema/viewers.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>

 <!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.wst.monitor.ui">

+<schema targetNamespace="org.eclipse.wst.internet.monitor.ui">

 <annotation>

       <appInfo>

-         <meta.schema plugin="org.eclipse.wst.monitor.ui" id="viewers" name="Content Viewers"/>

+         <meta.schema plugin="org.eclipse.wst.internet.monitor.ui" id="viewers" name="Content Viewers"/>

       </appInfo>

       <documentation>

          This extension point is used to provide a viewer for a specific type of content. (e.g. a viewer for a particular image format)

@@ -58,7 +58,7 @@
          <attribute name="class" type="string" use="required">

             <annotation>

                <documentation>

-                  specifies the fully qualified name of the Java class that extends &lt;samp&gt;org.eclipse.wst.monitor.ui.ContentViewer&lt;/samp&gt;. Viewers instances of this type will delegate to instances of this class.

+                  specifies the fully qualified name of the Java class that extends &lt;samp&gt;org.eclipse.wst.internet.monitor.ui.ContentViewer&lt;/samp&gt;. Viewers instances of this type will delegate to instances of this class.

                </documentation>

                <appInfo>

                   <meta.attribute kind="java" basedOn="org.eclipse.wst.server.core.model.IStartup"/>

@@ -91,7 +91,7 @@
 
 &lt;p&gt;
 &lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.wst.monitor.ui.viewers&quot;&gt;
+&lt;extension point=&quot;org.eclipse.wst.internet.monitor.ui.viewers&quot;&gt;
   &lt;viewer
     id=&quot;com.example.byteviewer&quot;
     class=&quot;com.example.ByteContentViewer&quot;
@@ -108,7 +108,7 @@
          <meta.section type="apiInfo"/>

       </appInfo>

       <documentation>

-         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that extends the abstract class &lt;b&gt;org.eclipse.wst.monitor.ui.ContentViewer&lt;/b&gt;.

+         Value of the attribute &lt;b&gt;class&lt;/b&gt; must be a fully qualified name of a Java class that extends the abstract class &lt;b&gt;org.eclipse.wst.internet.monitor.ui.ContentViewer&lt;/b&gt;.

       </documentation>

    </annotation>