Tons o' renames.  Expect most everything to be broken now. :(
diff --git a/examples/org.eclipse.e4.ui.deeplink.example.client.ui/plugin.xml b/examples/org.eclipse.e4.ui.deeplink.example.client.ui/plugin.xml
index 4c80981..2609094 100644
--- a/examples/org.eclipse.e4.ui.deeplink.example.client.ui/plugin.xml
+++ b/examples/org.eclipse.e4.ui.deeplink.example.client.ui/plugin.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-   <extension

-         point="org.eclipse.ui.perspectives">

-      <perspective

-            name="Perspective"

-            class="org.eclipse.e4.ui.deeplink.example.client.ui.Perspective"

-            id="org.eclipse.e4.enterprise.deeplink.example.client.ui.perspective">

-      </perspective>

-      <perspective

-            class="org.eclipse.e4.ui.deeplink.example.client.ui.PerspectiveFactory2"

-            id="org.eclipse.e4.enterprise.deeplink.example.client.ui.perspective2"

-            name="Second Perspective">

-      </perspective>

-   </extension>

-   <extension

-         point="org.eclipse.ui.views">

-      <view

-            name="View"

-            class="org.eclipse.e4.ui.deeplink.example.client.ui.View"

-            id="org.eclipse.e4.enterprise.deeplink.example.client.ui.view">

-      </view>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            name="Perspective"
+            class="org.eclipse.e4.ui.deeplink.example.client.ui.Perspective"
+            id="org.eclipse.e4.ui.deeplink.example.client.ui.Perspective">
+      </perspective>
+      <perspective
+            class="org.eclipse.e4.ui.deeplink.example.client.ui.PerspectiveFactory2"
+            id="org.eclipse.e4.ui.deeplink.example.client.ui.Perspective2"
+            name="Second Perspective">
+      </perspective>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            name="View"
+            class="org.eclipse.e4.ui.deeplink.example.client.ui.View"
+            id="org.eclipse.e4.ui.deeplink.example.client.ui.View">
+      </view>
+   </extension>
+
+</plugin>
diff --git a/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/Activator.java b/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/Activator.java
index 4d363c6..65a5173 100644
--- a/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/Activator.java
+++ b/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/Activator.java
@@ -8,64 +8,64 @@
  * Contributors:
  *    David Orme - initial API and implementation
  ******************************************************************************/
-package org.eclipse.e4.ui.deeplink.example.client.ui;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.e4.enterprise.example.client.ui";

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns an image descriptor for the image file at the given

-	 * plug-in relative path

-	 *

-	 * @param path the path

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor getImageDescriptor(String path) {

-		return imageDescriptorFromPlugin(PLUGIN_ID, path);

-	}

-}

+package org.eclipse.e4.ui.deeplink.example.client.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.e4.ui.deeplink.example.client.ui";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+}
diff --git a/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/View.java b/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/View.java
index 576d21d..cb8605b 100644
--- a/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/View.java
+++ b/examples/org.eclipse.e4.ui.deeplink.example.client.ui/src/org/eclipse/e4/ui/deeplink/example/client/ui/View.java
@@ -28,7 +28,7 @@
 
 
 public class View extends ViewPart {
-	public static final String ID = "org.eclipse.e4.enterprise.deeplink.example.client.ui.view";
+	public static final String ID = "org.eclipse.e4.ui.deeplink.example.client.ui.View";
 
 	private TableViewer viewer;