Merge branch 'master' into lttng_2_0_control_dev

Conflicts:
	lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
	lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
	lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
	lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java

241 files changed, 1779 insertions, 1686 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
index b675f53ca5..c322109fac 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui;singleton:=true
 Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin
+Bundle-Activator: org.eclipse.linuxtools.internal.lttng.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.7.0",
@@ -21,40 +21,41 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.lttng.ui;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.model.trange;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.connectorservice;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.common;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.control.dialogs,
- org.eclipse.linuxtools.lttng.ui.views.control.handlers,
- org.eclipse.linuxtools.lttng.ui.views.control.model,
- org.eclipse.linuxtools.lttng.ui.views.control.model.impl,
- org.eclipse.linuxtools.lttng.ui.views.control.property,
- org.eclipse.linuxtools.lttng.ui.views.control.remote,
- org.eclipse.linuxtools.lttng.ui.views.control.service,
- org.eclipse.linuxtools.lttng.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.controlflow.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.distribution.model,
- org.eclipse.linuxtools.lttng.ui.views.events;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.latency;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.latency.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.latency.listeners;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.latency.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.resources.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.statistics;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.statistics.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.lttng.ui.views.timeframe;x-friends:="org.eclipse.linuxtools.lttng.ui.tests"
+Export-Package: org.eclipse.linuxtools.internal.lttng.ui;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.model.trange;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.common;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.property;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.remote;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.control.service;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.events;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.latency;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.resources.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.statistics;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.ui.views.timeframe;x-friends:="org.eclipse.linuxtools.lttng.ui.tests"
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties
index 92ae682c95..f97faa6791 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.linuxtools.lttng.ui
-Bundle-Name = LTTng UI
+Bundle-Name = LTTng UI (legacy)
 Bundle-Vendor = Eclipse Linux Tools
 
 #Properties file for org.eclipse.linuxtools.tmf.ui (plugin.xml)
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml
index 5006e74a05..53a113c28a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml
@@ -5,7 +5,7 @@
          id="org.eclipse.linuxtools.lttng.ui.perspective"
          point="org.eclipse.ui.perspectives">
       <perspective
-            class="org.eclipse.linuxtools.lttng.ui.views.PerspectiveFactory"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.PerspectiveFactory"
             icon="icons/obj16/garland16.png"
             id="org.eclipse.linuxtools.lttng.ui.perspective"
             name="%perspective.category.name">
@@ -21,16 +21,16 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng.ui.views.category"
-            class="org.eclipse.linuxtools.lttng.ui.views.control.ControlView"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView"
             icon="icons/eview16/control_view.gif"
-            id="org.eclipse.linuxtools.lttng.ui.views.control"
+            id="org.eclipse.linuxtools.internal.lttng.ui.views.control"
             name="%control.view.name"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng.ui.views.category"
-            class="org.eclipse.linuxtools.lttng.ui.views.timeframe.TimeFrameView"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.timeframe.TimeFrameView"
             icon="icons/eview16/time_frame_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.timeframe"
             name="%timeframe.view.name"
@@ -39,7 +39,7 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng.ui.views.category"
-            class="org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.ControlFlowView"
             icon="icons/eview16/control_flow_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.controlflow"
             name="%controlflow.view.name"
@@ -48,7 +48,7 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng.ui.views.category"
-            class="org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.resources.ResourcesView"
             icon="icons/eview16/resources_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.resources"
             name="%resources.view.name"
@@ -57,7 +57,7 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng.ui.views.category"
-            class="org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.statistics.StatisticsView"
             icon="icons/eview16/statistics_view.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.statistics"
             name="%statistics.view.name"
@@ -66,7 +66,7 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng.ui.views.category"
-            class="org.eclipse.linuxtools.lttng.ui.views.latency.LatencyView"
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.latency.LatencyView"
             icon="icons/eview16/graph.gif"
             id="org.eclipse.linuxtools.lttng.ui.views.latency"
             name="%latency.view.name"
@@ -81,7 +81,7 @@
       </category>
       <wizard
             category="org.eclipse.linuxtools.lttng.ui.wizards.new"
-            class="org.eclipse.linuxtools.lttng.ui.project.dialogs.NewLTTngProjectWizard"
+            class="org.eclipse.linuxtools.internal.lttng.ui.project.dialogs.NewLTTngProjectWizard"
             descriptionImage="icons/obj16/garland16.png"
             finalPerspective="org.eclipse.linuxtools.lttng.ui.perspective"
             icon="icons/obj16/garland16.png"
@@ -98,7 +98,7 @@
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-               class="org.eclipse.linuxtools.lttng.core.LTTngProjectNature">
+               class="org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature">
          </run>
       </runtime>
    </extension>
@@ -116,121 +116,121 @@
          point="org.eclipse.ui.commands">
       <category
             description="%commands.control.category.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             name="%commands.control.category">
       </category>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.new.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.newConnection"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.newConnection"
             name="%commands.control.new">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.connect.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.connect"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.connect"
             name="%commands.control.connect">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.disconnect.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.disconnect"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disconnect"
             name="%commands.control.disconnect">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.refresh.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.refresh"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.refresh"
             name="%commands.control.refresh">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.delete.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.delete"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.delete"
             name="%commands.control.delete">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.create.session.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.createSession"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createSession"
             name="%commands.control.create.session">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.destroy.session.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.destroySession"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.destroySession"
             name="%commands.control.destroy.session">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.create.channel.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.createChannelOnSession"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createChannelOnSession"
             name="%commands.control.create.channel">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.create.channel.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.createChannelOnDomain"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createChannelOnDomain"
             name="%commands.control.create.channel">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.enable.channel.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.enableChannel"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enableChannel"
             name="%commands.control.enable.channel">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.disable.channel.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.disableChannel"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disableChannel"
             name="%commands.control.disable.channel">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.start.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.start"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.start"
             name="%commands.control.start">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.stop.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.stop"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.stop"
             name="%commands.control.stop">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.enable.assign.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.assign.event"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.assign.event"
             name="%commands.control.enable.event">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.enable.event.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.enable.event"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.event"
             name="%commands.control.enable.event">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.disable.event.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.disable.event"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disable.event"
             name="%commands.control.disable.event">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.enable.event.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnChannel"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnChannel"
             name="%commands.control.enable.event">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.enable.eventOnDomain.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnDomain"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnDomain"
             name="%commands.control.enable.eventOnDomain">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.lttng.ui.commands.control.category"
+            categoryId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.category"
             description="%commands.control.enable.eventOnDomain.description"
-            id="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnSession"
+            id="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnSession"
             name="%commands.control.enable.eventOnDomain">
       </command>
       
@@ -239,55 +239,55 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="toolbar:org.eclipse.linuxtools.lttng.ui.views.control">
+            locationURI="toolbar:org.eclipse.linuxtools.internal.lttng.ui.views.control">
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.newConnection"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.newConnection"
                icon="icons/elcl16/target_add.gif"
                label="%commands.control.new"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.connect"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.connect"
                icon="icons/elcl16/connect.gif"
                label="%commands.control.connect"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disconnect"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disconnect"
                icon="icons/elcl16/disconnect.gif"
                label="%commands.control.disconnect"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.refresh"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.refresh"
                icon="icons/elcl16/refresh.gif"
                label="%commands.control.refresh"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.delete"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.delete"
                icon="icons/elcl16/target_delete.gif"
                label="%commands.control.delete"
                style="push">
          </command>
          <separator
-               name="org.eclipse.linuxtools.lttng.ui.views.control.toolbar.separator1"
+               name="org.eclipse.linuxtools.internal.lttng.ui.views.control.toolbar.separator1"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.start"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.start"
                icon="icons/elcl16/start_trace.gif"
                label="%commands.control.start"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.stop"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.stop"
                icon="icons/elcl16/pause_trace.gif"
                label="%commands.control.stop"
                style="push">
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.destroySession"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.destroySession"
                icon="icons/elcl16/delete_trace.gif"
                label="%commands.control.destroy.session"
                style="push">
@@ -296,9 +296,9 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.linuxtools.lttng.ui.views.control">
+            locationURI="popup:org.eclipse.linuxtools.internal.lttng.ui.views.control">
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.connect"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.connect"
                icon="icons/elcl16/connect.gif"
                label="%commands.control.connect"
                style="push">
@@ -309,14 +309,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disconnect"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disconnect"
                icon="icons/elcl16/disconnect.gif"
                label="%commands.control.disconnect"
                style="push">
@@ -327,14 +327,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.refresh"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.refresh"
                icon="icons/elcl16/refresh.gif"
                label="%commands.control.refresh"
                style="push">
@@ -345,14 +345,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.delete"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.delete"
                icon="icons/elcl16/target_delete.gif"
                label="%commands.control.delete"
                style="push">
@@ -363,14 +363,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.createSession"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createSession"
                icon="icons/elcl16/add_button.gif"
                label="%commands.control.create.session"
                style="push">
@@ -381,14 +381,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.start"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.start"
                icon="icons/elcl16/start_trace.gif"
                label="%commands.control.start"
                style="push">
@@ -399,14 +399,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.stop"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.stop"
                icon="icons/elcl16/pause_trace.gif"
                label="%commands.control.stop"
                style="push">
@@ -417,14 +417,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.destroySession"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.destroySession"
                icon="icons/elcl16/delete_trace.gif"
                label="%commands.control.destroy.session"
                style="push">
@@ -435,18 +435,18 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <separator
-               name="org.eclipse.linuxtools.lttng.ui.views.control.popup.separator1"
+               name="org.eclipse.linuxtools.internal.lttng.ui.views.control.popup.separator1"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.createChannelOnSession"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createChannelOnSession"
                icon="icons/elcl16/add_button.gif"
                label="%commands.control.create.channel"
                style="push">
@@ -458,14 +458,14 @@
                      <iterate
                            operator="or">
                         <instanceof
-                              value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                              value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                         </instanceof>
                      </iterate>
                      <not>
                         <iterate
                               operator="or">
                            <instanceof
-                                 value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent">
+                                 value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent">
                            </instanceof>
                         </iterate>
                      </not>
@@ -477,7 +477,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnSession"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnSession"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.enable.eventOnDomain"
                style="push">
@@ -489,7 +489,7 @@
                      <iterate
                            operator="or">
                         <instanceof
-                              value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                              value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                         </instanceof>
                      </iterate>
                      <count
@@ -500,7 +500,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.createChannelOnDomain"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createChannelOnDomain"
                icon="icons/elcl16/add_button.gif"
                label="%commands.control.create.channel"
                style="push">
@@ -512,14 +512,14 @@
                      <iterate
                            operator="or">
                         <instanceof
-                              value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent">
+                              value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent">
                         </instanceof>
                      </iterate>
                         <not>
                            <iterate
                                  operator="or">
                               <instanceof
-                                    value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                                    value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                               </instanceof>
                            </iterate>
                         </not>
@@ -531,7 +531,7 @@
                </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnDomain"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnDomain"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.enable.eventOnDomain"
                style="push">
@@ -543,7 +543,7 @@
                      <iterate
                            operator="or">
                         <instanceof
-                              value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent">
+                              value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent">
                         </instanceof>
                      </iterate>
                      <count
@@ -554,7 +554,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enableChannel"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enableChannel"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.enable.channel"
                style="push">
@@ -565,14 +565,14 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disableChannel"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disableChannel"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.disable.channel"
                style="push">
@@ -583,7 +583,7 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent">
                      </instanceof>
                   </iterate>
                </with>
@@ -591,7 +591,7 @@
          </command>
 
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.assign.event"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.assign.event"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.enable.event"
                style="push">
@@ -602,7 +602,7 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent">
                      </instanceof>
                   </iterate>
                </with>
@@ -610,7 +610,7 @@
          </command>
 
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.event"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.event"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.enable.event"
                style="push">
@@ -621,7 +621,7 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent">
                      </instanceof>
                   </iterate>
                </with>
@@ -629,7 +629,7 @@
          </command>
 
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disable.event"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disable.event"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.disable.event"
                style="push">
@@ -640,7 +640,7 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent">
+                           value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent">
                      </instanceof>
                   </iterate>
                </with>
@@ -648,7 +648,7 @@
          </command>
 
          <command
-               commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnChannel"
+               commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnChannel"
                icon="icons/elcl16/edit.gif"
                label="%commands.control.enable.event"
                style="push">
@@ -660,7 +660,7 @@
                      <iterate
                            operator="or">
                         <instanceof
-                              value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent">
+                              value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent">
                         </instanceof>
                      </iterate>
                      <count
@@ -679,162 +679,162 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.NewConnectionHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.newConnection">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.NewConnectionHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.newConnection">
          <activeWhen>
             <with
                   variable="activePart">
                <instanceof
-                     value="org.eclipse.linuxtools.lttng.ui.views.control.ControlView">
+                     value="org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView">
                </instanceof>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.ConnectHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.connect">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ConnectHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.connect">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.DisconnectHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disconnect">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.DisconnectHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disconnect">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.RefreshHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.refresh">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.RefreshHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.refresh">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.DeleteHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.delete">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.DeleteHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.delete">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.CreateSessionHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.createSession">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.CreateSessionHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createSession">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.DestroySessionHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.destroySession">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.DestroySessionHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.destroySession">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.CreateChannelOnSessionHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.createChannelOnSession">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.CreateChannelOnSessionHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createChannelOnSession">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.CreateChannelOnDomainHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.createChannelOnDomain">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.CreateChannelOnDomainHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.createChannelOnDomain">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.EnableChannelHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enableChannel">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.EnableChannelHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enableChannel">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.DisableChannelHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disableChannel">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.DisableChannelHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disableChannel">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -842,15 +842,15 @@
       </handler>
       
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.StartHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.start">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.StartHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.start">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -858,15 +858,15 @@
       </handler>
 
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.StopHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.stop">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.StopHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.stop">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -874,15 +874,15 @@
       </handler>
 
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.AssignEventHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.assign.event">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.AssignEventHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.assign.event">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -890,15 +890,15 @@
       </handler>
 
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.EnableEventHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.event">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.EnableEventHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.event">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -906,15 +906,15 @@
       </handler>
 
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.DisableEventHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.disable.event">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.DisableEventHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.disable.event">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -922,15 +922,15 @@
       </handler>
 
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.EnableEventOnChannelHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnChannel">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.EnableEventOnChannelHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnChannel">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -938,30 +938,30 @@
       </handler>
 
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.EnableEventOnDomainHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnDomain">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.EnableEventOnDomainHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnDomain">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent">
                   </instanceof>
                </iterate>
             </with>
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.lttng.ui.views.control.handlers.EnableEventOnSessionHandler"
-            commandId="org.eclipse.linuxtools.lttng.ui.commands.control.enable.eventOnSession">
+            class="org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.EnableEventOnSessionHandler"
+            commandId="org.eclipse.linuxtools.internal.lttng.ui.commands.control.enable.eventOnSession">
          <activeWhen>
             <with
                   variable="selection">
                <iterate
                      operator="or">
                   <instanceof
-                        value="org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent">
+                        value="org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent">
                   </instanceof>
                </iterate>
             </with>
@@ -975,11 +975,11 @@
     <extension point="org.eclipse.rse.core.subsystemConfigurations">
         <configuration
               category="users"
-              class="org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration"
+              class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration"
               description="%lttng.rse.subsystem.config.description"
               icon="icons/obj16/garland16.gif"
               iconlive="icons/obj16/garland16-live.gif"
-              id="org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration"
+              id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration"
               name="%lttng.rse.subsystem.config.name"
               systemTypeIds="org.eclipse.tm.tcf.rse.systemType"
               vendor="%Bundle-Vendor">
@@ -995,18 +995,18 @@
              description="%lttng.rse.subsystem.type.description"
              icon="icons/obj16/systemlttng.gif"
              iconLive="icons/obj16/systemlttng-live.gif"
-             id="org.eclipse.linuxtools.lttng.ui.tracecontrol.systemType"
+             id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.systemType"
              label="%lttng.rse.subsystem.type.name"
-             name="org.eclipse.linuxtools.lttng.ui.tracecontrol.systemType"
-             subsystemConfigurationIds="org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration;org.eclipse.tm.tcf.rse.Processes;org.eclipse.tm.tcf.rse.Shells;org.eclipse.tm.tcf.rse.Files;org.eclipse.tm.tcf.rse.Terminals">
+             name="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.systemType"
+             subsystemConfigurationIds="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration;org.eclipse.tm.tcf.rse.Processes;org.eclipse.tm.tcf.rse.Shells;org.eclipse.tm.tcf.rse.Files;org.eclipse.tm.tcf.rse.Terminals">
        </systemType>
        <systemType
              description="%trace.control.rse.system.type.description"
              icon="icons/obj16/systemlttng2.gif"
              iconLive="icons/obj16/systemlttng2-live.gif"
-             id="org.eclipse.linuxtools.lttng.ui.control.systemType"
+             id="org.eclipse.linuxtools.internal.lttng.ui.control.systemType"
              label="%trace.control.rse.system.type.name"
-             name="org.eclipse.linuxtools.lttng.ui.control.systemType"
+             name="org.eclipse.linuxtools.internal.lttng.ui.control.systemType"
              subsystemConfigurationIds="ssh.shells;ssh.files;ssh.terminals;processes.shell.linux">
        </systemType>
     </extension>
@@ -1016,10 +1016,10 @@
    <!-- ======================================= -->
    <extension point="org.eclipse.ui.popupMenus">
        <objectContribution
-             id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.deletetrace"
-             objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+             id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.deletetrace"
+             objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
           <action
-                class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.DeleteTrace"
+                class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.DeleteTrace"
                 enablesFor="*"
                 icon="icons/elcl16/delete_trace.gif"
                 id="actions.trace.delete"
@@ -1029,7 +1029,7 @@
              <enablement>
                 <and>
                    <objectClass
-                         name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                         name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                    </objectClass>
                    <objectState
                          name="canDelete"
@@ -1041,20 +1041,20 @@
        </objectContribution>
        <objectContribution
              adaptable="false"
-             id="org.eclipse.linuxtools.lttng.ui.tracecontrol.importtrace"
-             objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+             id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.importtrace"
+             objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
           <action
-                class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.ImportToProject"
+                class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.ImportToProject"
                 enablesFor="*"
                 icon="icons/elcl16/import_trace.gif"
-                id="org.eclipse.linuxtools.lttng.ui.tracecontrol.action1"
+                id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.action1"
                 label="%action.import.label"
                 menubarPath="additions"
                 tooltip="%action.import.tooltip">
              <enablement>
                 <and>
                    <objectClass
-                         name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                         name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                    </objectClass>
                    <objectState
                          name="canImport"
@@ -1065,48 +1065,48 @@
           </action>
        </objectContribution>
       <objectContribution
-               id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.createnewtrace"
-               objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource">
+               id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.createnewtrace"
+               objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource">
             <action
                    label="%action.newtrace.label"
                    tooltip="%action.newtrace.tooltip"
                    icon="icons/elcl16/new_trace.gif"
-                   class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.CreateNewTrace"
+                   class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.CreateNewTrace"
                    menubarPath="additions"
                    enablesFor="1"
                    id="actions.trace.new">
             <enablement>
              <and>
-              <objectClass name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource"/> 
+              <objectClass name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource"/> 
               <objectState name="canCreateNewTrace" value="yes"/> 
              </and>
             </enablement> 
            </action>
        </objectContribution>
        <objectContribution
-               objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource"
-               id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.configuretrace">
+               objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource"
+               id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.configuretrace">
            <action
                    label="%action.configuretrace.label"
                    tooltip="%action.configuretrace.tooltip"
                    icon="icons/elcl16/configure_trace.gif"
-                   class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.ConfigureTrace"
+                   class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.ConfigureTrace"
                    menubarPath="additions"
                    enablesFor="1"
                    id="actions.trace.configure">
             <enablement>
              <and>
-              <objectClass name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource"/> 
+              <objectClass name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource"/> 
               <objectState name="canConfigure" value="yes"/> 
              </and>
             </enablement> 
            </action>
        </objectContribution>
        <objectContribution
-             id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.stoptrace"
-             objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+             id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.stoptrace"
+             objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
           <action
-                class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.StopTrace"
+                class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.StopTrace"
                 enablesFor="*"
                 icon="icons/elcl16/stop_trace.gif"
                 id="actions.trace.stop"
@@ -1116,7 +1116,7 @@
              <enablement>
                 <and>
                    <objectClass
-                         name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                         name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                    </objectClass>
                    <objectState
                          name="canStop"
@@ -1127,10 +1127,10 @@
           </action>
        </objectContribution>
        <objectContribution
-             id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.pausetrace"
-             objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+             id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.pausetrace"
+             objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
           <action
-                class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.PauseTrace"
+                class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.PauseTrace"
                 enablesFor="*"
                 icon="icons/elcl16/pause_trace.gif"
                 id="actions.trace.pause"
@@ -1140,7 +1140,7 @@
              <enablement>
                 <and>
                    <objectClass
-                         name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                         name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                    </objectClass>
                    <objectState
                          name="canPause"
@@ -1151,10 +1151,10 @@
           </action>
        </objectContribution>
        <objectContribution
-               objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource"
-               id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.starttrace">
+               objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource"
+               id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.starttrace">
            <action
-                 class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.StartTrace"
+                 class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.StartTrace"
                  enablesFor="*"
                  icon="icons/elcl16/start_trace.gif"
                  id="actions.trace.start"
@@ -1163,7 +1163,7 @@
                  tooltip="%action.start.tooltip">
             <enablement>
              <and>
-              <objectClass name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource"/> 
+              <objectClass name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource"/> 
               <objectState name="canStart" value="yes"/> 
              </and>
             </enablement> 
@@ -1171,13 +1171,13 @@
        </objectContribution>
        
        <objectContribution
-               objectClass="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource"
-               id="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.configuremarkers">
+               objectClass="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource"
+               id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.configuremarkers">
            <action
                    label="%action.configuremarkers.label"
                    tooltip="%action.configuremarkers.tooltip"
                    icon="icons/elcl16/configure_markers.gif"
-                   class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.ConfigureMarkers"
+                   class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.ConfigureMarkers"
                    menubarPath="additions"
                    enablesFor="1"
                    id="actions.markers.configure">
@@ -1194,10 +1194,10 @@
          
          
       <viewContribution
-            id="org.eclipse.linuxtools.lttng.ui.tracecontrol.viewContribution.stop"
+            id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.viewContribution.stop"
             targetID="org.eclipse.rse.ui.view.systemView">
          <action
-               class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.StopTrace"
+               class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.StopTrace"
                enablesFor="*"
                icon="icons/elcl16/stop_trace.gif"
                id="actions.trace.stop"
@@ -1209,7 +1209,7 @@
             <enablement>
                <and>
                   <objectClass
-                        name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                        name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                   </objectClass>
                   <objectState
                         name="canStop"
@@ -1221,10 +1221,10 @@
       </viewContribution>
       
       <viewContribution
-            id="org.eclipse.linuxtools.lttng.ui.tracecontrol.viewContribution.pause"
+            id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.viewContribution.pause"
             targetID="org.eclipse.rse.ui.view.systemView">
          <action
-               class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.PauseTrace"
+               class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.PauseTrace"
                enablesFor="*"
                icon="icons/elcl16/pause_trace.gif"
                id="actions.trace.pause"
@@ -1236,7 +1236,7 @@
              <enablement>
                 <and>
                    <objectClass
-                         name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                         name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                    </objectClass>
                    <objectState
                          name="canPause"
@@ -1248,10 +1248,10 @@
       </viewContribution>
       
       <viewContribution
-            id="org.eclipse.linuxtools.lttng.ui.tracecontrol.viewContribution.start"
+            id="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.viewContribution.start"
             targetID="org.eclipse.rse.ui.view.systemView">
          <action
-               class="org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.StartTrace"
+               class="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.StartTrace"
                enablesFor="*"
                icon="icons/elcl16/start_trace.gif"
                id="actions.trace.start"
@@ -1263,7 +1263,7 @@
             <enablement>
                <and>
                   <objectClass
-                        name="org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource">
+                        name="org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource">
                   </objectClass>
                   <objectState
                         name="canStart"
@@ -1278,7 +1278,7 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            class="org.eclipse.linuxtools.lttng.ui.project.dialogs.TraceLibraryPathPropertyPage"
+            class="org.eclipse.linuxtools.internal.lttng.ui.project.dialogs.TraceLibraryPathPropertyPage"
             id="org.eclipse.linuxtools.lttng.ui.propertyPage.libPath"
             name="%project.propertyPage.tracelibPath">
          <filter name="nature"
@@ -1298,13 +1298,13 @@
       </category>
       <type
             category="org.eclipse.linuxtools.lttng.ui.category.lttng"
-            event_type="org.eclipse.linuxtools.lttng.core.event.LttngEvent"
+            event_type="org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent"
             icon="icons/obj16/tux2.png"
             id="org.eclipse.linuxtools.lttng.tracetype.kernel"
             name="%tracetype.type.kernel"
-            trace_type="org.eclipse.linuxtools.lttng.core.trace.LTTngTrace">
+            trace_type="org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace">
          <eventsTableType
-               class="org.eclipse.linuxtools.lttng.ui.views.events.EventsTable">
+               class="org.eclipse.linuxtools.internal.lttng.ui.views.events.EventsTable">
          </eventsTableType>
       </type>
    </extension>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/pom.xml b/lttng/org.eclipse.linuxtools.lttng.ui/pom.xml
index 0526d583f0..75dd6c17cb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools LTTng UI Plug-in</name>
+  <name>Linux Tools LTTng UI Plug-in (legacy)</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/Activator.java
index 519e14ef28..9563f63881 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/Activator.java
@@ -12,7 +12,7 @@
  *   
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui;
+package org.eclipse.linuxtools.internal.lttng.ui;
 
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
@@ -21,11 +21,11 @@ import java.util.concurrent.TimeoutException;
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.TraceAdapterFactory;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.TraceAdapterFactory;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.SystemBasePlugin;
@@ -35,7 +35,7 @@ import org.osgi.framework.BundleContext;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class LTTngUiPlugin extends SystemBasePlugin {
+public class Activator extends SystemBasePlugin {
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui"; //$NON-NLS-1$
@@ -53,12 +53,12 @@ public class LTTngUiPlugin extends SystemBasePlugin {
     public static final String ICON_ID_EDIT = "ICON_ID_EDIT"; //$NON-NLS-1$
 	
 	// The shared instance
-	private static LTTngUiPlugin plugin;
+	private static Activator plugin;
 	
 	/**
 	 * The constructor
 	 */
-	public LTTngUiPlugin() {
+	public Activator() {
 	}
 
 	/*
@@ -97,7 +97,7 @@ public class LTTngUiPlugin extends SystemBasePlugin {
 	 *
 	 * @return the shared instance
 	 */
-	public static LTTngUiPlugin getDefault() {
+	public static Activator getDefault() {
 		return plugin;
 	}
     
@@ -141,18 +141,18 @@ public class LTTngUiPlugin extends SystemBasePlugin {
     }
     
     /**
-     * Loads icon and puts it in the image registry 
-     * 
-     * @param url
-     * @return image
+     * Loads the image in the plug-ins image registry (if necessary) and returns the image
+     * @param url - URL relative to the Bundle
+     * @return  the image
      */
     public Image loadIcon(String url) {
-        Image icon = getImageRegistry().get(url);
+        String key = plugin.getBundle().getSymbolicName() + "/" + url; //$NON-NLS-1$
+        Image icon = plugin.getImageRegistry().get(key);
         if (icon == null) {
-            URL imageURL = getBundle().getEntry(url);
+            URL imageURL = plugin.getBundle().getResource(url);
             ImageDescriptor descriptor = ImageDescriptor.createFromURL(imageURL);
             icon = descriptor.createImage();
-            getImageRegistry().put(url, icon);
+            plugin.getImageRegistry().put(key, icon);
         }
         return icon;
     }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUILogger.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/LTTngUILogger.java
index e6e163f056..ca825b005e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUILogger.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/LTTngUILogger.java
@@ -10,7 +10,8 @@
  *   Francois Chouinard - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui;
+package org.eclipse.linuxtools.internal.lttng.ui;
+
 
 /**
  * <b><u>LTTngUILogger</u></b>
@@ -20,11 +21,11 @@ package org.eclipse.linuxtools.lttng.ui;
 public class LTTngUILogger {
 
 	public static void logInfo(String message) {
-		LTTngUiPlugin.getDefault().getLogger().logInfo(message);
+		Activator.getDefault().getLogger().logInfo(message);
 	}
 
 	public static void logWarning(String message) {
-		LTTngUiPlugin.getDefault().getLogger().logWarning(message);
+		Activator.getDefault().getLogger().logWarning(message);
 	}
 
 	public static void logError(Throwable exception) {
@@ -32,7 +33,7 @@ public class LTTngUILogger {
 	}
 
 	public static void logError(String message, Throwable exception) {
-		LTTngUiPlugin.getDefault().getLogger().logError(message, exception);
+		Activator.getDefault().getLogger().logError(message, exception);
 	}
 
 }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/TraceDebug.java
index 0e451cfe79..1487357800 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/TraceDebug.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.ui;

+package org.eclipse.linuxtools.internal.lttng.ui;

 

 

 import java.io.FileWriter;

@@ -23,8 +23,8 @@ public class TraceDebug {
     static boolean RV = false;

     static boolean SV = false;

 

-    private static Plugin plugin = LTTngUiPlugin.getDefault();

-    private static String pluginID = LTTngUiPlugin.PLUGIN_ID;

+    private static Plugin plugin = Activator.getDefault();

+    private static String pluginID = Activator.PLUGIN_ID;

     private static SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss:SSS");

 

     // Note: files are created in $HOME

@@ -39,20 +39,20 @@ public class TraceDebug {
         String warnTrace = Platform.getDebugOption(pluginID + "/warn");

 

         if (debugTrace != null) {

-            DEBUG = (new Boolean(debugTrace)).booleanValue();

+            DEBUG = Boolean.valueOf(debugTrace);

         }

 

         if (infoTrace != null) {

-            INFO = (new Boolean(infoTrace)).booleanValue();

+            INFO = Boolean.valueOf(infoTrace);

         }

 

         if (warnTrace != null) {

-            WARN = (new Boolean(warnTrace)).booleanValue();

+            WARN = Boolean.valueOf(warnTrace);

         }

 

         String cfvTrace = Platform.getDebugOption(pluginID + "/cfv");

         if (cfvTrace != null) {

-            CFV = (new Boolean(cfvTrace)).booleanValue();

+            CFV = Boolean.valueOf(cfvTrace);

             if (CFV) {

                 try {

                     fCFVfile = new PrintWriter(new FileWriter("CFVTrace.txt"));

@@ -64,7 +64,7 @@ public class TraceDebug {
 

         String rvTrace = Platform.getDebugOption(pluginID + "/rv");

         if (rvTrace != null) {

-            RV = (new Boolean(rvTrace)).booleanValue();

+            RV = Boolean.valueOf(rvTrace);

             if (RV) {

                 try {

                     fRVfile = new PrintWriter(new FileWriter("RVTrace.txt"));

@@ -76,7 +76,7 @@ public class TraceDebug {
 

         String svTrace = Platform.getDebugOption(pluginID + "/sv");

         if (svTrace != null) {

-            SV = (new Boolean(svTrace)).booleanValue();

+            SV = Boolean.valueOf(svTrace);

             if (SV) {

                 try {

                     fSVfile = new PrintWriter(new FileWriter("SVTrace.txt"));

@@ -128,14 +128,14 @@ public class TraceDebug {
     public static void info(String message) {

         if (INFO) {

             ILog logger = plugin.getLog();

-            logger.log(new Status(IStatus.INFO, LTTngUiPlugin.PLUGIN_ID, IStatus.OK, message, null));

+            logger.log(new Status(IStatus.INFO, Activator.PLUGIN_ID, IStatus.OK, message, null));

         }

     }

 

     public static void warn(String message) {

         if (WARN) {

             ILog logger = plugin.getLog();

-            logger.log(new Status(IStatus.WARNING, LTTngUiPlugin.PLUGIN_ID, IStatus.WARNING, message, null));

+            logger.log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, message, null));

         }

     }

 

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ITimeRangeComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/ITimeRangeComponent.java
index 9cb42a5978..53b711ea99 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ITimeRangeComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/ITimeRangeComponent.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.model.trange;
+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;
 
 /**
  * The common component of the Composite related to time-range events its
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ItemContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/ItemContainer.java
index 89298be4f4..6349e97532 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ItemContainer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/ItemContainer.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.ui.model.trange;
+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;
 
 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/Messages.java
index 2269cd5dbb..42b170bed4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.ui.model.trange;
+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.model.trange.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.model.trange.messages"; //$NON-NLS-1$
     public static String TimeRangeViewerProvider_BadRangeExtraInfo;
     public static String TimeRangeViewerProvider_EndTime;
     public static String TimeRangeViewerProvider_ProcessType;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeComponent.java
index 64c51df0cf..28be1aefc9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeComponent.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.model.trange;
+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;
 
 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;
 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeComposite.java
index 66dbd87915..86ebac3fdf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeComposite.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.model.trange;
+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;
 
 import java.util.Iterator;
 import java.util.Vector;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeEvent.java
index c8b466bf6c..e04fd81c6e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeEvent.java
@@ -10,7 +10,7 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

  *******************************************************************************/

 

-package org.eclipse.linuxtools.lttng.ui.model.trange;

+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;

 

 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeEventProcess.java
index 5b40baa464..2c8b78d8d6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeEventProcess.java
@@ -9,7 +9,7 @@
  * Contributors:

  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.model.trange;

+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;

 

 public class TimeRangeEventProcess extends TimeRangeComposite implements

 		Comparable<TimeRangeEventProcess> {

@@ -229,4 +229,96 @@ public class TimeRangeEventProcess extends TimeRangeComposite implements
 		",trace=" + traceID + ",ptype=" + processType + ",cpu=" + cpu + ",brand=" + brand + "]";

     }

 

+    /* (non-Javadoc)

+     * @see java.lang.Object#hashCode()

+     */

+    @Override

+    public int hashCode() {

+        final int prime = 31;

+        int result = 1;

+        result = prime * result + ((brand == null) ? 0 : brand.hashCode());

+        result = prime * result + ((cpu == null) ? 0 : cpu.hashCode());

+        result = prime * result + ((creationTime == null) ? 0 : creationTime.hashCode());

+        result = prime * result + ((pid == null) ? 0 : pid.hashCode());

+        result = prime * result + ((ppid == null) ? 0 : ppid.hashCode());

+        result = prime * result + ((processType == null) ? 0 : processType.hashCode());

+        result = prime * result + ((tgid == null) ? 0 : tgid.hashCode());

+        result = prime * result + ((traceID == null) ? 0 : traceID.hashCode());

+        return result;

+    }

+

+    /* (non-Javadoc)

+     * @see java.lang.Object#equals(java.lang.Object)

+     */

+    @Override

+    public boolean equals(Object obj) {

+        if (this == obj) {

+            return true;

+        }

+        if (obj == null) {

+            return false;

+        }

+        if (!(obj instanceof TimeRangeEventProcess)) {

+            return false;

+        }

+        TimeRangeEventProcess other = (TimeRangeEventProcess) obj;

+        if (brand == null) {

+            if (other.brand != null) {

+                return false;

+            }

+        } else if (!brand.equals(other.brand)) {

+            return false;

+        }

+        if (cpu == null) {

+            if (other.cpu != null) {

+                return false;

+            }

+        } else if (!cpu.equals(other.cpu)) {

+            return false;

+        }

+        if (creationTime == null) {

+            if (other.creationTime != null) {

+                return false;

+            }

+        } else if (!creationTime.equals(other.creationTime)) {

+            return false;

+        }

+        if (pid == null) {

+            if (other.pid != null) {

+                return false;

+            }

+        } else if (!pid.equals(other.pid)) {

+            return false;

+        }

+        if (ppid == null) {

+            if (other.ppid != null) {

+                return false;

+            }

+        } else if (!ppid.equals(other.ppid)) {

+            return false;

+        }

+        if (processType == null) {

+            if (other.processType != null) {

+                return false;

+            }

+        } else if (!processType.equals(other.processType)) {

+            return false;

+        }

+        if (tgid == null) {

+            if (other.tgid != null) {

+                return false;

+            }

+        } else if (!tgid.equals(other.tgid)) {

+            return false;

+        }

+        if (traceID == null) {

+            if (other.traceID != null) {

+                return false;

+            }

+        } else if (!traceID.equals(other.traceID)) {

+            return false;

+        }

+        return true;

+    }

+

 }

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeEventResource.java
index 03727cbaaf..453fada590 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeEventResource.java
@@ -9,9 +9,9 @@
  * Contributors:

  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.model.trange;

+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;

 

-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;

+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;

 

 

 /**

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeResourceFactory.java
index cd761b2558..27a2864445 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeResourceFactory.java
@@ -9,15 +9,15 @@
  * Contributors:
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.model.trange;
+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;
 
 
-import org.eclipse.linuxtools.lttng.core.state.StateStrings;
-import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngIRQState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTrapState;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
 
 /**
  * Creates Resources with custom implementation to obtain its corresponding
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeViewerProvider.java
index 67f0edc200..1cab1bf466 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/TimeRangeViewerProvider.java
@@ -9,20 +9,20 @@
  * Contributors:

  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.model.trange;

+package org.eclipse.linuxtools.internal.lttng.ui.model.trange;

 

 import java.util.HashMap;

 import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode;

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode;

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode;

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.SoftIRQMode;

-import org.eclipse.linuxtools.lttng.core.state.StateStrings.TrapMode;

-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;

+import java.util.Map.Entry;

+

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.BdevMode;

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.CpuMode;

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.ExecutionMode;

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.IRQMode;

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.ProcessStatus;

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.SoftIRQMode;

+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.TrapMode;

+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;

 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;

 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

@@ -230,12 +230,11 @@ public class TimeRangeViewerProvider extends TmfTimeAnalysisProvider {
     }

     

     protected String findObject(StateColor Value, Map<String, StateColor> map) {

-		Set<String> keys = map.keySet();

-		for (String key : keys) {

-			if (map.get(key).equals(Value)) {

-				return key;

-			}

-		}

+        for (Entry<String, StateColor> entry : map.entrySet()) {

+            if (entry.getValue().equals(Value)) {

+                return entry.getKey();

+            }

+        }

 		return "Not Found"; //$NON-NLS-1$

 	}

 }

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/messages.properties
index 86fb8ff90a..86fb8ff90a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/model/trange/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/Messages.java
index 86295f2b43..49b14eb2dd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.ui.project.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.project.dialogs;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.project.dialogs.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.project.dialogs.messages"; //$NON-NLS-1$
     public static String NewProjectWizard_Title;
 	public static String NewProjectWizard_Description;
 	public static String TraceLibraryPath_label;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/NewLTTngProjectMainWizardPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectMainWizardPage.java
index 0d05e178bd..684f2f9b38 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/NewLTTngProjectMainWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectMainWizardPage.java
@@ -10,7 +10,7 @@
  *   Francois Chouinard - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.project.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.project.dialogs;
 
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/NewLTTngProjectWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectWizard.java
index f17d77da18..9bfc53e718 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/NewLTTngProjectWizard.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectWizard.java
@@ -12,13 +12,13 @@
  *   Francois Chouinard - Rebase on TMF NewProjectWizard
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.project.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.project.dialogs;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
-import org.eclipse.linuxtools.lttng.core.TraceHelper;
+import org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature;
+import org.eclipse.linuxtools.internal.lttng.core.TraceHelper;
 import org.eclipse.linuxtools.tmf.core.TmfProjectNature;
 import org.eclipse.linuxtools.tmf.ui.project.wizards.NewTmfProjectWizard;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/TraceLibraryPathPropertyPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/TraceLibraryPathPropertyPage.java
index 5f46630ae8..389c54a238 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/TraceLibraryPathPropertyPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/TraceLibraryPathPropertyPage.java
@@ -10,13 +10,13 @@
  *   Yufen Kuo (ykuo@mvista.com) - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.project.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.project.dialogs;
 
 import java.io.File;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.linuxtools.lttng.core.TraceHelper;
+import org.eclipse.linuxtools.internal.lttng.core.TraceHelper;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/TraceLibraryPathWizardPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/TraceLibraryPathWizardPage.java
index 4935553842..342881f037 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/TraceLibraryPathWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/TraceLibraryPathWizardPage.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Yufen Kuo (ykuo@mvista.com) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.project.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.project.dialogs;
 
 import java.io.File;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/messages.properties
index 4d8158a38e..4d8158a38e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/project/dialogs/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/Messages.java
index 072505fbc7..6731e4487b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/Messages.java
@@ -10,12 +10,12 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.tracecontrol.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.messages"; //$NON-NLS-1$
     
     public static String Property_Type_Provider_Filter;
     public static String Property_Type_Provider;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/TraceControlConstants.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/TraceControlConstants.java
index 3e95577b19..413d80b1e0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/TraceControlConstants.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/TraceControlConstants.java
@@ -11,7 +11,7 @@
  *   
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.tracecontrol;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol;
 
 
 @SuppressWarnings("nls")
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
index fbc871ce14..d6d922b3c2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,13 +22,13 @@ import java.util.concurrent.TimeUnit;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.ConfigureMarkersDialog;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.ConfigureMarkersDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
@@ -152,7 +152,7 @@ public class ConfigureMarkers implements IObjectActionDelegate, IWorkbenchWindow
                 if (e instanceof SystemMessageException) {
                     sysExp = (SystemMessageException)e;
                 } else {
-                    sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                    sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
                 }
                 SystemBasePlugin.logError(Messages.Lttng_Control_ErrorConfigureMarkers + " (" +  //$NON-NLS-1$
                         Messages.Lttng_Resource_Target + ": "  + tr.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
index 1de3979504..06bc44f608 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
@@ -21,17 +21,17 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards.ConfigureTraceWizard;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards.ConfigureTraceWizard;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
@@ -97,7 +97,7 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
         final TraceConfig result = wizard.getTraceConfig();
 
         if (result != null) {
-            try {
+//            try {
 
                 // Update channel settings
                 TraceChannels channels = result.getTraceChannels();
@@ -167,17 +167,17 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
                 ISystemRegistry registry = SystemStartHere.getSystemRegistry();
                 registry.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_CHANGED, fSelectedTrace, fSelectedTrace.getParent(), fSelectedTrace.getSubSystem(), null);
 
-            } catch (Exception e) {
-                SystemMessageException sysExp;
-                if (e instanceof SystemMessageException) {
-                    sysExp = (SystemMessageException)e;
-                } else {
-                    sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
-                }
-                
-                SystemBasePlugin.logError(Messages.Lttng_Control_ErrorConfigureTrace + " (" +  //$NON-NLS-1$
-                        Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
-            }
+//            } catch (SystemMessageException e) {
+//                SystemMessageException sysExp;
+//                if (e instanceof SystemMessageException) {
+//                    sysExp = (SystemMessageException)e;
+//                } else {
+//                    sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+//                }
+//                
+//                SystemBasePlugin.logError(Messages.Lttng_Control_ErrorConfigureTrace + " (" +  //$NON-NLS-1$
+//                        Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
+//            }
         }
     }
 
@@ -279,7 +279,7 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException)e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorSetChannelEnable + " (" +  //$NON-NLS-1$
                     Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$
@@ -323,7 +323,7 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException)e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorSetChannelOverwrite + " (" +  //$NON-NLS-1$
                     Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$
@@ -369,7 +369,7 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException)e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorSetSubbufNum + " (" +  //$NON-NLS-1$
                     Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$
@@ -415,7 +415,7 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException)e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorSetSubbufSize + " (" +  //$NON-NLS-1$
                     Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$
@@ -461,7 +461,7 @@ public class ConfigureTrace implements IObjectActionDelegate, IWorkbenchWindowAc
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException)e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorSetChannelTimer + " (" +  //$NON-NLS-1$
                     Messages.Lttng_Resource_Trace + ": "  + fSelectedTrace.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
index fcb3648875..99c1af2687 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -22,16 +22,16 @@ import java.util.concurrent.TimeUnit;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.NewTraceDialog;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.NewTraceDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
@@ -184,7 +184,7 @@ public class CreateNewTrace implements IObjectActionDelegate, IWorkbenchWindowAc
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException) e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorNewTrace + " (" + //$NON-NLS-1$
                     Messages.Lttng_Resource_Trace + ": " + traceConfig.getTraceName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/DeleteTrace.java
index bba7854540..23b5e27ad2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/DeleteTrace.java
@@ -10,7 +10,7 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -20,8 +20,8 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ImportToProject.java
index 2398ec1f6c..34bb52653e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ImportToProject.java
@@ -10,7 +10,7 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -29,10 +29,10 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.ImportTraceDialog;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.ImportTraceDialog;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
@@ -271,7 +271,7 @@ public class ImportToProject implements IObjectActionDelegate, IWorkbenchWindowA
             folder.createLink(sourceFolder.toURI(), IResource.REPLACE, null);
             // Set the trace properties for this resource
             // FIXME: update from extension point properties
-            folder.setPersistentProperty(TmfTraceElement.TRACEBUNDLE, LTTngUiPlugin.PLUGIN_ID);
+            folder.setPersistentProperty(TmfTraceElement.TRACEBUNDLE, Activator.PLUGIN_ID);
             folder.setPersistentProperty(TmfTraceElement.TRACETYPE, "org.eclipse.linuxtools.lttng.tracetype.kernel"); //$NON-NLS-1$
             folder.setPersistentProperty(TmfTraceElement.TRACEICON, "icons/obj16/tux2.png"); //$NON-NLS-1$
         } catch (CoreException e) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
index ee3c9ddb7f..0f3c02cef3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -21,13 +21,13 @@ import java.util.concurrent.TimeUnit;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
@@ -124,7 +124,7 @@ public class PauseTrace implements IObjectActionDelegate, IWorkbenchWindowAction
                 if (e instanceof SystemMessageException) {
                     sysExp = (SystemMessageException)e;
                 } else {
-                    sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                    sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
                 }
                 SystemBasePlugin.logError(Messages.Lttng_Control_ErrorPause + " (" +  //$NON-NLS-1$
                         Messages.Lttng_Resource_Trace + ": "  + trace.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
index 4676d7d70f..99c8ab3e69 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -23,16 +23,16 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.utility.LiveTraceManager;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.SelectTracePathDialog;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.SelectTracePathDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
@@ -134,7 +134,7 @@ public class StartTrace implements IObjectActionDelegate, IWorkbenchWindowAction
                     if (e instanceof SystemMessageException) {
                         sysExp = (SystemMessageException)e;
                     } else {
-                        sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                        sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
                     }
                     SystemBasePlugin.logError(Messages.Lttng_Control_ErrorStart + " (" +  //$NON-NLS-1$
                             Messages.Lttng_Resource_Trace + ": "  + trace.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
index 2215bfb3a3..b51165b955 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.actions;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -21,15 +21,15 @@ import java.util.concurrent.TimeUnit;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.utility.LiveTraceManager;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
@@ -136,7 +136,7 @@ public class StopTrace implements IObjectActionDelegate, IWorkbenchWindowActionD
                 if (e instanceof SystemMessageException) {
                     sysExp = (SystemMessageException)e;
                 } else {
-                    sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                    sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
                 }
                 SystemBasePlugin.logError(Messages.Lttng_Control_ErrorStop + " (" +  //$NON-NLS-1$
                         Messages.Lttng_Resource_Trace + ": "  + trace.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
index fa14affabf..c4608e79a3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.connectorservice;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -20,13 +20,13 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.core.LttngConstants;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.LttControllerServiceProxy;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.utility.DownloadProxy;
+import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.LttControllerServiceProxy;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.utility.DownloadProxy;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.CommunicationsEvent;
 import org.eclipse.rse.core.subsystems.ISubSystem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorServiceManager.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorServiceManager.java
index 4841f9e093..c940f811b0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorServiceManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorServiceManager.java
@@ -11,10 +11,10 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.connectorservice;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice;
 
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.ITCFSubSystem;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.ITraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.ITCFSubSystem;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.ITraceSubSystem;
 import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.model.IHost;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
index ff6416fd8e..035a8f6248 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
@@ -11,18 +11,18 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.SWT;
@@ -105,7 +105,7 @@ public class ConfigureMarkersDialog extends Dialog {
         final Display display = parent.getDisplay();
         final Shell shell = new Shell(parent, SWT.TITLE | SWT.BORDER | SWT.APPLICATION_MODAL | SWT.RESIZE);
         shell.setText(Messages.ConfigureMarkersDialog_Title);
-        shell.setImage(LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_CONFIG_MARKERS));
+        shell.setImage(Activator.getDefault().getImage(Activator.ICON_ID_CONFIG_MARKERS));
         shell.setLayout(new FillLayout());
         Composite composite = new Composite(shell, SWT.NONE);
         composite.setLayout(new GridLayout());
@@ -140,7 +140,7 @@ public class ConfigureMarkersDialog extends Dialog {
             if (e instanceof SystemMessageException) {
                 sysExp = (SystemMessageException)e;
             } else {
-                sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
             }
             SystemBasePlugin.logError(Messages.Lttng_Control_ErrorGetMarkers + " (" +  //$NON-NLS-1$
                     Messages.Lttng_Resource_Target + ": "  + fTarget.getName() + ")", sysExp); //$NON-NLS-1$ //$NON-NLS-2$
@@ -211,7 +211,7 @@ public class ConfigureMarkersDialog extends Dialog {
                 if (e instanceof SystemMessageException) {
                     sysExp = (SystemMessageException)e;
                 } else {
-                    sysExp = new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));    
+                    sysExp = new SystemMessageException(Activator.getDefault().getMessage(e));    
                 }
                 SystemBasePlugin.logError(Messages.Lttng_Control_ErrorGetMarkerInfo + " (" +  //$NON-NLS-1$
                         Messages.Lttng_Resource_Target + ": "  + fTarget.getName() + ", " + //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
index 4c8ac9e443..a43eff76c2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
@@ -10,18 +10,18 @@
  *   Patrick Tasse - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -80,7 +80,7 @@ public class ImportTraceDialog extends Dialog {
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		getShell().setText(Messages.ImportTraceDialog_Title);
-		getShell().setImage(LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_IMPORT_TRACE));
+		getShell().setImage(Activator.getDefault().getImage(Activator.ICON_ID_IMPORT_TRACE));
 		
 		Composite composite = new Composite(parent, SWT.NONE);
         composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
index 5acc04bc16..10c02f597f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
@@ -11,21 +11,21 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;
 
 import java.io.File;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.SWT;
@@ -120,7 +120,7 @@ public class NewTraceDialog extends Dialog {
         shell.setText(Messages.NewTraceDialog_Title);
 
         shell.setLayout(new GridLayout());
-        shell.setImage(LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_NEW_TRACE));
+        shell.setImage(Activator.getDefault().getImage(Activator.ICON_ID_NEW_TRACE));
 
         GridData griddata = new GridData();
         fFinishButtonClicked = Boolean.valueOf(false);
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/SelectTracePathDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/SelectTracePathDialog.java
index db9f74466f..ed7455f0fa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/SelectTracePathDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/SelectTracePathDialog.java
@@ -10,13 +10,13 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;
 
 import java.io.File;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/messages.properties
index adad6e822f..adad6e822f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
index 9e33e85b91..8cd0598475 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
@@ -11,17 +11,17 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.ui.SystemMenuManager;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -67,7 +67,7 @@ public class ProviderResourceAdapter extends AbstractSystemViewAdapter implement
      */
     @Override
     public ImageDescriptor getImageDescriptor(Object element) {
-        return LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_PROVIDER);
+        return Activator.getDefault().getImageDescriptor(Activator.ICON_ID_PROVIDER);
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
index de2d003b2d..33d4fd3b59 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
@@ -11,16 +11,16 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.rse.ui.SystemMenuManager;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -68,7 +68,7 @@ public class TargetResourceAdapter extends AbstractSystemViewAdapter implements
      */
     @Override
     public ImageDescriptor getImageDescriptor(Object object) {
-        return LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_TARGET);
+        return Activator.getDefault().getImageDescriptor(Activator.ICON_ID_TARGET);
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceAdapterFactory.java
index 1ce245ce85..45e1ec4da6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceAdapterFactory.java
@@ -11,12 +11,12 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;
 
 import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
 import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.ui.views.properties.IPropertySource;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
index 9308d72b29..54c323eefd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -21,12 +21,12 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.PropertyInfo;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.PropertyInfo;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.ui.SystemMenuManager;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
@@ -77,7 +77,7 @@ public class TraceResourceAdapter extends AbstractSystemViewAdapter implements I
      */
     @Override
     public ImageDescriptor getImageDescriptor(Object object) {
-        return LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_TRACE);
+        return Activator.getDefault().getImageDescriptor(Activator.ICON_ID_TRACE);
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java
index 7a154e6c99..8155776073 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java
@@ -10,12 +10,12 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;
 
 import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards.KernelTraceChannelConfigurationPage;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards.KernelTraceChannelConfigurationPage;
 import org.eclipse.swt.widgets.TableItem;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java
index 1c93ad8f63..69d7c649ff 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java
@@ -10,11 +10,11 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
 
 /**
  * <b><u>TraceChannelTableContentProvider</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
index c7093a9088..a9d1638368 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
@@ -10,12 +10,12 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -139,8 +139,8 @@ public class TraceChannelTableLabelProvider implements ITableLabelProvider {
      */
     private Image getImage(boolean isSelected) {
         if (isSelected) {
-            return LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_CHECKED);
+            return Activator.getDefault().getImage(Activator.ICON_ID_CHECKED);
         }
-        return LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_UNCHECKED);
+        return Activator.getDefault().getImage(Activator.ICON_ID_UNCHECKED);
     }
 }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/ITCFSubSystem.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/ITCFSubSystem.java
index 3967cb53f5..df2b901f79 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/ITCFSubSystem.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/ITCFSubSystem.java
@@ -9,7 +9,7 @@
  *     Wind River Systems - initial API and implementation
  *     Bernd Hufmann - Adapted for Lttng
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;
 
 import org.eclipse.rse.core.subsystems.ISubSystem;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/ITraceSubSystem.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/ITraceSubSystem.java
index 37078cb450..2453699e80 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/ITraceSubSystem.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/ITraceSubSystem.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;
 
 /**
  * A subsystem can implement this interface to indicate that this subsystem is a Trace Subsystem.
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
index 4fe301d3d4..854d7b840d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
@@ -11,7 +11,7 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -21,21 +21,21 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.core.LttngConstants;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.LttControllerServiceProxy;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.utility.LiveTraceManager;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.ImportToProject;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.actions.PauseTrace;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.connectorservice.TraceConnectorService;
+import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.LttControllerServiceProxy;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.ImportToProject;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.PauseTrace;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice.TraceConnectorService;
 import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
 import org.eclipse.rse.core.events.SystemResourceChangeEvent;
 import org.eclipse.rse.core.filters.ISystemFilter;
@@ -69,6 +69,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
     // ------------------------------------------------------------------------
     // Attributes
     // ------------------------------------------------------------------------
+
     private ProviderResource[] fProviders; // master list of Providers
 
     // ------------------------------------------------------------------------
@@ -198,7 +199,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
                 }
             }
         }
-        return fProviders;
+        return (fProviders != null) ? Arrays.copyOf(fProviders, fProviders.length) : null;
     }
 
     /**
@@ -339,7 +340,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
                 }}.get(TraceControlConstants.DEFAULT_TCF_TASK_TIMEOUT, TimeUnit.SECONDS);
         } catch (Exception e) {
             if (e instanceof SystemMessageException) throw (SystemMessageException)e;
-            throw new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));
+            throw new SystemMessageException(Activator.getDefault().getMessage(e));
         }
 
         for (int i = 0; i < providers.length; i++) {
@@ -389,7 +390,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
         } catch (Exception e) {
         	provider.setTargets(new TargetResource[0]);
             if (e instanceof SystemMessageException) throw (SystemMessageException)e;
-            throw new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));
+            throw new SystemMessageException(Activator.getDefault().getMessage(e));
         }
 
         provider.setTargets(targets);
@@ -443,7 +444,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
         } catch (Exception e) {
             target.setTraces(new TraceResource[0]);
             if (e instanceof SystemMessageException) throw (SystemMessageException)e;
-            throw new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));
+            throw new SystemMessageException(Activator.getDefault().getMessage(e));
         }
 
         target.setTraces(traces);
@@ -483,7 +484,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
                     }}.get(TraceControlConstants.DEFAULT_TCF_TASK_TIMEOUT, TimeUnit.SECONDS);
             } catch (Exception e) {
                 if (e instanceof SystemMessageException) throw (SystemMessageException)e;
-                throw new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));
+                throw new SystemMessageException(Activator.getDefault().getMessage(e));
             }
             
             // get active trace information
@@ -564,7 +565,7 @@ public class TraceSubSystem extends SubSystem implements ICommunicationsListener
                         }
                     } catch (Exception e) {
                         if (e instanceof SystemMessageException) throw (SystemMessageException)e;
-                        throw new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e));
+                        throw new SystemMessageException(Activator.getDefault().getMessage(e));
                     }
                 }
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystemConfiguration.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystemConfiguration.java
index 12231a5947..52f07431d0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystemConfiguration.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystemConfiguration.java
@@ -11,13 +11,13 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;
 
 import java.util.List;
 import java.util.Vector;
 
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.connectorservice.TraceConnectorServiceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice.TraceConnectorServiceManager;
 import org.eclipse.rse.core.filters.ISystemFilter;
 import org.eclipse.rse.core.filters.ISystemFilterPool;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java
index 628e6c571e..c31483364d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java
@@ -11,15 +11,15 @@
  *   Bernd Hufmann - Productification, enhancements and fixes
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.utility;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.utility;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.tm.tcf.protocol.JSON;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
index 9ee805b426..270f84f04f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
@@ -10,21 +10,21 @@
  *   Bernd Hufmann - Initial API and implementation

  *   

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;

+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;

 

 import java.util.Iterator;

 import java.util.concurrent.TimeUnit;

 

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;

-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;

-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;

-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;

+import org.eclipse.linuxtools.internal.lttng.ui.Activator;

+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;

+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;

 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;

 import org.eclipse.rse.ui.SystemBasePlugin;

 import org.eclipse.tm.tcf.protocol.IToken;

@@ -124,7 +124,7 @@ public class ConfigureTraceWizard extends Wizard implements INewWizard {
                         SystemBasePlugin.logError("Trace Configuration", e); //$NON-NLS-1$;

                     }

                     else {

-                        SystemBasePlugin.logError("TraceSubSystem", new SystemMessageException(LTTngUiPlugin.getDefault().getMessage(e))); //$NON-NLS-1$

+                        SystemBasePlugin.logError("TraceSubSystem", new SystemMessageException(Activator.getDefault().getMessage(e))); //$NON-NLS-1$

                     }

                 }

 

@@ -136,7 +136,7 @@ public class ConfigureTraceWizard extends Wizard implements INewWizard {
             addPage(channelConfigPage);

         }

 

-        getShell().setImage(LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_CONFIG_TRACE));

+        getShell().setImage(Activator.getDefault().getImage(Activator.ICON_ID_CONFIG_TRACE));

     }

 

     /*

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java
index 486fa10b07..b7d83950a6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java
@@ -10,10 +10,10 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;
 
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
 
 public interface ITraceChannelConfigurationPage extends IWizardPage {
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
index 1a90b4b2fe..58226ee8f7 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
@@ -10,7 +10,7 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,14 +29,14 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config.TraceChannelCellModifier;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config.TraceChannelTableContentProvider;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config.TraceChannelTableLabelProvider;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config.TraceChannelCellModifier;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config.TraceChannelTableContentProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config.TraceChannelTableLabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -69,6 +69,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
     // ------------------------------------------------------------------------
     // Attributes
     // ------------------------------------------------------------------------
+    
     private TraceChannels fChannels;
     private TraceState fTraceState;
     private Composite container;
@@ -323,7 +324,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
     /*
      * Local class to configure table columns
      */
-    final public class ColumnData {
+    private static final class ColumnData {
         // Name of the column.
         public final String header;
         // Width of the column.
@@ -350,7 +351,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
     private void makeActions() {
 
         // Create the context menu actions
-        enableAllAction = new Action(Messages.ChannelConfigPage_EnableAll, LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_CHECKED)) {
+        enableAllAction = new Action(Messages.ChannelConfigPage_EnableAll, Activator.getDefault().getImageDescriptor(Activator.ICON_ID_CHECKED)) {
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -362,7 +363,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
             }
         };
 
-        disableAllAction = new Action(Messages.ChannelConfigPage_DisableAll, LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_UNCHECKED)) {
+        disableAllAction = new Action(Messages.ChannelConfigPage_DisableAll, Activator.getDefault().getImageDescriptor(Activator.ICON_ID_UNCHECKED)) {
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -373,7 +374,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
                 tableViewer.refresh();
             }
         };
-        setOverrideAllAction = new Action(Messages.ChannelConfigPage_EnableAllBufferOverride, LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_CHECKED)) {
+        setOverrideAllAction = new Action(Messages.ChannelConfigPage_EnableAllBufferOverride, Activator.getDefault().getImageDescriptor(Activator.ICON_ID_CHECKED)) {
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -384,7 +385,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
                 tableViewer.refresh();
             }
         };
-        resetOverideAllAction= new Action(Messages.ChannelConfigage_DisableAllBufferOverride, LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_UNCHECKED)) {
+        resetOverideAllAction= new Action(Messages.ChannelConfigage_DisableAllBufferOverride, Activator.getDefault().getImageDescriptor(Activator.ICON_ID_UNCHECKED)) {
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -395,7 +396,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
                 tableViewer.refresh();
             }
         };
-        setNumSubbufAction = new Action(Messages.ChannelConfigPage_SetAllNumSubBuf, LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_EDIT)) {
+        setNumSubbufAction = new Action(Messages.ChannelConfigPage_SetAllNumSubBuf, Activator.getDefault().getImageDescriptor(Activator.ICON_ID_EDIT)) {
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -411,7 +412,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
                 }
             }
         };
-        setSubbufSizeAction = new Action(Messages.channelConfigPage_SetAllSubBufSize, LTTngUiPlugin.getDefault().getImageDescriptor(LTTngUiPlugin.ICON_ID_EDIT)) {
+        setSubbufSizeAction = new Action(Messages.channelConfigPage_SetAllSubBufSize, Activator.getDefault().getImageDescriptor(Activator.ICON_ID_EDIT)) {
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -427,7 +428,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
                 }
             }
         };
-        setChanTimerAction = new Action(Messages.ChannelConfigPage_SetAllChannelTimer, LTTngUiPlugin.getDefault().getImageDescriptor("ICON_ID_EDIT")) { //$NON-NLS-1$
+        setChanTimerAction = new Action(Messages.ChannelConfigPage_SetAllChannelTimer, Activator.getDefault().getImageDescriptor("ICON_ID_EDIT")) { //$NON-NLS-1$
             @Override
             public void run() {
                 TableItem[] items = tableViewer.getTable().getItems();
@@ -477,7 +478,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
      * Local class dialog box implementation for setting values for all
      * rows for a given column  
      */
-    public class SetDialog extends Dialog {
+    private static final class SetDialog extends Dialog {
 
         // ------------------------------------------------------------------------
         // Attributes
@@ -508,7 +509,7 @@ public class KernelTraceChannelConfigurationPage extends WizardPage implements I
         protected void configureShell(Shell newShell) {
             super.configureShell(newShell);
             newShell.setText(Messages.ChannelConfigPage_SetAll);    
-            newShell.setImage(LTTngUiPlugin.getDefault().getImage(LTTngUiPlugin.ICON_ID_EDIT));
+            newShell.setImage(Activator.getDefault().getImage(Activator.ICON_ID_EDIT));
         }
 
         /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java
index 8b0b5510f6..f850980248 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java
@@ -10,17 +10,17 @@
  *   Bernd Hufmann - Initial API and implementation

  *   

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;

+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;

 

 import java.io.File;

 

 import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;

-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;

-import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;

-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;

-import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;

+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;

+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;

+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;

+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;

 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;

 import org.eclipse.rse.ui.SystemBasePlugin;

 import org.eclipse.swt.SWT;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java
index e928a0def9..e13315c3f2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java
@@ -10,12 +10,12 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;
+package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;
 
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
-import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/PerspectiveFactory.java
index 2bd3fbe863..9d3e6810f5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/PerspectiveFactory.java
@@ -10,12 +10,12 @@
  *   Francois Chouinard - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views;
+package org.eclipse.linuxtools.internal.lttng.ui.views;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView;
-import org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.ControlFlowView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.resources.ResourcesView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.StatisticsView;
 import org.eclipse.linuxtools.tmf.ui.views.events.TmfEventsView;
 import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramView;
 import org.eclipse.ui.IFolderLayout;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/common/AbsTRangeUpdate.java
index 319f0a2684..8427a68080 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/common/AbsTRangeUpdate.java
@@ -8,11 +8,11 @@
  * 
  * Contributors: Alvaro Sanchez-Leon - Initial implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.common;
+package org.eclipse.linuxtools.internal.lttng.ui.views.common;
 
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.AbsStateProcessing;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.state.AbsStateProcessing;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 
 public abstract class AbsTRangeUpdate extends AbsStateProcessing implements
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/common/AbsTimeUpdateView.java
index 204709808e..45d27845e5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/common/AbsTimeUpdateView.java
@@ -10,23 +10,23 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *   Bernd Hufmann - Bug fixes
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.common;
+package org.eclipse.linuxtools.internal.lttng.ui.views.common;
 
 import java.util.Arrays;
 
-import org.eclipse.linuxtools.lttng.core.LttngConstants;
-import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.core.control.LttngSyntheticEventProvider;
-import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.core.request.IRequestStatusListener;
-import org.eclipse.linuxtools.lttng.core.request.LttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.core.request.RequestCompletedSignal;
-import org.eclipse.linuxtools.lttng.core.request.RequestStartedSignal;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
+import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.internal.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.internal.lttng.core.control.LttngSyntheticEventProvider;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.internal.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.internal.lttng.core.request.IRequestStatusListener;
+import org.eclipse.linuxtools.internal.lttng.core.request.LttngSyntEventRequest;
+import org.eclipse.linuxtools.internal.lttng.core.request.RequestCompletedSignal;
+import org.eclipse.linuxtools.internal.lttng.core.request.RequestStartedSignal;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.ItemContainer;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
@@ -146,7 +146,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu
 			boolean clearData = request.isclearDataInd();
 			// Indicate if current data needs to be cleared and if so
 			// specify the new experiment time range that applies
-			ModelUpdatePrep(trange, clearData);
+			modelUpdatePrep(trange, clearData);
 		}
 	}
 
@@ -597,7 +597,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu
 	 *            - new total time range e.g. Experiment level
 	 * @param clearAllData
 	 */
-	protected void ModelUpdatePrep(TmfTimeRange timeRange, boolean clearAllData) {
+	protected void modelUpdatePrep(TmfTimeRange timeRange, boolean clearAllData) {
 		ItemContainer<?> itemContainer = getItemContainer();
 		if (clearAllData) {
 			// start fresh e.g. new experiment selected
@@ -632,7 +632,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu
 	 * @param visibleRange
 	 * @param source
 	 */
-	protected void ModelUpdateInit(TmfTimeRange boundaryRange, TmfTimeRange visibleRange, Object source) {
+	protected void modelUpdateInit(TmfTimeRange boundaryRange, TmfTimeRange visibleRange, Object source) {
 		// Update the view boundaries
 		if (boundaryRange != null) {
 			ItemContainer<?> itemContainer = getItemContainer();
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/common/ParamsUpdater.java
index 5f3b76d368..4290ee1eae 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/common/ParamsUpdater.java
@@ -9,10 +9,10 @@
  * Contributors:
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.common;
+package org.eclipse.linuxtools.internal.lttng.ui.views.common;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent;
@@ -30,23 +30,22 @@ public class ParamsUpdater {
 	// Data
 	// ========================================================================
 
-	private long startTime = 0;
-	private long endTime = Long.MAX_VALUE;
-	private Long selectedTime = null;
-	private final int DEFAULT_WIDTH = 2000; // number of estimated pixels
-													// that
-	// can hold the time range space
-	private int width = DEFAULT_WIDTH; // width in pixels used to represent the
-	// time interval
-	private double pixelsPerNs = 0;
-	private int eventsDiscarded = 0;
-	private int eventsDiscardedOutOfView = 0;
-	private int eventsDiscardedNotVisible = 0;
-	private int eventsDiscardedWrongOrder = 0;
-	private TmfTimeRange trange = null;
-
-	public static final int OUT_OF_VIEWRANGE = 0;
-	public static final int NOT_VISIBLE = 1;
+    private long startTime = 0;
+    private long endTime = Long.MAX_VALUE;
+    private static Long selectedTime = null;
+    private final int DEFAULT_WIDTH = 2000; // number of estimated pixels that
+                                            // can hold the time range space
+    private int width = DEFAULT_WIDTH; // width in pixels used to represent the
+                                       // time interval
+    private double pixelsPerNs = 0;
+    private int eventsDiscarded = 0;
+    private int eventsDiscardedOutOfView = 0;
+    private int eventsDiscardedNotVisible = 0;
+    private int eventsDiscardedWrongOrder = 0;
+    private TmfTimeRange trange = null;
+
+    public static final int OUT_OF_VIEWRANGE = 0;
+    public static final int NOT_VISIBLE = 1;
 
 	// ========================================================================
 	// Methods
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/ControlView.java
index f993416894..6ea813ba55 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/ControlView.java
@@ -11,16 +11,16 @@
  *   Bernd Hufmann - Filled with content
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.control;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control;
 
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlRoot;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlRoot;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
@@ -40,7 +40,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang
     /**
      * View ID.
      */
-    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.control"; //$NON-NLS-1$
+    public static final String ID = "org.eclipse.linuxtools.internal.lttng.ui.views.control"; //$NON-NLS-1$
 
     // ------------------------------------------------------------------------
     // Attributes
@@ -112,7 +112,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentAdded(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentAdded(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void componentAdded(ITraceControlComponent parent, ITraceControlComponent component) {
@@ -121,7 +121,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentRemoved(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentRemoved(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void componentRemoved(ITraceControlComponent parent, ITraceControlComponent component) {
@@ -130,7 +130,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentChanged(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentChanged(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void componentChanged(ITraceControlComponent component) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/Messages.java
index ca1d7141ad..c269c9974b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/Messages.java
@@ -10,7 +10,7 @@
  *   Bernd Hufmann - Initial API and implementation
  *   
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
  * </p>
  */
 final public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.control.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.control.messages"; //$NON-NLS-1$
     
     // Failures
     public static String TraceControl_ConnectionFailure;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/TraceControlContentProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlContentProvider.java
index 29b83e4100..ab9ebef02f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/TraceControlContentProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlContentProvider.java
@@ -9,11 +9,11 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
 
 /**
  * <b><u>TraceControlContentProvider</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/TraceControlLabelProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlLabelProvider.java
index c356cb857b..71b2fb45d3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/TraceControlLabelProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlLabelProvider.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
 import org.eclipse.swt.graphics.Image;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ConfirmDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ConfirmDialog.java
index c372c6bbcc..5a2be187e1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ConfirmDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ConfirmDialog.java
@@ -10,11 +10,11 @@
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -28,7 +28,7 @@ public class ConfirmDialog implements IConfirmDialog {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IConfirmDialog#openConfirm(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IConfirmDialog#openConfirm(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String)
      */
     @Override
     public boolean openConfirm(Shell parent, String title, String message) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateChannelDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateChannelDialog.java
index 27dee19ee6..4275ab2dd0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateChannelDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateChannelDialog.java
@@ -9,16 +9,16 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.ChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
@@ -137,7 +137,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelDialog#getChannelInfo()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelDialog#getChannelInfo()
      */
     @Override
     public IChannelInfo getChannelInfo() {
@@ -146,7 +146,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelDialog#setDomainComponent(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelDialog#setDomainComponent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent)
      */
     @Override
     public void setDomainComponent(TraceDomainComponent domain) {
@@ -160,7 +160,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog#isKernel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog#isKernel()
      */
     @Override
     public boolean isKernel() {
@@ -178,7 +178,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
         newShell.setText(Messages.TraceControl_EnableChannelDialogTitle);
-        newShell.setImage(LTTngUiPlugin.getDefault().loadIcon(ENABLE_CHANNEL_ICON_FILE));
+        newShell.setImage(Activator.getDefault().loadIcon(ENABLE_CHANNEL_ICON_FILE));
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateSessionDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateSessionDialog.java
index ae9e88c972..286ed5b903 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateSessionDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateSessionDialog.java
@@ -9,17 +9,17 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup;
-import org.eclipse.linuxtools.lttng.ui.views.control.remote.IRemoteSystemProxy;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -97,7 +97,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateSessionDialog#getSessionName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#getSessionName()
      */
     @Override
     public String getSessionName() {
@@ -106,7 +106,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateSessionDialog#getSessionPath()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#getSessionPath()
      */
     @Override
     public String getSessionPath() {
@@ -115,7 +115,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateSessionDialog#isDefaultSessionPath()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#isDefaultSessionPath()
      */
     @Override
     public boolean isDefaultSessionPath() {
@@ -124,7 +124,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateSessionDialog#setTraceSessionGroup(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#setTraceSessionGroup(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup)
      */
     @Override
     public void setTraceSessionGroup(TraceSessionGroup group) {
@@ -142,7 +142,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
         newShell.setText(Messages.TraceControl_CreateSessionDialogTitle);
-        newShell.setImage(LTTngUiPlugin.getDefault().loadIcon(CREATE_SESSION_ICON_FILE));
+        newShell.setImage(Activator.getDefault().loadIcon(CREATE_SESSION_ICON_FILE));
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableEventsDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableEventsDialog.java
index 99bd3a2003..38137ac24a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableEventsDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableEventsDialog.java
@@ -9,18 +9,18 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.List;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -107,7 +107,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints()
      */
     @Override
     public boolean isTracepoints() {
@@ -118,7 +118,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints()
      */
     @Override
     public boolean isAllTracePoints() {
@@ -130,7 +130,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls()
      */
     @Override
     public boolean isSysCalls() {
@@ -141,7 +141,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls()
      */
     @Override
     public boolean isAllSysCalls() {
@@ -152,7 +152,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getEventNames()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getEventNames()
      */
     @Override
     public List<String> getEventNames() {
@@ -163,7 +163,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe()
      */
     @Override
     public boolean isDynamicProbe() {
@@ -174,7 +174,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeName()
      */
     @Override
     public String getProbeName() {
@@ -185,7 +185,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName()
      */
     @Override
     public String getProbeEventName() {
@@ -197,7 +197,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe()
      */
     @Override
     public boolean isDynamicFunctionProbe() {
@@ -208,7 +208,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName()
      */
     @Override
     public String getFunctionEventName() {
@@ -220,7 +220,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunction()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunction()
      */
     @Override
     public String getFunction() {
@@ -232,7 +232,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#isWildcard()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isWildcard()
      */
     @Override
     public boolean isWildcard() {
@@ -244,7 +244,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getWildcard()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getWildcard()
      */
     @Override
     public String getWildcard() {
@@ -257,7 +257,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#isLogLevel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isLogLevel()
      */
     @Override
     public boolean isLogLevel() {
@@ -270,7 +270,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType()
      */
     @Override
     public LogLevelType getLogLevelType() {
@@ -283,7 +283,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevel()
      */
     @Override
     public TraceLogLevel getLogLevel() {
@@ -296,7 +296,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName()
      */
     @Override
     public String getLogLevelEventName() {
@@ -308,7 +308,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#isKernel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#isKernel()
      */
     @Override
     public boolean isKernel() {
@@ -317,7 +317,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceProviderGroup(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceProviderGroup(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup)
      */
     @Override
     public void setTraceProviderGroup(TraceProviderGroup providerGroup) {
@@ -326,7 +326,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceDomainComponent(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceDomainComponent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent)
      */
     @Override
     public void setTraceDomainComponent(TraceDomainComponent domain) {
@@ -349,7 +349,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
         newShell.setText(Messages.TraceControl_EnableEventsDialogTitle);
-        newShell.setImage(LTTngUiPlugin.getDefault().loadIcon(ENABLE_EVENT_ICON_FILE));
+        newShell.setImage(Activator.getDefault().loadIcon(ENABLE_EVENT_ICON_FILE));
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java
index 80d7abc490..e1e01f8cea 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,13 +18,13 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.TraceControlContentProvider;
-import org.eclipse.linuxtools.lttng.ui.views.control.TraceControlLabelProvider;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.KernelProviderComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlContentProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlLabelProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -150,7 +150,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints()
      */
     @Override
     public boolean isTracepoints() {
@@ -158,7 +158,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints()
      */
     @Override
     public boolean isAllTracePoints() {
@@ -167,7 +167,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls()
      */
     @Override
     public boolean isSysCalls() {
@@ -175,7 +175,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls()
      */
     @Override
     public boolean isAllSysCalls() {
@@ -183,7 +183,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getEventNames()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getEventNames()
      */
     @Override
     public List<String> getEventNames() {
@@ -191,7 +191,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe()
      */
     @Override
     public boolean isDynamicProbe() {
@@ -199,7 +199,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeName()
      */
     @Override
     public String getProbeName() {
@@ -207,7 +207,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName()
      */
     @Override
     public String getProbeEventName() {
@@ -216,7 +216,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe()
      */
     @Override
     public boolean isDynamicFunctionProbe() {
@@ -224,7 +224,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName()
      */
     @Override
     public String getFunctionEventName() {
@@ -232,7 +232,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunction()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunction()
      */
     @Override
     public String getFunction() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java
index 6678f2a59f..f7954a407e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -20,16 +20,16 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.TraceControlContentProvider;
-import org.eclipse.linuxtools.lttng.ui.views.control.TraceControlLabelProvider;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.UstProviderComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlContentProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlLabelProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -159,7 +159,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#isTracepoints()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isTracepoints()
      */
     @Override
     public boolean isTracepoints() {
@@ -168,7 +168,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#isAllTracePoints()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isAllTracePoints()
      */
     @Override
     public boolean isAllTracePoints() {
@@ -177,7 +177,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getEventNames()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getEventNames()
      */
     @Override
     public List<String> getEventNames() {
@@ -186,7 +186,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#isWildcard()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isWildcard()
      */
     @Override
     public boolean isWildcard() {
@@ -195,7 +195,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getWildcard()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getWildcard()
      */
     @Override
     public String getWildcard() {
@@ -204,7 +204,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#isLogLevel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isLogLevel()
      */
     @Override
     public boolean isLogLevel() {
@@ -213,7 +213,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType()
      */
     @Override
     public LogLevelType getLogLevelType() {
@@ -222,7 +222,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevel()
      */
     @Override
     public TraceLogLevel getLogLevel() {
@@ -231,7 +231,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName()
      */
     @Override
     public String getLogLevelEventName() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/GetEventInfoDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/GetEventInfoDialog.java
index 0003d506c1..6ee4f28a3f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/GetEventInfoDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/GetEventInfoDialog.java
@@ -9,18 +9,18 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.Arrays;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.SelectionEvent;
@@ -109,7 +109,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#getSession()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#getSession()
      */
     @Override
     public TraceSessionComponent getSession() {
@@ -118,7 +118,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#getChannel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#getChannel()
      */
     @Override
     public TraceChannelComponent getChannel() {
@@ -127,7 +127,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IGetEventInfoDialog#setIsKernel(boolean)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog#setIsKernel(boolean)
      */
     @Override
     public void setIsKernel(boolean isKernel) {
@@ -136,7 +136,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IGetEventInfoDialog#setSessions(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent[])
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog#setSessions(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent[])
      */
     @Override
     public void setSessions(TraceSessionComponent[] sessions) {
@@ -154,7 +154,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
         newShell.setText(Messages.TraceControl_EnableEventsDialogTitle);
-        newShell.setImage(LTTngUiPlugin.getDefault().loadIcon(TARGET_NEW_CONNECTION_ICON_FILE));
+        newShell.setImage(Activator.getDefault().loadIcon(TARGET_NEW_CONNECTION_ICON_FILE));
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IConfirmDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IConfirmDialog.java
index 0d413bf79c..6838ca38e3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IConfirmDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IConfirmDialog.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import org.eclipse.swt.widgets.Shell;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ICreateChannelDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelDialog.java
index 3e97c94d8f..aff4d57e72 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ICreateChannelDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelDialog.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
 
 /**
  * <b><u>ICreateChannelDialog</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java
index f8521593b4..3db45c3353 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ICreateSessionDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateSessionDialog.java
index 91eeeaa063..2f6a3d1716 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/ICreateSessionDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateSessionDialog.java
@@ -9,9 +9,9 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup;
 
 /**
  * <b><u>ICreateSessionDialog</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IEnableEventsDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableEventsDialog.java
index e4bd698f8e..e73d326ffe 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IEnableEventsDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableEventsDialog.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup;
 
 /**
  * <b><u>IEnableKernelEvents</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IEnableKernelEvents.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableKernelEvents.java
index a3d575bae7..b491595662 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IEnableKernelEvents.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableKernelEvents.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.List;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IEnableUstEvents.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableUstEvents.java
index b11175959a..4bed38b1cd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IEnableUstEvents.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableUstEvents.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
 
 /**
  * <b><u>IEnableKernelEvents</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java
index 39d74e5f4c..dce1c172c6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 
 /**
  * <b><u>IEnableEventsDialog</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/INewConnectionDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/INewConnectionDialog.java
index 3b42d3ff35..57726ba1b9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/INewConnectionDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/INewConnectionDialog.java
@@ -9,9 +9,9 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
 import org.eclipse.rse.core.model.IHost;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/NewConnectionDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/NewConnectionDialog.java
index d415a5bdf4..4e4c66ae3a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/NewConnectionDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/NewConnectionDialog.java
@@ -9,16 +9,16 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import java.util.Arrays;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -113,7 +113,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.INewConnectionDialog#getConnectionName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#getConnectionName()
      */
     @Override
     public String getConnectionName() {
@@ -122,7 +122,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.INewConnectionDialog#getHostName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#getHostName()
      */
     @Override
     public String getHostName() {
@@ -131,7 +131,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.INewConnectionDialog#setTraceControlParent(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#setTraceControlParent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void setTraceControlParent(ITraceControlComponent parent) {
@@ -140,7 +140,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.INewConnectionDialog#setHosts(org.eclipse.rse.core.model.IHost[])
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#setHosts(org.eclipse.rse.core.model.IHost[])
      */
     @Override
     public void setHosts(IHost[] hosts) {
@@ -160,7 +160,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
         newShell.setText(Messages.TraceControl_NewDialogTitle);
-        newShell.setImage(LTTngUiPlugin.getDefault().loadIcon(TARGET_NEW_CONNECTION_ICON_FILE));
+        newShell.setImage(Activator.getDefault().loadIcon(TARGET_NEW_CONNECTION_ICON_FILE));
     }
 
     /*
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java
index 584a154f3d..9db24b1a36 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.ui.views.control.dialogs;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;
 
 import org.eclipse.ui.PlatformUI;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/AssignEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/AssignEventHandler.java
index f2412bff04..2e8d8ae8bf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/AssignEventHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/AssignEventHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,18 +24,18 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IGetEventInfoDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.KernelProviderComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.UstProviderComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -121,7 +121,7 @@ public class AssignEventHandler extends BaseControlViewHandler {
                 } 
 
                 if (errorString != null) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, errorString);
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
                 }
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/BaseControlViewHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseControlViewHandler.java
index 59e3a21a37..faca375b26 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/BaseControlViewHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseControlViewHandler.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/BaseEnableEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseEnableEventHandler.java
index fd2bc2a1e1..5f8e03a4c2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/BaseEnableEventHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseEnableEventHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.List;
 
@@ -20,17 +20,17 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
@@ -189,7 +189,7 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler {
                 } 
 
                 if (errorString != null) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, errorString);
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
                 }
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/BaseNodeHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseNodeHandler.java
index 51813b3760..f18cc4d1cf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/BaseNodeHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseNodeHandler.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java
index dd8912a0f9..91ec391d96 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -23,13 +23,13 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -149,7 +149,7 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
                 session.fireComponentChanged(session);
 
                 if (errorString != null) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, errorString);
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
                 }
 
                 return Status.OK_STATUS;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ChangeEventStateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeEventStateHandler.java
index ef10e9f17a..3126415e3f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ChangeEventStateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeEventStateHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -23,13 +23,13 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -132,7 +132,7 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler {
                 session.fireComponentChanged(session);
 
                 if (errorString != null) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, errorString);
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
                 }
 
                 return Status.OK_STATUS;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java
index 15b7dcce56..7360383e49 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -23,11 +23,11 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -96,7 +96,7 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler {
                         session.fireComponentChanged(session);
                     }
                 } catch (ExecutionException e) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, e.toString());
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
                 }  
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ConnectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ConnectHandler.java
index dfdc86c79b..3a4b8f9b79 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/ConnectHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ConnectHandler.java
@@ -9,11 +9,11 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
 
 /**
  * <b><u>ConnectHandler</u></b>
@@ -29,7 +29,7 @@ public class ConnectHandler extends BaseNodeHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent)
      */
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -39,7 +39,7 @@ public class ConnectHandler extends BaseNodeHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled()
      */
     @Override
     public boolean isEnabled() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java
index 6d12265fb9..dc4c81daa5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,14 +24,14 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -96,7 +96,7 @@ public class CreateChannelOnDomainHandler extends BaseControlViewHandler {
                 } 
 
                 if (errorString != null) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, errorString);
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
                 }
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java
index 4becd61354..edd6633af0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,14 +24,14 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -97,7 +97,7 @@ public class CreateChannelOnSessionHandler extends BaseControlViewHandler {
                 } 
 
                 if (errorString != null) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, errorString);
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
                 }
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/CreateSessionHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateSessionHandler.java
index a6b3b7bf25..3a02c0212c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/CreateSessionHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateSessionHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -20,12 +20,12 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateSessionDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -71,7 +71,7 @@ public class CreateSessionHandler extends BaseControlViewHandler {
                 try {
                     fSessionGroup.createSession(sessionName, sessionPath, monitor);
                 } catch (ExecutionException e) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, e.toString());
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
                 } 
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DeleteHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DeleteHandler.java
index 631ac77f8b..cadbf56f0d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DeleteHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DeleteHandler.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
 
 /**
  * <b><u>DeleteHandler</u></b>
@@ -29,7 +29,7 @@ public class DeleteHandler extends BaseNodeHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent)
      */
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -41,7 +41,7 @@ public class DeleteHandler extends BaseNodeHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled()
      */
     @Override
     public boolean isEnabled() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DestroySessionHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DestroySessionHandler.java
index 5974124e52..b5b36d96c9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DestroySessionHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DestroySessionHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -23,14 +23,14 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IConfirmDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionGroup;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IConfirmDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -91,7 +91,7 @@ public class DestroySessionHandler extends BaseControlViewHandler {
                         sessionGroup.destroySession(session, monitor);
                     }
                 } catch (ExecutionException e) {
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, e.toString());
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
                 }  
                 return Status.OK_STATUS;
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DisableChannelHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableChannelHandler.java
index 8c455806b3..086e502461 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DisableChannelHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableChannelHandler.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
 
 /**
  * <b><u>DisableChannelHandler</u></b>
@@ -31,7 +31,7 @@ public class DisableChannelHandler extends ChangeChannelStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState()
      */
     @Override
     protected TraceEnablement getNewState() {
@@ -43,7 +43,7 @@ public class DisableChannelHandler extends ChangeChannelStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     protected void changeState(TraceDomainComponent domain, List<String> channelNames, IProgressMonitor monitor) throws ExecutionException {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DisableEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableEventHandler.java
index ef3bd32c9d..45d8e3a690 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DisableEventHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableEventHandler.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
 
 /**
  * <b><u>DisableEventHandler</u></b>
@@ -31,7 +31,7 @@ public class DisableEventHandler extends ChangeEventStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeEventStateHandler#getNewState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#getNewState()
      */
     @Override
     protected TraceEnablement getNewState() {
@@ -43,7 +43,7 @@ public class DisableEventHandler extends ChangeEventStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     protected void changeState(TraceChannelComponent channel, List<String> eventNames, IProgressMonitor monitor) throws ExecutionException{ 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DisconnectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisconnectHandler.java
index 0c1c19f76f..0e275e630c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/DisconnectHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisconnectHandler.java
@@ -9,11 +9,11 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
 
 /**
  * <b><u>DisconnectHandler</u></b>
@@ -29,7 +29,7 @@ public class DisconnectHandler extends BaseNodeHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent)
      */
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -39,7 +39,7 @@ public class DisconnectHandler extends BaseNodeHandler {
 
    /*
     * (non-Javadoc)
-    * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled()
+    * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled()
     */
     @Override
     public boolean isEnabled() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableChannelHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableChannelHandler.java
index 6ad7e7fea7..45e1da6562 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableChannelHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableChannelHandler.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
 
 /**
  * <b><u>EnableChannelHandler</u></b>
@@ -31,7 +31,7 @@ public class EnableChannelHandler extends ChangeChannelStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState()
      */
     @Override
     protected TraceEnablement getNewState() {
@@ -43,7 +43,7 @@ public class EnableChannelHandler extends ChangeChannelStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     protected void changeState(TraceDomainComponent domain, List<String> channelNames, IProgressMonitor monitor) throws ExecutionException {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventHandler.java
index f6972f3820..4b336d8bdf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventHandler.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
 
 /**
  * <b><u>EnableEventHandler</u></b>
@@ -31,7 +31,7 @@ public class EnableEventHandler extends ChangeEventStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeEventStateHandler#getNewState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#getNewState()
      */
     @Override
     protected TraceEnablement getNewState() {
@@ -43,7 +43,7 @@ public class EnableEventHandler extends ChangeEventStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     protected void changeState(TraceChannelComponent channel, List<String> eventNames, IProgressMonitor monitor) throws ExecutionException{ 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java
index 2829137a5a..753aaff4aa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.Iterator;
 import java.util.List;
@@ -18,13 +18,13 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -48,7 +48,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableEvents(List<String> eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException {
@@ -57,7 +57,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableSyscalls(IProgressMonitor monitor) throws ExecutionException {
@@ -66,7 +66,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException {
@@ -75,7 +75,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableLogLevel(String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException {
@@ -84,7 +84,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain()
      */
     @Override
     public TraceDomainComponent getDomain() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java
index 72c1f0876c..252e03e2e4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.Iterator;
 import java.util.List;
@@ -18,12 +18,12 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -48,7 +48,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableEvents(List<String> eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException {
@@ -57,7 +57,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableSyscalls(IProgressMonitor monitor) throws ExecutionException {
@@ -66,7 +66,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException {
@@ -75,7 +75,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableLogLevel(String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException {
@@ -84,7 +84,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain()
      */
     @Override
     public TraceDomainComponent getDomain() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java
index ca0e944229..888b72054e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.Iterator;
 import java.util.List;
@@ -18,12 +18,12 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
@@ -44,7 +44,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableEvents(List<String> eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException {
@@ -53,7 +53,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableSyscalls(IProgressMonitor monitor) throws ExecutionException {
@@ -62,7 +62,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException {
@@ -71,7 +71,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableLogLevel(String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException {
@@ -81,7 +81,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain()
      */
     @Override
     public TraceDomainComponent getDomain() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/NewConnectionHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/NewConnectionHandler.java
index 6656c03cb3..13fb350f1d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/NewConnectionHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/NewConnectionHandler.java
@@ -9,18 +9,18 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.INewConnectionDialog;
-import org.eclipse.linuxtools.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
@@ -44,7 +44,7 @@ public class NewConnectionHandler extends BaseControlViewHandler {
     /**
      * The trace control system type defined for LTTng version 2.0 and later. 
      */
-    public final static String TRACE_CONTROL_SYSTEM_TYPE = "org.eclipse.linuxtools.lttng.ui.control.systemType"; //$NON-NLS-1$
+    public final static String TRACE_CONTROL_SYSTEM_TYPE = "org.eclipse.linuxtools.internal.lttng.ui.control.systemType"; //$NON-NLS-1$
 
     // ------------------------------------------------------------------------
     // Attributes
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/RefreshHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/RefreshHandler.java
index f6f6f795e0..f9b60ae312 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/RefreshHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/RefreshHandler.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import java.util.Iterator;
 
@@ -17,10 +17,10 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent;
 import org.eclipse.ui.IWorkbenchPage;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/StartHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StartHandler.java
index 96d1869a32..b224c21c42 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/StartHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StartHandler.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 
 /**
  * <b><u>StartHandler</u></b>
@@ -29,7 +29,7 @@ public class StartHandler extends ChangeSessionStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeSessionStateHandler#getNewState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#getNewState()
      */
     @Override
     public TraceSessionState getNewState() {
@@ -41,7 +41,7 @@ public class StartHandler extends ChangeSessionStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/StopHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StopHandler.java
index de60178b2d..ff0a322daa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/handlers/StopHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StopHandler.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.handlers;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 
 /**
  * <b><u>StopHandler</u></b>
@@ -29,7 +29,7 @@ public class StopHandler extends ChangeSessionStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeSessionStateHandler#getNewState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#getNewState()
      */
     @Override
     public TraceSessionState getNewState() {
@@ -41,7 +41,7 @@ public class StopHandler extends ChangeSessionStateHandler {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/messages.properties
index 24a2a96cde..24a2a96cde 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IBaseEventInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IBaseEventInfo.java
index 4c106d816a..f3dfe60663 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IBaseEventInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IBaseEventInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>IBaseEventInfo</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IChannelInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IChannelInfo.java
index 9d7d37ba1a..017f262b87 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IChannelInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IChannelInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 import java.util.List;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IDomainInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IDomainInfo.java
index e7e20d7c1c..c5a0b483df 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IDomainInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IDomainInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 import java.util.List;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IEventInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IEventInfo.java
index 8d81292fe7..ff810724db 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IEventInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IEventInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>IEventInfo</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IProbeEventInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IProbeEventInfo.java
index 9227d78ff9..7d95a3e419 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IProbeEventInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IProbeEventInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>IProbeEventInfo</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ISessionInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ISessionInfo.java
index fb02ca9a33..2d1505bc94 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ISessionInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ISessionInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 import java.util.List;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ITraceControlComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponent.java
index a528b8371f..c26d85da77 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ITraceControlComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponent.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 import java.util.List;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService;
 import org.eclipse.swt.graphics.Image;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java
index 809b1113a7..70fffd531d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>ITraceControlComponentChangedListener</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ITraceInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceInfo.java
index 29a07b62ee..dab6c8df7f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/ITraceInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>ITraceInfo</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IUstProviderInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IUstProviderInfo.java
index 8f8e69b55f..dc52cdb3b3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/IUstProviderInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IUstProviderInfo.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 import java.util.List;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/LogLevelType.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/LogLevelType.java
index fff6277edd..cc6a245135 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/LogLevelType.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/LogLevelType.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  *********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>LogLevelType</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TargetNodeState.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TargetNodeState.java
index 856eb10810..2bc295b00e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TargetNodeState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TargetNodeState.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>TargetNodeState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceEnablement.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEnablement.java
index 4073b66d4a..5df344e535 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceEnablement.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEnablement.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>TraceEnablement</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceEventType.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEventType.java
index f47ac1e71b..2bac58fb97 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceEventType.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEventType.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>TraceEventType</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceLogLevel.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceLogLevel.java
index 29ce0da54b..b237bc221a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceLogLevel.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceLogLevel.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  *********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>TraceLogLevels</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceSessionState.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceSessionState.java
index cfc4bb0dd9..78814bdd66 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/TraceSessionState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceSessionState.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  *********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model;
 
 /**
  * <b><u>TraceSessionState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventComponent.java
index 023bd4c759..63e09ab8b5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventComponent.java
@@ -9,13 +9,13 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEventType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.BaseEventPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BaseEventPropertySource;
 import org.eclipse.ui.views.properties.IPropertySource;
 
 /**
@@ -115,7 +115,7 @@ public class BaseEventComponent extends TraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventInfo.java
index b374e9446d..d49d00b575 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventInfo.java
@@ -9,11 +9,11 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEventType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
 
 /**
 * <b><u>BaseEventInfo</u></b>
@@ -61,7 +61,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo#getEventType()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#getEventType()
      */
     @Override
     public TraceEventType getEventType() {
@@ -70,7 +70,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo#setEventType(org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEventType)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setEventType(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType)
      */
     @Override
     public void setEventType(TraceEventType type) {
@@ -79,7 +79,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo#setEventType(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setEventType(java.lang.String)
      */
     @Override
     public void setEventType(String typeName) {
@@ -96,7 +96,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo#getLogLevel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#getLogLevel()
      */
     @Override
     public TraceLogLevel getLogLevel() {
@@ -105,7 +105,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo#setLogLevel(org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setLogLevel(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel)
      */
     @Override
     public void setLogLevel(TraceLogLevel level) {
@@ -114,7 +114,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo#setLogLevel(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setLogLevel(java.lang.String)
      */
     @Override
     public void setLogLevel(String levelName) {
@@ -157,7 +157,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @SuppressWarnings("nls")
     @Override
@@ -181,7 +181,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -194,7 +194,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -219,7 +219,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ChannelInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ChannelInfo.java
index b2f0035d41..3d1cfa65b6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ChannelInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ChannelInfo.java
@@ -9,15 +9,15 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
 
 /**
  * <b><u>ChannelInfo</u></b>
@@ -104,7 +104,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getOverwriteMode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getOverwriteMode()
      */
     @Override
     public boolean isOverwriteMode() {
@@ -113,7 +113,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setOverwriteMode(boolean)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setOverwriteMode(boolean)
      */
     @Override
     public void setOverwriteMode(boolean mode) {
@@ -122,7 +122,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getSubBufferSize()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getSubBufferSize()
      */
     @Override
     public long getSubBufferSize() {
@@ -131,7 +131,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setSubBufferSize(long)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setSubBufferSize(long)
      */
     @Override
     public void setSubBufferSize(long bufferSize) {
@@ -141,7 +141,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getNumberOfSubBuffers()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getNumberOfSubBuffers()
      */
     @Override
     public int getNumberOfSubBuffers() {
@@ -150,7 +150,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setNumberOfSubBuffers(int)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setNumberOfSubBuffers(int)
      */
     @Override
     public void setNumberOfSubBuffers(int numberOfSubBuffers) {
@@ -159,7 +159,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getSwitchTimer()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getSwitchTimer()
      */
     @Override
     public long getSwitchTimer() {
@@ -168,7 +168,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setSwitchTimer(long)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setSwitchTimer(long)
      */
     @Override
     public void setSwitchTimer(long timer) {
@@ -177,7 +177,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getReadTimer()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getReadTimer()
      */
     @Override
     public long getReadTimer() {
@@ -186,7 +186,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setReadTimer(long)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setReadTimer(long)
      */
     @Override
     public void setReadTimer(long timer) {
@@ -195,7 +195,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getOutputType()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getOutputType()
      */
     @Override
     public String getOutputType() {
@@ -204,7 +204,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setOutputType(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setOutputType(java.lang.String)
      */
     @Override
     public void setOutputType(String type) {
@@ -213,7 +213,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getState()
      */
     @Override
     public TraceEnablement getState() {
@@ -222,7 +222,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setState(org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement)
      */
     @Override
     public void setState(TraceEnablement state) {
@@ -231,7 +231,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setState(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setState(java.lang.String)
      */
     @Override
     public void setState(String stateName) {
@@ -245,7 +245,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#getEvents()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getEvents()
      */
     @Override
     public IEventInfo[] getEvents() {
@@ -254,7 +254,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#setEvents(java.util.List)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setEvents(java.util.List)
      */
     @Override
     public void setEvents(List<IEventInfo> events) {
@@ -266,7 +266,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo#addEvent(org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#addEvent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo)
      */
     @Override
     public void addEvent(IEventInfo channel) {
@@ -275,7 +275,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @SuppressWarnings("nls")
     @Override
@@ -325,7 +325,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -344,7 +344,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -395,7 +395,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/DomainInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/DomainInfo.java
index 1bf7994ba2..f8bba8cb6c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/DomainInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/DomainInfo.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo;
 
 /**
  * <b><u>DomainInfo</u></b>
@@ -65,7 +65,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo#isKernel()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#isKernel()
      */
     @Override
     public boolean isKernel() {
@@ -74,7 +74,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo#setIsKernel(boolean)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#setIsKernel(boolean)
      */
     @Override
     public void setIsKernel(boolean isKernel) {
@@ -86,7 +86,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo#getChannels()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#getChannels()
      */
     @Override
     public IChannelInfo[] getChannels() {
@@ -95,7 +95,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo#setChannels(java.util.List)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#setChannels(java.util.List)
      */
     @Override
     public void setChannels(List<IChannelInfo> channels) {
@@ -107,7 +107,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo#addChannel(org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#addChannel(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo)
      */
     @Override
     public void addChannel(IChannelInfo channel) {
@@ -116,7 +116,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @SuppressWarnings("nls")
     @Override
@@ -145,7 +145,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -158,7 +158,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -187,7 +187,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/EventInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/EventInfo.java
index 8a16e3feb8..af11b77577 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/EventInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/EventInfo.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
 
 /**
 * <b><u>EventInfo</u></b>
@@ -56,7 +56,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo#getState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo#getState()
      */
     @Override
     public TraceEnablement getState() {
@@ -65,7 +65,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo#setState(org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo#setState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement)
      */
     @Override
     public void setState(TraceEnablement state) {
@@ -74,7 +74,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @SuppressWarnings("nls")
     @Override
@@ -90,7 +90,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo#setState(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo#setState(java.lang.String)
      */
     @Override
     public void setState(String stateName) {
@@ -104,7 +104,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -116,7 +116,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -138,7 +138,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/KernelProviderComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/KernelProviderComponent.java
index 6bd35375dc..c41f8ad60d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/KernelProviderComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/KernelProviderComponent.java
@@ -10,14 +10,14 @@
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.KernelProviderPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.KernelProviderPropertySource;
 import org.eclipse.ui.views.properties.IPropertySource;
 
 /**
@@ -71,7 +71,7 @@ public class KernelProviderComponent extends TraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ProbeEventInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ProbeEventInfo.java
index e7865f015a..48a6da2d2d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ProbeEventInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ProbeEventInfo.java
@@ -9,9 +9,9 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo;
 
 /**
 * <b><u>ProbleEventInfo</u></b>
@@ -68,7 +68,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo#getAddress()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#getAddress()
      */
     @Override
     public String getAddress() {
@@ -77,7 +77,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo#setAddress(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#setAddress(java.lang.String)
      */
     @Override
     public void setAddress(String address) {
@@ -86,7 +86,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo#getOffset()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#getOffset()
      */
     @Override
     public String getOffset() {
@@ -95,7 +95,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo#setOffset(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#setOffset(java.lang.String)
      */
     @Override
     public void setOffset(String offset) {
@@ -104,7 +104,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo#getSymbol()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#getSymbol()
      */
     @Override
     public String getSymbol() {
@@ -113,7 +113,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo#setSymbol(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#setSymbol(java.lang.String)
      */
     @Override
     public void setSymbol(String symbol) {
@@ -125,7 +125,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
    @SuppressWarnings("nls")
    @Override
@@ -149,7 +149,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -163,7 +163,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -204,7 +204,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.EventInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/SessionInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/SessionInfo.java
index 5d074b1783..d76fb5c454 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/SessionInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/SessionInfo.java
@@ -9,15 +9,15 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
 
 /**
  * <b><u>SessionInfo</u></b>
@@ -79,7 +79,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#getSessionState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#getSessionState()
      */
     @Override
     public TraceSessionState getSessionState() {
@@ -88,7 +88,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#setSessionState(org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setSessionState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState)
      */
     @Override
     public void setSessionState(TraceSessionState state) {
@@ -97,7 +97,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#setSessionState(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setSessionState(java.lang.String)
      */
     @Override
     public void setSessionState(String stateName) {
@@ -110,7 +110,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#getSessionPath()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#getSessionPath()
      */
     @Override
     public String getSessionPath() {
@@ -119,7 +119,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#setSessionPath(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setSessionPath(java.lang.String)
      */
     @Override
     public void setSessionPath(String path) {
@@ -128,7 +128,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#getDomains()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#getDomains()
      */
     @Override
     public IDomainInfo[] getDomains() {
@@ -137,7 +137,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#setDomains(java.util.List)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setDomains(java.util.List)
      */
     @Override
     public void setDomains(List<IDomainInfo> domains) {
@@ -152,7 +152,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo#addDomain(org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#addDomain(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo)
      */
     @Override
     public void addDomain(IDomainInfo domainInfo) {
@@ -161,7 +161,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @Override
     @SuppressWarnings("nls")
@@ -188,7 +188,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -202,7 +202,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -238,7 +238,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TargetNodeComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TargetNodeComponent.java
index 0b3775ac1c..1fb7d4601e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TargetNodeComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TargetNodeComponent.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.List;
 
@@ -18,16 +18,16 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.TargetNodePropertySource;
-import org.eclipse.linuxtools.lttng.ui.views.control.remote.IRemoteSystemProxy;
-import org.eclipse.linuxtools.lttng.ui.views.control.remote.RemoteSystemProxy;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.LTTngControlService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TargetNodePropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.RemoteSystemProxy;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.LTTngControlService;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.IRSECallback;
 import org.eclipse.rse.core.subsystems.CommunicationsEvent;
@@ -96,7 +96,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
     public TargetNodeComponent(String name, ITraceControlComponent parent, IHost host, IRemoteSystemProxy proxy) {
         super(name, parent);
         setImage(TARGET_NODE_CONNECTED_ICON_FILE);
-        fDisconnectedImage = LTTngUiPlugin.getDefault().loadIcon(TARGET_NODE_DISCONNECTED_ICON_FILE);
+        fDisconnectedImage = Activator.getDefault().loadIcon(TARGET_NODE_DISCONNECTED_ICON_FILE);
         fHost = host;
         fRemoteProxy = proxy;
         setToolTip(fHost.getHostName());
@@ -117,7 +117,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
      */
     @Override
     public Image getImage() {
@@ -129,7 +129,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getTargetNodeState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getTargetNodeState()
      */
     @Override
     public TargetNodeState getTargetNodeState() {
@@ -138,7 +138,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent.TargetNodeState)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent.TargetNodeState)
      */
     @Override
     public void setTargetNodeState(TargetNodeState state) {
@@ -148,7 +148,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getControlService()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getControlService()
      */
     @Override
     public ILttngControlService getControlService() {
@@ -157,7 +157,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#setControlService(org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService)
      */
     @Override
     public void setControlService(ILttngControlService service) {
@@ -166,7 +166,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
@@ -231,7 +231,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
 
    /*
     * (non-Javadoc)
-    * @see org.eclipse.linuxtools.lttng.ui.views.control.model.TraceControlComponent#dispose()
+    * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceControlComponent#dispose()
     */
    @Override
    public void dispose() {
@@ -258,7 +258,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
                });
            } catch (Exception e) {
                setTargetNodeState(TargetNodeState.DISCONNECTED);
-               LTTngUiPlugin.logError(Messages.TraceControl_ConnectionFailure + " (" + getName() + ").", e); //$NON-NLS-1$ //$NON-NLS-2$
+               Activator.logError(Messages.TraceControl_ConnectionFailure + " (" + getName() + ").", e); //$NON-NLS-1$ //$NON-NLS-2$
            }
        }
     }
@@ -272,7 +272,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
                 setTargetNodeState(TargetNodeState.DISCONNECTING);
                 fRemoteProxy.disconnect();
             } catch (Exception e) {
-                LTTngUiPlugin.logError(Messages.TraceControl_DisconnectionFailure + getName(), e);
+                Activator.logError(Messages.TraceControl_DisconnectionFailure + getName(), e);
             } finally {
                 handleDisconnected();                    
             }
@@ -302,7 +302,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
                     sessionGroup.getSessionsFromNode(monitor);
                 } catch (ExecutionException e) {
                     removeAllChildren();
-                    return new Status(Status.ERROR, LTTngUiPlugin.PLUGIN_ID, e.toString());
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
                 } 
 
                 return Status.OK_STATUS;
@@ -342,7 +342,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
             createControlService();
             getConfigurationFromNode();
         } catch (ExecutionException e) {
-            LTTngUiPlugin.logError(Messages.TraceControl_ListSessionFailure, e);
+            Activator.logError(Messages.TraceControl_ListSessionFailure, e);
         }
     }
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceChannelComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceChannelComponent.java
index d3572a81dd..7019307c58 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceChannelComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceChannelComponent.java
@@ -9,22 +9,22 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.TraceChannelPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceChannelPropertySource;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.views.properties.IPropertySource;
 
@@ -73,7 +73,7 @@ public class TraceChannelComponent extends TraceControlComponent {
         setImage(TRACE_CHANNEL_ICON_FILE_ENABLED);
         setToolTip(Messages.TraceControl_ChannelDisplayName);
         fChannelInfo = new ChannelInfo(name);
-        fDisabledImage = LTTngUiPlugin.getDefault().loadIcon(TRACE_CHANNEL_ICON_FILE_DISABLED);
+        fDisabledImage = Activator.getDefault().loadIcon(TRACE_CHANNEL_ICON_FILE_DISABLED);
     }
     
     // ------------------------------------------------------------------------
@@ -81,7 +81,7 @@ public class TraceChannelComponent extends TraceControlComponent {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
      */
     @Override
     public Image getImage() {
@@ -211,7 +211,7 @@ public class TraceChannelComponent extends TraceControlComponent {
     }
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceControlComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlComponent.java
index 82a7555bb4..d3a20e5ba1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceControlComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlComponent.java
@@ -9,18 +9,18 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -90,7 +90,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getName()
      */
     @Override
     public String getName() {
@@ -99,7 +99,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setName(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setName(java.lang.String)
      */
     @Override
     public void setName(String name) {
@@ -108,7 +108,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getImage()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getImage()
      */
     @Override
     public Image getImage() {
@@ -117,16 +117,16 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setImage(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setImage(java.lang.String)
      */
     @Override
     public void setImage(String path) {
-        fImage = LTTngUiPlugin.getDefault().loadIcon(path);
+        fImage = Activator.getDefault().loadIcon(path);
     }
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setImage(org.eclipse.swt.graphics.Image)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setImage(org.eclipse.swt.graphics.Image)
      */
     @Override
     public void setImage(Image image) {
@@ -135,7 +135,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getToolTip()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getToolTip()
      */
     @Override
     public String getToolTip() {
@@ -144,7 +144,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setToolTip(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setToolTip(java.lang.String)
      */
     @Override
     public void setToolTip(String toolTip) {
@@ -153,7 +153,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getTargetNodeState()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getTargetNodeState()
      */
     @Override    
     public TargetNodeState getTargetNodeState() {
@@ -165,7 +165,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent.TargetNodeState)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent.TargetNodeState)
      */
     @Override
     public void setTargetNodeState(TargetNodeState state) {
@@ -176,7 +176,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getParent()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getParent()
      */
     @Override
     public ITraceControlComponent getParent() {
@@ -185,7 +185,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setParent(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setParent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void setParent(ITraceControlComponent parent) {
@@ -194,7 +194,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getChildren()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getChildren()
      */
     @Override
     public ITraceControlComponent[] getChildren() {
@@ -203,7 +203,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setChildren(java.util.List)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setChildren(java.util.List)
      */
     @Override
     public void setChildren(List<ITraceControlComponent> children) {
@@ -215,7 +215,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getChild(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getChild(java.lang.String)
      */
     @Override
     public ITraceControlComponent getChild(String name) {
@@ -230,7 +230,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     }
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getChildren(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getChildren(java.lang.Class)
      */
     @Override
     public List<ITraceControlComponent> getChildren(Class<? extends ITraceControlComponent> clazz) {
@@ -247,7 +247,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#getControlService()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getControlService()
      */
     @Override
     public ILttngControlService getControlService() {
@@ -259,7 +259,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#setControlService(org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService)
      */
     @Override
     public void setControlService(ILttngControlService service) {
@@ -273,7 +273,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#dispose()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#dispose()
      */
     @Override
     public void dispose() {
@@ -282,7 +282,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#addChild(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#addChild(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void addChild(ITraceControlComponent component) {
@@ -294,7 +294,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#removeChild(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#removeChild(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void removeChild(ITraceControlComponent component) {
@@ -307,7 +307,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#removeAllChildren()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#removeAllChildren()
      */
     @Override
     public void removeAllChildren() {
@@ -321,7 +321,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#containsChild(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#containsChild(java.lang.String)
      */
     @Override
     public boolean containsChild(String name) {
@@ -337,7 +337,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#hasChildren()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#hasChildren()
      */
     @Override
     public boolean hasChildren() {
@@ -346,7 +346,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#addComponentListener(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#addComponentListener(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener)
      */
     @Override
     public void addComponentListener(ITraceControlComponentChangedListener listener) {
@@ -359,7 +359,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#removeComponentListener(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#removeComponentListener(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener)
      */
     @Override
     public void removeComponentListener(ITraceControlComponentChangedListener listener) {
@@ -372,7 +372,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentAdded(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentAdded(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void fireComponentAdded(ITraceControlComponent parent, ITraceControlComponent component) {
@@ -393,7 +393,7 @@ public class TraceControlComponent implements ITraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentRemoved(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentRemoved(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void fireComponentRemoved(ITraceControlComponent parent, ITraceControlComponent component) {
@@ -414,7 +414,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentChanged(org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentChanged(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent)
      */
     @Override
     public void fireComponentChanged(ITraceControlComponent component) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceControlRoot.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlRoot.java
index cf2337402e..bec0dc1106 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceControlRoot.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlRoot.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceDomainComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceDomainComponent.java
index 28696f7dd8..7ac9deedb7 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceDomainComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceDomainComponent.java
@@ -9,20 +9,20 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.TraceDomainPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceDomainPropertySource;
 import org.eclipse.ui.views.properties.IPropertySource;
 
 /**
@@ -82,7 +82,7 @@ public class TraceDomainComponent extends TraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceEventComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceEventComponent.java
index 7fed4e75b0..297f9169fb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceEventComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceEventComponent.java
@@ -9,16 +9,16 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEventType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.TraceEventPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceEventPropertySource;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.views.properties.IPropertySource;
 
@@ -67,7 +67,7 @@ public class TraceEventComponent extends TraceControlComponent {
         setImage(TRACE_EVENT_ICON_FILE_ENABLED);
         setToolTip(Messages.TraceControl_EventDisplayName);
         fEventInfo = new EventInfo(name);
-        fDisabledImage = LTTngUiPlugin.getDefault().loadIcon(TRACE_EVENT_ICON_FILE_DISABLED);
+        fDisabledImage = Activator.getDefault().loadIcon(TRACE_EVENT_ICON_FILE_DISABLED);
     }
     
     // ------------------------------------------------------------------------
@@ -75,7 +75,7 @@ public class TraceEventComponent extends TraceControlComponent {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
      */
     @Override
     public Image getImage() {
@@ -164,7 +164,7 @@ public class TraceEventComponent extends TraceControlComponent {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceInfo.java
index 851478ff99..47ff1cbecf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceInfo.java
@@ -9,9 +9,9 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo;
 
 /**
  * <b><u>TraceInfo</u></b>
@@ -61,7 +61,7 @@ public class TraceInfo implements ITraceInfo {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#getName()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#getName()
      */
     @Override
     public String getName() {
@@ -70,7 +70,7 @@ public class TraceInfo implements ITraceInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#setName(java.lang.String)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#setName(java.lang.String)
      */
     @Override
     public void setName(String name) {
@@ -79,7 +79,7 @@ public class TraceInfo implements ITraceInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @Override
     public String formatString() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java
index e473f94d06..a2f65e147f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java
@@ -9,11 +9,11 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.TraceProbeEventPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceProbeEventPropertySource;
 import org.eclipse.ui.views.properties.IPropertySource;
 
 
@@ -64,7 +64,7 @@ public class TraceProbeEventComponent extends TraceEventComponent {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceProviderGroup.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProviderGroup.java
index b81272857b..0fe949d41e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceProviderGroup.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProviderGroup.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.Iterator;
 import java.util.List;
@@ -17,10 +17,10 @@ import java.util.List;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo;
 
 /**
  * <b><u>TraceProviderGroup</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceSessionComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionComponent.java
index 15f3b3eae0..532925a38c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceSessionComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionComponent.java
@@ -9,22 +9,22 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.TraceSessionPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceSessionPropertySource;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.views.properties.IPropertySource;
 
@@ -85,8 +85,8 @@ public class TraceSessionComponent extends TraceControlComponent {
         setImage(TRACE_SESSION_ICON_FILE_INACTIVE);
         setToolTip(Messages.TraceControl_SessionDisplayName);
         fSessionInfo = new SessionInfo(name);
-        fActiveImage = LTTngUiPlugin.getDefault().loadIcon(TRACE_SESSION_ICON_FILE_ACTIVE);
-        fDestroyedImage = LTTngUiPlugin.getDefault().loadIcon(TRACE_SESSION_ICON_FILE_DESTROYED);
+        fActiveImage = Activator.getDefault().loadIcon(TRACE_SESSION_ICON_FILE_ACTIVE);
+        fDestroyedImage = Activator.getDefault().loadIcon(TRACE_SESSION_ICON_FILE_DESTROYED);
     }
 
     // ------------------------------------------------------------------------
@@ -94,7 +94,7 @@ public class TraceSessionComponent extends TraceControlComponent {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage()
      */
     @Override
     public Image getImage() {
@@ -164,7 +164,7 @@ public class TraceSessionComponent extends TraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceSessionGroup.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionGroup.java
index 5b1a5a5180..1be8633bdd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceSessionGroup.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionGroup.java
@@ -9,13 +9,13 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
 
 /**
  * <b><u>TraceSessionGroup</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/UstProviderComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderComponent.java
index 58269c4442..a16eb27d4c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/UstProviderComponent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderComponent.java
@@ -10,12 +10,12 @@
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.property.UstProviderPropertySource;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.UstProviderPropertySource;
 import org.eclipse.ui.views.properties.IPropertySource;
 
 /**
@@ -91,7 +91,7 @@ public class UstProviderComponent extends TraceControlComponent {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class)
      */
     @SuppressWarnings("rawtypes")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/UstProviderInfo.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderInfo.java
index c3d4b4cec7..3e5be8e54e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/UstProviderInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderInfo.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.model.impl;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo;
 
 /**
  * <b><u>UstProviderInfo</u></b>
@@ -73,7 +73,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo#getPid()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#getPid()
      */
     @Override
     public int getPid() {
@@ -82,7 +82,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo#setPid(int)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#setPid(int)
      */
     @Override
     public void setPid(int pid) {
@@ -91,7 +91,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo#getEvents()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#getEvents()
      */
     @Override
     public IBaseEventInfo[] getEvents() {
@@ -100,7 +100,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo#setEvents(java.util.List)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#setEvents(java.util.List)
      */
     @Override
     public void setEvents(List<IBaseEventInfo> events) {
@@ -112,7 +112,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo#addEvent(org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#addEvent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo)
      */
     @Override
     public void addEvent(IBaseEventInfo event) {
@@ -125,7 +125,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString()
      */
     @SuppressWarnings("nls")
     @Override
@@ -148,7 +148,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
      */
     @Override
     public int hashCode() {
@@ -161,7 +161,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
@@ -190,7 +190,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#toString()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString()
      */
     @SuppressWarnings("nls")
     @Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/BaseEventPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BaseEventPropertySource.java
index df7c460809..18c277f813 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/BaseEventPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BaseEventPropertySource.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -81,7 +81,7 @@ public class BaseEventPropertySource extends BasePropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -96,7 +96,7 @@ public class BaseEventPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/BasePropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BasePropertySource.java
index 27c2646953..a390174594 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/BasePropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BasePropertySource.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.IPropertySource;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/KernelProviderPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/KernelProviderPropertySource.java
index a9e72a9ce3..7804f589aa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/KernelProviderPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/KernelProviderPropertySource.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.KernelProviderComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -60,7 +60,7 @@ public class KernelProviderPropertySource extends BasePropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -70,7 +70,7 @@ public class KernelProviderPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TargetNodePropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TargetNodePropertySource.java
index e44d01335c..fda02c6b47 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TargetNodePropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TargetNodePropertySource.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TargetNodeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -76,7 +76,7 @@ public class TargetNodePropertySource extends BasePropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -88,7 +88,7 @@ public class TargetNodePropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceChannelPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceChannelPropertySource.java
index c9fa6af850..8c7e0bacf3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceChannelPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceChannelPropertySource.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceChannelComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -117,7 +117,7 @@ public class TraceChannelPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -134,7 +134,7 @@ public class TraceChannelPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceDomainPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceDomainPropertySource.java
index 875ecb3f1f..1da8d2ef9e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceDomainPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceDomainPropertySource.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -61,7 +61,7 @@ public class TraceDomainPropertySource extends BasePropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -71,7 +71,7 @@ public class TraceDomainPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceEventPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceEventPropertySource.java
index fed6661913..8ff89be5c7 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceEventPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceEventPropertySource.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -88,7 +88,7 @@ public class TraceEventPropertySource extends BasePropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -104,7 +104,7 @@ public class TraceEventPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceProbeEventPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceProbeEventPropertySource.java
index b8e60a6521..8c1a8f14e3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceProbeEventPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceProbeEventPropertySource.java
@@ -9,14 +9,14 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceEventComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProbeEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProbeEventComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -75,7 +75,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -104,7 +104,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceSessionPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceSessionPropertySource.java
index bfff2b9b02..7f96e90e63 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/TraceSessionPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceSessionPropertySource.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceSessionComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/UstProviderPropertySource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/UstProviderPropertySource.java
index a239d7ef61..b0ab83058b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/property/UstProviderPropertySource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/UstProviderPropertySource.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.property;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.property;
 
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.UstProviderComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
@@ -68,7 +68,7 @@ public class UstProviderPropertySource extends BasePropertySource {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors()
      */
     @Override
     public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -79,7 +79,7 @@ public class UstProviderPropertySource extends BasePropertySource {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object)
      */
     @Override
     public Object getPropertyValue(Object id) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/remote/IRemoteSystemProxy.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/IRemoteSystemProxy.java
index ef2849d98c..467b27ec46 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/remote/IRemoteSystemProxy.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/IRemoteSystemProxy.java
@@ -9,10 +9,10 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.remote;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.remote;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell;
 import org.eclipse.rse.core.model.IRSECallback;
 import org.eclipse.rse.core.subsystems.ICommunicationsListener;
 import org.eclipse.rse.core.subsystems.ISubSystem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/remote/RemoteSystemProxy.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/RemoteSystemProxy.java
index 882c7a8221..b2ae463fd6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/remote/RemoteSystemProxy.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/RemoteSystemProxy.java
@@ -9,12 +9,12 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.remote;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.remote;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.CommandShell;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.CommandShell;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.IRSECallback;
 import org.eclipse.rse.core.subsystems.ICommunicationsListener;
@@ -49,7 +49,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     // Operations
     // ------------------------------------------------------------------------
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#getShellService(org.eclipse.rse.core.model.IHost)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getShellService(org.eclipse.rse.core.model.IHost)
      */
     @Override
     public IShellService getShellService() {
@@ -61,7 +61,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#getTerminalService()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getTerminalService()
      */
     @Override
     public ITerminalService getTerminalService() {
@@ -73,7 +73,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#getShellServiceSubSystem()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getShellServiceSubSystem()
      */
     @Override
     public ISubSystem getShellServiceSubSystem() {
@@ -95,7 +95,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#getTerminalServiceSubSystem()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getTerminalServiceSubSystem()
      */
     @Override
     public ISubSystem getTerminalServiceSubSystem() {
@@ -118,7 +118,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.remote.IRemoteSystemProxy#getFileServiceSubSystem()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy#getFileServiceSubSystem()
      */
     @Override
     public IFileServiceSubSystem getFileServiceSubSystem() {
@@ -135,7 +135,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#connect(org.eclipse.rse.core.model.IRSECallback)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#connect(org.eclipse.rse.core.model.IRSECallback)
      */
     @Override
     public void connect(IRSECallback callback) throws ExecutionException {
@@ -154,7 +154,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#disconnect()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#disconnect()
      */
     @Override
     public void disconnect() throws ExecutionException {
@@ -169,7 +169,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#createCommandShell()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#createCommandShell()
      */
     @Override
     public ICommandShell createCommandShell() throws ExecutionException {
@@ -179,7 +179,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#addCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#addCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener)
      */
     @Override
     public void addCommunicationListener(ICommunicationsListener listener) {
@@ -190,7 +190,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy {
     }
 
     /* (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.util.IRemoteSystemProxy#removeCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#removeCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener)
      */
     @Override
     public void removeCommunicationListener(ICommunicationsListener listener) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandResult.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandResult.java
index 4ba1070c5e..a7f91ecb87 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandResult.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandResult.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.service;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.service;
 
 import java.util.Arrays;
 
@@ -49,7 +49,7 @@ public class CommandResult implements ICommandResult {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandResult#getResult()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#getResult()
      */
     @Override
     public int getResult() {
@@ -58,7 +58,7 @@ public class CommandResult implements ICommandResult {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandResult#setResult(int)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#setResult(int)
      */
     @Override
     public void setResult(int result) {
@@ -67,7 +67,7 @@ public class CommandResult implements ICommandResult {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandResult#getOutput()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#getOutput()
      */
     @Override
     public String[] getOutput() {
@@ -76,7 +76,7 @@ public class CommandResult implements ICommandResult {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandResult#setOutput(java.lang.String[])
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#setOutput(java.lang.String[])
      */
     @Override
     public void setOutput(String[] output) {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandShell.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandShell.java
index e4afc611f1..f0be32936c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandShell.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandShell.java
@@ -10,7 +10,7 @@
  *   Patrick Tasse - Initial API and implementation
  *   Bernd Hufmann - Updated using Executor Framework
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.service;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.service;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.remote.IRemoteSystemProxy;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy;
 import org.eclipse.rse.services.shells.HostShellProcessAdapter;
 import org.eclipse.rse.services.shells.IHostShell;
 import org.eclipse.rse.services.shells.IShellService;
@@ -76,7 +76,7 @@ public class CommandShell implements ICommandShell {
     // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell#connect()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#connect()
      */
     @Override
     public void connect() throws ExecutionException {
@@ -97,7 +97,7 @@ public class CommandShell implements ICommandShell {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell#disconnect()
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#disconnect()
      */
     @Override
     public void disconnect() {
@@ -111,7 +111,7 @@ public class CommandShell implements ICommandShell {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public ICommandResult executeCommand(String command, IProgressMonitor monitor) throws ExecutionException {
@@ -120,7 +120,7 @@ public class CommandShell implements ICommandShell {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, boolean)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, boolean)
      */
     @Override
     public ICommandResult executeCommand(final String command, final IProgressMonitor monitor, final boolean checkReturnValue) throws ExecutionException {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/ICommandResult.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandResult.java
index 729bedf5a5..172603b3fc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/ICommandResult.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandResult.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  *********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.service;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.service;
 
 /**
  * <b><u>IommandResult</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/ICommandShell.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandShell.java
index bdea09bdc9..1f85330282 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/ICommandShell.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandShell.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.service;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.service;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/ILttngControlService.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ILttngControlService.java
index 6db5755720..4554c270a9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/ILttngControlService.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ILttngControlService.java
@@ -9,18 +9,18 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.service;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.service;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
 
 
 /** <b><u>ILttngControlService</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/LTTngControlService.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/LTTngControlService.java
index 94290e27c7..51dd0b653c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/LTTngControlService.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/LTTngControlService.java
@@ -9,7 +9,7 @@
  * Contributors: 
  *   Bernd Hufmann - Initial API and implementation
  **********************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.control.service;
+package org.eclipse.linuxtools.internal.lttng.ui.views.control.service;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -20,24 +20,24 @@ import java.util.regex.Pattern;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.lttng.ui.views.control.Messages;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IBaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IDomainInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IProbeEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ISessionInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.IUstProviderInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceEventType;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.BaseEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.ChannelInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.DomainInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.EventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.ProbeEventInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.SessionInfo;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.UstProviderInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.DomainInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ProbeEventInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.SessionInfo;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderInfo;
 
 /**
  * <b><u>LTTngControlService</u></b>
@@ -311,7 +311,7 @@ public class LTTngControlService implements ILttngControlService {
      * (non-Javadoc)
      * 
      * @see
-     * org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService
+     * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService
      * #getSessionNames(org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
@@ -350,7 +350,7 @@ public class LTTngControlService implements ILttngControlService {
      * (non-Javadoc)
      * 
      * @see
-     * org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService
+     * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService
      * #getSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
@@ -435,7 +435,7 @@ public class LTTngControlService implements ILttngControlService {
      * (non-Javadoc)
      * 
      * @see
-     * org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService
+     * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService
      * #getKernelProvider(org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
@@ -458,7 +458,7 @@ public class LTTngControlService implements ILttngControlService {
      * (non-Javadoc)
      * 
      * @see
-     * org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService
+     * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService
      * #getUstProvider()
      */
     @Override
@@ -470,7 +470,7 @@ public class LTTngControlService implements ILttngControlService {
      * (non-Javadoc)
      * 
      * @see
-     * org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService
+     * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService
      * #getUstProvider(org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
@@ -523,7 +523,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#createSession(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#createSession(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public ISessionInfo createSession(String sessionName, String sessionPath, IProgressMonitor monitor) throws ExecutionException {
@@ -608,7 +608,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#startSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#startSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void startSession(String sessionName, IProgressMonitor monitor) throws ExecutionException {
@@ -627,7 +627,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#stopSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#stopSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void stopSession(String sessionName, IProgressMonitor monitor) throws ExecutionException {
@@ -645,7 +645,7 @@ public class LTTngControlService implements ILttngControlService {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#enableChannel(java.lang.String, java.util.List, boolean, org.eclipse.linuxtools.lttng.ui.views.control.model.IChannelInfo, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableChannel(java.lang.String, java.util.List, boolean, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableChannels(String sessionName, List<String> channelNames, boolean isKernel, IChannelInfo info, IProgressMonitor monitor) throws ExecutionException {
@@ -711,7 +711,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#disableChannel(java.lang.String, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#disableChannel(java.lang.String, java.util.List, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void disableChannels(String sessionName, List<String> channelNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException {
@@ -751,7 +751,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#enableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableEvents(String sessionName, String channelName, List<String> eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException {
@@ -798,7 +798,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#enableSyscalls(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableSyscalls(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableSyscalls(String sessionName, String channelName, IProgressMonitor monitor) throws ExecutionException {
@@ -828,7 +828,7 @@ public class LTTngControlService implements ILttngControlService {
     
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#enableProbe(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableProbe(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableProbe(String sessionName, String channelName, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException {
@@ -863,7 +863,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#enableLogLevel(java.lang.String, java.lang.String, java.lang.String, org.eclipse.linuxtools.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableLogLevel(java.lang.String, java.lang.String, java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void enableLogLevel(String sessionName, String channelName, String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException {
@@ -901,7 +901,7 @@ public class LTTngControlService implements ILttngControlService {
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService#disableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
+     * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#disableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor)
      */
     @Override
     public void disableEvent(String sessionName, String channelName, List<String> eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/ControlFlowView.java
index 10c4b4cb60..27c4f207e0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/ControlFlowView.java
@@ -11,7 +11,7 @@
  *   Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *   Bernd Hufmann - Bug fixes
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow;
 
 import java.util.Vector;
 
@@ -35,18 +35,18 @@ import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
-import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
-import org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor.FlowEventToHandlerFactory;
-import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowModelFactory;
-import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowTimeRangeViewerProvider;
+import org.eclipse.linuxtools.internal.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.internal.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.ItemContainer;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.AbsTimeUpdateView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor.FlowEventToHandlerFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model.FlowModelFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model.FlowTimeRangeViewerProvider;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
@@ -162,7 +162,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 	 * example).
 	 */
 
-	class ViewContentProvider implements
+	static class ViewContentProvider implements
 	/* ILazyContentProvider, */IStructuredContentProvider {
 		private TableViewer cviewer = null;
 		private ITmfTimeAnalysisEntry[] elements = null;
@@ -198,7 +198,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 		}
 	}
 
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
+	static class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			String strRes = ""; //$NON-NLS-1$
@@ -261,7 +261,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 		}
 	}
 
-	class ViewProcessFilter extends ViewerFilter {
+	static class ViewProcessFilter extends ViewerFilter {
 
 		private Vector<ITmfTimeAnalysisEntry> filteredSet = new Vector<ITmfTimeAnalysisEntry>();
 		StructuredViewer viewer;
@@ -415,9 +415,6 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 					return;
 				}
 
-				TableItem item;
-				int count;
-
 				switch (e.keyCode) {
 				case SWT.PAGE_DOWN:
 					updateScrollPageDown();
@@ -426,16 +423,13 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 					updateScrollUp();
 					break;
 				case SWT.HOME:
-					// Home
-					count = table.getItemCount();
-					item = table.getItem(0);
 					// Go to the top
 					scrollFrame.setOrigin(origin.x, 0);
 					break;
 				case SWT.END:
 					// End Selected
-					count = table.getItemCount();
-					item = table.getItem(count - 1);
+					int count = table.getItemCount();
+					TableItem item = table.getItem(count - 1);
 					int itemStartPos = item.getBounds().y;
 					// Get to the bottom
 					scrollFrame.setOrigin(origin.x, itemStartPos);
@@ -547,10 +541,10 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 		// as well as time space width in pixels, used by the time analysis
 		// widget
 		// Read relevant values
-		int timeSpaceWidth = tsfviewer.getTimeSpace();
-		if (timeSpaceWidth < 0) {
-			timeSpaceWidth = -timeSpaceWidth;
-		}
+//		int timeSpaceWidth = tsfviewer.getTimeSpace();
+//		if (timeSpaceWidth < 0) {
+//			timeSpaceWidth = -timeSpaceWidth;
+//		}
 
 		TmfExperiment<?> experiment = TmfExperiment.getCurrentExperiment();
 		if (experiment != null) {
@@ -562,7 +556,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 						experimentTRange);
 	
 				// initialize widget time boundaries and filtering parameters
-				ModelUpdateInit(experimentTRange, adjustedTimeRange, this);
+				modelUpdateInit(experimentTRange, adjustedTimeRange, this);
 			}
 		} else {
 			TraceDebug.debug("No selected experiment information available"); //$NON-NLS-1$
@@ -1051,7 +1045,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 			initTimeRange = TmfTimeRange.NULL_RANGE;
 			if (experimentTRange != TmfTimeRange.NULL_RANGE) {
 				// prepare time intervals in widget
-				ModelUpdateInit(experimentTRange, experimentTRange, signal
+				modelUpdateInit(experimentTRange, experimentTRange, signal
 						.getSource());
 	
 				// request initial data
@@ -1068,7 +1062,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements
 
 			if (experimentTRange != TmfTimeRange.NULL_RANGE) {
 				// prepare time intervals in widget
-				ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
+				modelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
 
 				// request initial data
 				initialExperimentDataRequest(signal.getSource(), experimentTRange);
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/Messages.java
index a7c8bc99b3..8f2a1959b7 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/Messages.java
@@ -9,13 +9,13 @@
  * Contributors:

  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.controlflow;

+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow;

 

 import java.util.MissingResourceException;

 import java.util.ResourceBundle;

 

 public class Messages {

-	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.controlflow.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.messages"; //$NON-NLS-1$

 

 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle

 			.getBundle(BUNDLE_NAME);

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
index 3e920c97cf..ffa3904cab 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
@@ -10,23 +10,23 @@
  *   Alvaro Sanchez-Leon - Initial implementation
  *   Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;
 
 import java.util.Vector;
 
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent.Type;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
-import org.eclipse.linuxtools.lttng.ui.views.common.AbsTRangeUpdate;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
-import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowModelFactory;
-import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowProcessContainer;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEvent;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEvent.Type;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.AbsTRangeUpdate;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model.FlowModelFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model.FlowProcessContainer;
 
 public abstract class AbsFlowTRangeUpdate extends AbsTRangeUpdate implements ILttngEventProcessor {
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java
index 2f04849d29..cc119a16eb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java
@@ -10,15 +10,15 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *   Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventProcess;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 
 /**
@@ -65,7 +65,7 @@ class FlowAfterUpdateHandlers {
 				if (localProcess == null) {
 					if ((pid_in == 0) || !pid_in.equals(process_in.getPpid())) {
 					    TmfTimeRange timeRange = traceSt.getContext().getTraceTimeWindow();
-	                    localProcess = addLocalProcess(process_in, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+	                    addLocalProcess(process_in, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
 					}
 					else {
 						TraceDebug
@@ -138,7 +138,7 @@ class FlowAfterUpdateHandlers {
 			        if (localProcess == null) {
 			            if (child_pid == 0 || !child_pid.equals(process_child.getPpid())) {            
 			                TmfTimeRange timeRange = traceSt.getContext().getTraceTimeWindow();
-                            localProcess = addLocalProcess(process_child, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+                            addLocalProcess(process_child, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
 			            }
 			            else {
 			                TraceDebug.debug("localProcess is null with child_pid not 0 or child_pid equals PPID (getProcessForkHandler)"); //$NON-NLS-1$
@@ -191,7 +191,7 @@ class FlowAfterUpdateHandlers {
 			        if (localProcess == null) {
 			            if (process.getPid() == 0 || !process.getPid().equals(process.getPpid())) {			                
 			                TmfTimeRange timeRange = traceSt.getContext().getTraceTimeWindow();
-		                    localProcess = addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+		                    addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
 			            }
 			            else {
 			                TraceDebug.debug("process pid is not 0 or pid equals ppid! (getProcessExitHandler)"); //$NON-NLS-1$
@@ -233,7 +233,7 @@ class FlowAfterUpdateHandlers {
                     if (localProcess == null) {
                         if (process.getPid() == 0 || !process.getPid().equals(process.getPpid())) {
                             TmfTimeRange timeRange = traceSt.getContext().getTraceTimeWindow();
-                            localProcess = addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+                            addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
                         }
                         else {
                             TraceDebug.debug("process pid is not 0 or pid equals ppid! (getProcessExecHandler)"); //$NON-NLS-1$
@@ -283,7 +283,7 @@ class FlowAfterUpdateHandlers {
                     if (localProcess == null) {
                         if (process.getPid() == 0 || !process.getPid().equals(process.getPpid())) {                         
                             TmfTimeRange timeRange = traceSt.getContext().getTraceTimeWindow();
-                            localProcess = addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+                            addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
                         }
                         else {
                             TraceDebug.debug("process pid is not 0 or pid equals ppid! (GetThreadBrandHandler)"); //$NON-NLS-1$
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java
index be0a9bafb1..efd09a3dfd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java
@@ -10,15 +10,15 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *   Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
-
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;
+
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventProcess;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java
index e1aa9d2662..46482fc382 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java
@@ -10,14 +10,14 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.linuxtools.lttng.core.state.StateStrings;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
 
 /**
  * Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java
index b7efd6d429..2bf11c60d7 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java
@@ -10,19 +10,19 @@
  *   Alvaro Sanchez-Leon - Initial implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;
 
 import java.util.Vector;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEvent;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventProcess;
 
 /**
  * Creates specific finish state data request
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/messages.properties
index 9c42384cc9..9c42384cc9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowModelFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/model/FlowModelFactory.java
index 7b350a9f5b..7047c07adf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowModelFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/model/FlowModelFactory.java
@@ -10,9 +10,9 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;
 
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
 
 /**
  * Instantiates the entry point classes to build the data model for this view
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/model/FlowProcessContainer.java
index 9e87a81d89..6b2c78e6c1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/model/FlowProcessContainer.java
@@ -10,14 +10,14 @@
  *   Alvaro Sanchez-Leon - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.eclipse.linuxtools.lttng.core.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.internal.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.ItemContainer;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventProcess;
 
 /**
  * Contains the processes in use by the Control flow view
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowTimeRangeViewerProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/model/FlowTimeRangeViewerProvider.java
index 2b07df17b0..76e8ab7191 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowTimeRangeViewerProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/controlflow/model/FlowTimeRangeViewerProvider.java
@@ -10,10 +10,10 @@
  *   Matthew Khouzam - Initial implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.controlflow.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;
 
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeViewerProvider;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeViewerProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
 
 public class FlowTimeRangeViewerProvider extends TimeRangeViewerProvider {
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/DistributionData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/distribution/model/DistributionData.java
index 360958a91f..0fc3b5f328 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/DistributionData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/distribution/model/DistributionData.java
@@ -9,9 +9,9 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  ******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.distribution.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model;
 
-import org.eclipse.linuxtools.lttng.ui.views.latency.model.Config;
+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.Config;
 import org.eclipse.linuxtools.tmf.ui.views.distribution.model.BaseDistributionData;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/HorDistributionData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/distribution/model/HorDistributionData.java
index 766384f69c..30363bdf97 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/HorDistributionData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/distribution/model/HorDistributionData.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  ******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.distribution.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model;
 
 /**
  * <b><u>HorDistributionData</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/VerDistributionData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/distribution/model/VerDistributionData.java
index e44398c417..2cd2fa8908 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/distribution/model/VerDistributionData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/distribution/model/VerDistributionData.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  ******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.distribution.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model;
 
 /**
  * <b><u>VerDistributionData</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/events/EventsTable.java
index 48b088af25..8952ba7996 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/events/EventsTable.java
@@ -11,7 +11,7 @@
  *   Francois Chouinard - Aligned columns with domain terminology

  *******************************************************************************/

 

-package org.eclipse.linuxtools.lttng.ui.views.events;

+package org.eclipse.linuxtools.internal.lttng.ui.views.events;

 

 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;

 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/events/Messages.java
index 26ffa955d9..5e51094913 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/events/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.ui.views.events;
+package org.eclipse.linuxtools.internal.lttng.ui.views.events;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.events.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.events.messages"; //$NON-NLS-1$
 	public static String EventsTable_traceColumn;
 	public static String EventsTable_timestampColumn;
 	public static String EventsTable_markerColumn;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/events/messages.properties
index 4e6dfa8c5d..4e6dfa8c5d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/events/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/AbstractViewer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/AbstractViewer.java
index e9086220ea..889ae3c9aa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/AbstractViewer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/AbstractViewer.java
@@ -11,12 +11,12 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.AbstractMouseListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.AbstractMouseTrackListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.AbstractPaintListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.ZoomListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.AbstractMouseListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.AbstractMouseTrackListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.AbstractPaintListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.ZoomListener;

 import org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.SWTException;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/GraphViewer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/GraphViewer.java
index 2598543198..ee4593f361 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/GraphViewer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/GraphViewer.java
@@ -11,14 +11,14 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.GraphMouseListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.GraphPaintListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.TimePointerListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.IGraphDataModel;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.IGraphModelListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.LatencyGraphModel;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.GraphMouseListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.GraphPaintListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.TimePointerListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.IGraphDataModel;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.IGraphModelListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.LatencyGraphModel;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/HistogramViewer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/HistogramViewer.java
index e4219b5b77..4576cda9c4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/HistogramViewer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/HistogramViewer.java
@@ -11,11 +11,11 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.HistogramPaintListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.TooltipListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.listeners.ZoomListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.HistogramPaintListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.TooltipListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners.ZoomListener;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramDataModel;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramDataModel;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramModelListener;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/LatencyView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/LatencyView.java
index 4bd35e11b3..ebc14f4b11 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/LatencyView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/LatencyView.java
@@ -11,20 +11,20 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency;

 

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.IToolBarManager;

 import org.eclipse.jface.action.Separator;

-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;

-import org.eclipse.linuxtools.lttng.ui.views.latency.dialogs.AddDialog;

-import org.eclipse.linuxtools.lttng.ui.views.latency.dialogs.DeleteDialog;

-import org.eclipse.linuxtools.lttng.ui.views.latency.dialogs.ListDialog;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.Config;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.IGraphModelListener;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.LatencyController;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.LatencyGraphModel;

+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs.AddDialog;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs.DeleteDialog;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs.ListDialog;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.Config;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.IGraphModelListener;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.LatencyController;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.LatencyGraphModel;

 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;

 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;

 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/Messages.java
index d8ec82fcf0..d2f1c6fccf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/Messages.java
@@ -11,7 +11,7 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Updated    

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency;

 

 import org.eclipse.osgi.util.NLS;

 

@@ -22,7 +22,7 @@ import org.eclipse.osgi.util.NLS;
  */

 public class Messages extends NLS {

 

-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.latency.messages"; //$NON-NLS-1$

+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.latency.messages"; //$NON-NLS-1$

 

     public static String LatencyView_ViewName;

     public static String LatencyView_Action_IncreaseBarWidth_Tooltip;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/AbstractDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AbstractDialog.java
index 2551eae068..0a85021548 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/AbstractDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AbstractDialog.java
@@ -11,17 +11,17 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new messages file, fixed warnings

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.dialogs;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;

 

 import java.util.Vector;

 

 import org.eclipse.jface.dialogs.IDialogSettings;

 import org.eclipse.jface.dialogs.IMessageProvider;

 import org.eclipse.jface.dialogs.TitleAreaDialog;

-import org.eclipse.linuxtools.lttng.core.latency.analyzer.EventMatcher;

-import org.eclipse.linuxtools.lttng.core.util.EventsPair;

-import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.LatencyController;

+import org.eclipse.linuxtools.internal.lttng.core.latency.analyzer.EventMatcher;

+import org.eclipse.linuxtools.internal.lttng.core.util.EventsPair;

+import org.eclipse.linuxtools.internal.lttng.ui.Activator;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.LatencyController;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Display;

@@ -103,7 +103,7 @@ public abstract class AbstractDialog extends TitleAreaDialog {
         fDialogTitle = title;

         fDialogMessage = message;

 

-        fSettings = LTTngUiPlugin.getDefault().getDialogSettings();

+        fSettings = Activator.getDefault().getDialogSettings();

     }

 

     /**

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/AddDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AddDialog.java
index aee1ef9e44..e709b27c54 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/AddDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AddDialog.java
@@ -11,13 +11,13 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new messages file, fixed warnings

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.dialogs;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;

 

 import java.util.Vector;

 

-import org.eclipse.linuxtools.lttng.core.latency.analyzer.EventMatcher;

-import org.eclipse.linuxtools.lttng.core.util.EventsPair;

-import org.eclipse.linuxtools.lttng.ui.views.latency.Messages;

+import org.eclipse.linuxtools.internal.lttng.core.latency.analyzer.EventMatcher;

+import org.eclipse.linuxtools.internal.lttng.core.util.EventsPair;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.Messages;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

@@ -77,17 +77,17 @@ public class AddDialog extends AbstractDialog {
     /**

      * Start table column names (header titles).

      */

-    protected static final String[] START_COLUMN_NAMES = { "", Messages.LatencyView_Dialogs_AddEvents_Columns_Start }; //$NON-NLS-1$

+    static final String[] START_COLUMN_NAMES = { "", Messages.LatencyView_Dialogs_AddEvents_Columns_Start }; //$NON-NLS-1$

 

     /**

      * End table column names (header titles).

      */

-    protected static final String[] END_COLUMN_NAMES = { "", Messages.LatencyView_Dialogs_AddEvents_Columns_End }; //$NON-NLS-1$

+    static final String[] END_COLUMN_NAMES = { "", Messages.LatencyView_Dialogs_AddEvents_Columns_End }; //$NON-NLS-1$

 

     /**

      * List table column names (header titles).

      */

-    protected static final String[] LIST_COLUMN_NAMES = {

+    static final String[] LIST_COLUMN_NAMES = {

             "#", //$NON-NLS-1$

             Messages.LatencyView_Dialogs_AddEvents_Columns_List_Trigger,

             Messages.LatencyView_Dialogs_AddEvents_Columns_List_End };

@@ -95,7 +95,7 @@ public class AddDialog extends AbstractDialog {
     /**

      * Column widths.

      */

-    protected static final int[] COLUMN_WIDTHS = { 25, 250, 250 };

+    static final int[] COLUMN_WIDTHS = { 25, 250, 250 };

 

     /**

      * Possible event types.

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/DeleteDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/DeleteDialog.java
index c975688aa8..05d6588937 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/DeleteDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/DeleteDialog.java
@@ -11,11 +11,11 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new messages file, fixed warnings

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.dialogs;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;

 

 import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.linuxtools.lttng.core.latency.analyzer.EventMatcher;

-import org.eclipse.linuxtools.lttng.ui.views.latency.Messages;

+import org.eclipse.linuxtools.internal.lttng.core.latency.analyzer.EventMatcher;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.Messages;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.widgets.Button;

@@ -84,18 +84,18 @@ public class DeleteDialog extends ListDialog {
 

                 int[] selectedIndices = fTable.getSelectionIndices();

 

-                String deletePairs = ""; //$NON-NLS-1$

+                StringBuffer deletePairs = new StringBuffer(""); //$NON-NLS-1$

                 for (int i = 0; i < selectedIndices.length; i++) {

                     int index = selectedIndices[i];

-                    deletePairs += "\t* " + fEventStartTypes.get(index) + " / " + fEventEndTypes.get(index); //$NON-NLS-1$ //$NON-NLS-2$

+                    deletePairs.append("\t* ").append(fEventStartTypes.get(index)).append(" / ").append(fEventEndTypes.get(index)); //$NON-NLS-1$ //$NON-NLS-2$

 

                     if (i < selectedIndices.length - 1) {

-                        deletePairs += "\n"; //$NON-NLS-1$

+                        deletePairs.append("\n"); //$NON-NLS-1$

                     }

                 }

 

                 boolean confirmDeletion = MessageDialog.openQuestion(getShell(), Messages.LatencyView_Dialogs_DeleteEvents_Confirm_Title,

-                        Messages.LatencyView_Dialogs_DeleteEvents_Confirm_Message + "\n\n" + deletePairs); //$NON-NLS-1$

+                        Messages.LatencyView_Dialogs_DeleteEvents_Confirm_Message + "\n\n" + deletePairs.toString()); //$NON-NLS-1$

 

                 if (confirmDeletion) {

                     // Remove the events starting from the end of the list, otherwise the TableItem elements will lose

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/ListDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/ListDialog.java
index fd993525a0..0fb2b93d03 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/dialogs/ListDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/ListDialog.java
@@ -11,14 +11,14 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new messages file, fixed warnings

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.dialogs;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;

 

 import java.util.Vector;

 

 import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.linuxtools.lttng.core.latency.analyzer.EventMatcher;

-import org.eclipse.linuxtools.lttng.core.util.EventsPair;

-import org.eclipse.linuxtools.lttng.ui.views.latency.Messages;

+import org.eclipse.linuxtools.internal.lttng.core.latency.analyzer.EventMatcher;

+import org.eclipse.linuxtools.internal.lttng.core.util.EventsPair;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.Messages;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

@@ -68,12 +68,12 @@ public class ListDialog extends AbstractDialog {
     /**

      * Column names (header titles).

      */

-    protected static final String[] COLUMN_NAMES = { "#", Messages.LatencyView_Dialogs_ListEvents_Columns_Trigger, Messages.LatencyView_Dialogs_ListEvents_Columns_End }; //$NON-NLS-1$

+    static final String[] COLUMN_NAMES = { "#", Messages.LatencyView_Dialogs_ListEvents_Columns_Trigger, Messages.LatencyView_Dialogs_ListEvents_Columns_End }; //$NON-NLS-1$

 

     /**

      * Column widths.

      */

-    protected static final int[] COLUMN_WIDTHS = { 25, 250, 250 };

+    static final int[] COLUMN_WIDTHS = { 25, 250, 250 };

 

     /**

      * The table style.

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/AbstractMouseListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/AbstractMouseListener.java
index 3d3b1a09bd..5677e14f37 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/AbstractMouseListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/AbstractMouseListener.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;
 
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/AbstractMouseTrackListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/AbstractMouseTrackListener.java
index b4e53feaa9..1c730a8781 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/AbstractMouseTrackListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/AbstractMouseTrackListener.java
@@ -11,7 +11,7 @@
  * Mathieu Denis (mathieu.denis55@gmail.com) - Refactored code

  * Bernd Hufmann - Changed implemented interface to MouseTraceListener

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseTrackListener;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/AbstractPaintListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/AbstractPaintListener.java
index ef1a38cbd3..4b99915c23 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/AbstractPaintListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/AbstractPaintListener.java
@@ -11,10 +11,10 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design, display improvements

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.Config;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.AbstractViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.Config;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.PaintEvent;

 import org.eclipse.swt.events.PaintListener;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphMouseListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/GraphMouseListener.java
index 5d6cb75372..4cdd2df895 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphMouseListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/GraphMouseListener.java
@@ -9,10 +9,10 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;
 
-import org.eclipse.linuxtools.lttng.ui.views.latency.GraphViewer;
-import org.eclipse.linuxtools.lttng.ui.views.latency.model.LatencyGraphModel;
+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.GraphViewer;
+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.LatencyGraphModel;
 
 /**
  * <b><u>GraphMouseListener</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphPaintListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/GraphPaintListener.java
index 7b27eb65bf..6016121ed7 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/GraphPaintListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/GraphPaintListener.java
@@ -11,15 +11,15 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design, display improvements

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

 import java.text.DecimalFormat;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer;

-import org.eclipse.linuxtools.lttng.ui.views.latency.GraphViewer;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.Config;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.GraphScaledData;

-import org.eclipse.linuxtools.lttng.ui.views.latency.model.IGraphDataModel;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.AbstractViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.GraphViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.Config;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.GraphScaledData;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.IGraphDataModel;

 import org.eclipse.linuxtools.tmf.ui.views.distribution.model.BaseDistributionData;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramUtils;

 

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/HistogramPaintListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/HistogramPaintListener.java
index ee923aa366..fb7c96b853 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/HistogramPaintListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/HistogramPaintListener.java
@@ -11,15 +11,15 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Adapted to new model-view-controller design, display improvements

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

 import java.text.DecimalFormat;

 import java.util.Collections;

 import java.util.Vector;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer;

-import org.eclipse.linuxtools.lttng.ui.views.latency.HistogramViewer;

-import org.eclipse.linuxtools.lttng.ui.views.latency.Messages;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.AbstractViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.HistogramViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.Messages;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramScaledData;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramUtils;

 import org.eclipse.linuxtools.tmf.ui.views.histogram.IHistogramDataModel;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/TimePointerListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/TimePointerListener.java
index 31027ca4aa..eb09dde30c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/TimePointerListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/TimePointerListener.java
@@ -11,9 +11,9 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *   Bernd Hufmann - Changed display interface implementation 

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.AbstractViewer;

 

 /**

  * <b><u>TimePointerListener</u></b>

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/TooltipListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/TooltipListener.java
index ccb8bc2d74..e02d41b872 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/TooltipListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/TooltipListener.java
@@ -10,10 +10,10 @@
  *   Philippe Sawicki (INF4990.A2010@gmail.com) - Initial API and implementation

  *   Bernd Hufmann - Changed display interface implementation

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer;

-import org.eclipse.linuxtools.lttng.ui.views.latency.Messages;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.AbstractViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.Messages;

 

 /**

  * <b><u>TooltipListener</u></b>

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/ZoomListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/ZoomListener.java
index 266f926a1f..0c93b367c2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/listeners/ZoomListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/listeners/ZoomListener.java
@@ -10,9 +10,9 @@
  *   Philippe Sawicki (INF4990.A2010@gmail.com)   - Initial API and implementation

  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactored code

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.listeners;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;

 

-import org.eclipse.linuxtools.lttng.ui.views.latency.AbstractViewer;

+import org.eclipse.linuxtools.internal.lttng.ui.views.latency.AbstractViewer;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Canvas;

 import org.eclipse.swt.widgets.Event;

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/messages.properties
index cf907c03d5..cf907c03d5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/Config.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/Config.java
index c15f5c80ee..d9533b5097 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/Config.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/Config.java
@@ -11,7 +11,7 @@
  *   Mathieu Denis    (mathieu.denis55@gmail.com) - Refactor code

  *   Bernd Hufmann - Added and updated constants

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.latency.model;

+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;

 

 /**

  * <b><u>Config</u></b>

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/GraphScaledData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/GraphScaledData.java
index 387ce9562c..010389afc1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/GraphScaledData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/GraphScaledData.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.latency.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;
 
 /**
  * <b><u>GraphScaledData</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphDataModel.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/IGraphDataModel.java
index 5d42be997f..f1a19c3bb3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphDataModel.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/IGraphDataModel.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.latency.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;
 
 import org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphModelListener.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/IGraphModelListener.java
index b6643991a3..086b56399d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/IGraphModelListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/IGraphModelListener.java
@@ -10,7 +10,7 @@
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.latency.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;
 
 /**
  * <b><u>IGraphModelListener</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyController.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/LatencyController.java
index 6359b37c10..4f610f96d8 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyController.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/LatencyController.java
@@ -10,7 +10,7 @@
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.latency.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;
 
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyEventRequest.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/LatencyEventRequest.java
index d871ecb4fa..5aab107eed 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/LatencyEventRequest.java
@@ -10,11 +10,11 @@
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.latency.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;
 
-import org.eclipse.linuxtools.lttng.core.LttngConstants;
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.latency.analyzer.EventMatcher;
+import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.latency.analyzer.EventMatcher;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyGraphModel.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/LatencyGraphModel.java
index 399379f2da..fd5d2dc3aa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/model/LatencyGraphModel.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/model/LatencyGraphModel.java
@@ -10,15 +10,15 @@
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.latency.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;
 
 import java.util.Arrays;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.linuxtools.lttng.ui.views.distribution.model.DistributionData;
-import org.eclipse.linuxtools.lttng.ui.views.distribution.model.HorDistributionData;
-import org.eclipse.linuxtools.lttng.ui.views.distribution.model.VerDistributionData;
+import org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model.DistributionData;
+import org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model.HorDistributionData;
+import org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model.VerDistributionData;
 
 /**
  * <b><u>LatencyGraphModel</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/Messages.java
index e01dae1743..1d15a15b7d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/Messages.java
@@ -9,13 +9,13 @@
  * Contributors:

  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

  *******************************************************************************/

-package org.eclipse.linuxtools.lttng.ui.views.resources;

+package org.eclipse.linuxtools.internal.lttng.ui.views.resources;

 

 import java.util.MissingResourceException;

 import java.util.ResourceBundle;

 

 public class Messages {

-	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.resources.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.resources.messages"; //$NON-NLS-1$

 

 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle

 			.getBundle(BUNDLE_NAME);

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/ResourcesView.java
index bbff53f0ef..6babf7d046 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/ResourcesView.java
@@ -10,7 +10,7 @@
  *   Alvaro Sanchez-Leon - Initial implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
@@ -18,16 +18,16 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
-import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
-import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
-import org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor.ResourcesEventToHandlerFactory;
-import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory;
-import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourcesTimeRangeViewerProvider;
+import org.eclipse.linuxtools.internal.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.internal.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.ItemContainer;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.AbsTimeUpdateView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor.ResourcesEventToHandlerFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.resources.model.ResourceModelFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.resources.model.ResourcesTimeRangeViewerProvider;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
@@ -154,7 +154,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
 				TmfTimeRange adjustedTimeRange = initialExperimentDataRequest(this, experimentTRange);
 
 				// initialize widget time boundaries and filtering parameters
-				ModelUpdateInit(experimentTRange, adjustedTimeRange, this);
+				modelUpdateInit(experimentTRange, adjustedTimeRange, this);
 			}
 		} else {
 			TraceDebug.debug("No selected experiment information available"); //$NON-NLS-1$
@@ -505,7 +505,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
 			initTimeRange = TmfTimeRange.NULL_RANGE;
 			if (experimentTRange != TmfTimeRange.NULL_RANGE) {
 				// prepare time intervals in widget
-				ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
+				modelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
 
 				// request initial data
 				initialExperimentDataRequest(signal.getSource(), experimentTRange);
@@ -520,7 +520,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
 
 			if (experimentTRange != TmfTimeRange.NULL_RANGE) {
 				// prepare time intervals in widget
-				ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
+				modelUpdateInit(experimentTRange, experimentTRange, signal.getSource());
 
 				// request initial data
 				initialExperimentDataRequest(signal.getSource(), experimentTRange);
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
index dfabba081a..d8c35d56f6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
@@ -10,24 +10,24 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;
 
 import java.util.Vector;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent.Type;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeResourceFactory;
-import org.eclipse.linuxtools.lttng.ui.views.common.AbsTRangeUpdate;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
-import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceContainer;
-import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEvent;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeResourceFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEvent.Type;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.AbsTRangeUpdate;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.resources.model.ResourceContainer;
+import org.eclipse.linuxtools.internal.lttng.ui.views.resources.model.ResourceModelFactory;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 
 public abstract class AbsResourcesTRangeUpdate extends AbsTRangeUpdate
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java
index 4c48c96965..095baa6423 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java
@@ -10,11 +10,11 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
 
 /**
  * Creates instances of specific after state update handlers, per corresponding
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java
index 1aa1db80da..8e2211d163 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java
@@ -10,16 +10,16 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
-
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Channels;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;
+
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Channels;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 
 /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java
index 2a068d8142..698499a66c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java
@@ -10,18 +10,18 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngSyntheticEvent.SequenceInd;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
 
 /**
  * Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java
index 3bcc934edc..9102c6fed1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java
@@ -10,14 +10,14 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource;
 
 /**
  * Creates specific finish state data request
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/messages.properties
index 032d20a3ef..032d20a3ef 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/model/ResourceContainer.java
index 9e4642fab3..b41d5a8b10 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/model/ResourceContainer.java
@@ -10,15 +10,15 @@
  *   Alvaro Sanchez-Leon - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.model;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.eclipse.linuxtools.lttng.core.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+import org.eclipse.linuxtools.internal.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.ItemContainer;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
 
 /**
  * Common location to allocate the resources in use by the resource view
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceModelFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/model/ResourceModelFactory.java
index f2b8ce6a29..3e045958bc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceModelFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/model/ResourceModelFactory.java
@@ -10,9 +10,9 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  * 	 Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.resources.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.model;
 
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
 
 /**
  * Instantiates the entry point classes to build the data model for this view
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourcesTimeRangeViewerProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/model/ResourcesTimeRangeViewerProvider.java
index 175e55bfd4..d8f75d10f8 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourcesTimeRangeViewerProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/resources/model/ResourcesTimeRangeViewerProvider.java
@@ -10,10 +10,10 @@
  *   Matthew Khouzam - Initial implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.resources.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.resources.model;
 
-import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeViewerProvider;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.TimeRangeViewerProvider;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
 
 public class ResourcesTimeRangeViewerProvider extends TimeRangeViewerProvider {
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/Messages.java
index 63fb853282..59c0354cac 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.ui.views.statistics;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.statistics.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.statistics.messages"; //$NON-NLS-1$
     public static String StatisticsView_CPUTimeColumn;
     public static String StatisticsView_CPUTimeTip;
     public static String StatisticsView_CumCPUTimeColumn;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/StatisticsView.java
index 946739ea81..b89c08152d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/StatisticsView.java
@@ -11,7 +11,7 @@
  *   Francois Chouinard (fchouinard@gmail.com) - Initial API
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics;
 
 import java.text.DecimalFormat;
 import java.util.Arrays;
@@ -27,20 +27,20 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory;
-import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
-import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
-import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor.StatsTimeCountHandlerFactory;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.KernelStatisticsData;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory;
+import org.eclipse.linuxtools.internal.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.internal.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.internal.lttng.core.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.internal.lttng.ui.model.trange.ItemContainer;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.AbsTimeUpdateView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor.StatsTimeCountHandlerFactory;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.KernelStatisticsData;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsTreeNode;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsTreeRootFactory;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
@@ -127,7 +127,7 @@ public class StatisticsView extends AbsTimeUpdateView {
 	/**
 	 * Contains all the information necessary to build a column of the table.
 	 */
-	private class ColumnData {
+	private static class ColumnData {
 		// Name of the column.
 		public final String header;
 		// Width of the column.
@@ -292,7 +292,7 @@ public class StatisticsView extends AbsTimeUpdateView {
 	 * 
 	 * @see org.eclipse.jface.viewers.ITreeContentProvider
 	 */
-	class TreeContentProvider implements ITreeContentProvider {
+	private static class TreeContentProvider implements ITreeContentProvider {
 		/*
 		 * (non-Javadoc)
 		 * 
@@ -571,7 +571,7 @@ public class StatisticsView extends AbsTimeUpdateView {
 	}
 
 	@Override
-	public void ModelUpdatePrep(TmfTimeRange timeRange, boolean clearAllData) {
+	public void modelUpdatePrep(TmfTimeRange timeRange, boolean clearAllData) {
 		Object input = treeViewer.getInput();
 		if ((input != null) && (input instanceof StatisticsTreeNode) && (!treeViewer.getTree().isDisposed())) {
 			if (clearAllData) {
@@ -627,9 +627,9 @@ public class StatisticsView extends AbsTimeUpdateView {
 
 	private static int level = 0;
     private void printRecursively(StatisticsTreeNode node) {
-        String tab = ""; //$NON-NLS-1$
+        StringBuffer tab = new StringBuffer(""); //$NON-NLS-1$
         for (int i = 0; i < level; i++) {
-            tab += "\t"; //$NON-NLS-1$
+            tab.append("\t"); //$NON-NLS-1$
         }
         level++;
         TraceDebug.traceSV(tab + node.getContent());
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
index 342b7f225b..91da678163 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
@@ -9,14 +9,14 @@
  * Contributors:
  *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
  *******************************************************************************/
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsData;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsTreeRootFactory;
 
 abstract class AbstractStatsEventHandler implements ILttngEventProcessor {
 	private Events fEventType;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
index 79ce191ebb..a21733b76a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
@@ -10,12 +10,12 @@
  *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsData;
 
 class StatsModeChangeHandler extends AbstractStatsEventHandler {
 	
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
index 4a5b2dc07c..44ab8bf981 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
@@ -10,12 +10,12 @@
  *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsData;
 
 class StatsModeEndHandler extends AbstractStatsEventHandler {
 	
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java
index 5dc5f26e4f..87e810c879 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java
@@ -10,12 +10,12 @@
  *   Francois Godin (copelnug@gmail.com)  - Initial design and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsData;
 
 /**
  * <h4>Handler for process exit event statistics</h4>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
index f6a0c928e3..f4ae74b9dd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
@@ -11,14 +11,14 @@
  *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.linuxtools.lttng.core.state.StateStrings;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
 
 /**
  * Provide the handlers that will count the CPU Time, Cumulative CPU Time and
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
index 109c8f7e31..98f8f3b73c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
@@ -10,13 +10,13 @@
  *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
 
 /**
  * Process the system call entry event
@@ -186,7 +186,7 @@ class StatsTimeCountHandlers {
 	}
 	/**
 	 * <h4>Get the process exit handler</h4>
-	 * <p> Handles: {@link org.eclipse.linuxtools.lttng.core.state.StateStrings.Events#LTT_EVENT_PROCESS_EXIT}.</p>
+	 * <p> Handles: {@link org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events#LTT_EVENT_PROCESS_EXIT}.</p>
 	 * @return The handler.
 	 */
 	ILttngEventProcessor getProcessExitHandler() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java
index 658e7bdfc9..0fe23ca24a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java
@@ -10,11 +10,11 @@
  *   Francois Godin (copelnug@gmail.com)  - Initial design and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.StatisticsData;
 
 /**
  * <h4>Handler for the traceset end</h4>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/messages.properties
index aafff5027f..aafff5027f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/FixedArray.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/FixedArray.java
index 1275bce39a..58967e5aba 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/FixedArray.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/FixedArray.java
@@ -10,7 +10,7 @@
  *   Francois Godin (copelnug@gmail.com)  - Initial design and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 import java.util.Arrays;
 import java.util.RandomAccess;
@@ -26,7 +26,7 @@ import java.util.RandomAccess;
  *
  * @param <T> Type of the array content.
  */
-public final class FixedArray implements RandomAccess {
+public final class FixedArray implements RandomAccess, Cloneable {
 	/**
 	 * Replace {@link java.util.Arrays#copyOf(Object[], int)} that do not exist in java 5.
 	 * @param array Original array to copy from.
@@ -121,18 +121,23 @@ public final class FixedArray implements RandomAccess {
 	public Object clone() {
 		return new FixedArray(copyOf(fArray, fArray.length));
 	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
-	public boolean equals(Object o) {
-	    if (o == this)
-	        return true;
-	    if (o == null)
-	        return false;
-		return Arrays.equals(fArray, ((FixedArray)o).fArray);
-	}
+    public boolean equals(Object other) {
+        if (this == other)
+            return true;
+        if (other == null)
+            return false;
+        if (!(other instanceof FixedArray))
+            return false;
+        FixedArray array = (FixedArray) other;
+        return Arrays.equals(fArray, array.fArray);
+    }
+
 	/**
 	 * Gets value of given index.
 	 * @param index 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/KernelStatisticsData.java
index abac0f7392..b4a420f55c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/KernelStatisticsData.java
@@ -10,22 +10,22 @@
  *   Francois Godin (copelnug@gmail.com)  - Initial design and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
-import org.eclipse.linuxtools.lttng.core.LttngConstants;
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.internal.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
 
 /**
  * <h4>Class that process the LTTng kernel events.</h4>
@@ -820,7 +820,7 @@ public class KernelStatisticsData extends StatisticsData {
      * @author bhufmann
      * 
      */
-    final private class KeyProvider {
+    private static final class KeyProvider {
 
         /**
          * <h4>Instance counter for unique ID generation.</h4>
@@ -887,7 +887,7 @@ public class KernelStatisticsData extends StatisticsData {
      * @author bhufmann
      * 
      */
-    private class KeyHelper implements Cloneable {
+    private static final class KeyHelper implements Cloneable {
 
         // Short pre-fix
         private final static String UNKNOWN_PREFIX = "P"; //$NON-NLS-1$
@@ -916,7 +916,10 @@ public class KernelStatisticsData extends StatisticsData {
                 return true;
             if (o == null)
                 return false;
-            if (fValue == ((KeyHelper) o).fValue && fName.equals(((KeyHelper) o).fName)) {
+            if (!(o instanceof KeyHelper))
+                return false;
+            KeyHelper kh = (KeyHelper) o;
+            if (fValue == kh.fValue && fName.equals(kh.fName)) {
                 return true;
             }
             return false;
@@ -970,7 +973,7 @@ public class KernelStatisticsData extends StatisticsData {
      * @author bhufmann
      * 
      */
-    final private class ProcessKeyProvider {
+    private static final class ProcessKeyProvider {
         /**
          * <h4>Instance counter for unique ID generation.</h4>
          */
@@ -1029,7 +1032,7 @@ public class KernelStatisticsData extends StatisticsData {
     * @author bhufmann
     * 
     */
-    final class ProcessKey implements Cloneable {
+    private static final class ProcessKey implements Cloneable {
         private int fPid = 0;
         private int fCpuId = 0;
         private long fCreationTime = 0;
@@ -1073,6 +1076,8 @@ public class KernelStatisticsData extends StatisticsData {
                 return true;
             if (obj == null)
                 return false;
+            if (!(obj instanceof ProcessKey))
+                return false;
 
             ProcessKey procKey = (ProcessKey) obj;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/Messages.java
index e699fa8ef2..11c058b7ee 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.statistics.model.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model.messages"; //$NON-NLS-1$
     public static String KernelStatisticsData_CPUs;
     public static String KernelStatisticsData_EventTypes;
     public static String KernelStatisticsData_Functions;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Statistics.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/Statistics.java
index 5bf15d6ed3..017d1b0b3f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Statistics.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/Statistics.java
@@ -10,7 +10,7 @@
  *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 public class Statistics {
 	/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/StatisticsData.java
index 5dbf15e1eb..ebdc510a00 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/StatisticsData.java
@@ -10,15 +10,15 @@
  *   Francois Godin (copelnug@gmail.com)  - Initial design and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.state.model.LttngTraceState;
 
 /**
  * <h4>Base class for the statistics storage.</h4>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/StatisticsTreeNode.java
index a286abfe09..432f0ac9c4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeNode.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/StatisticsTreeNode.java
@@ -11,7 +11,7 @@
  *   Francois Godin (copelnug@gmail.com)  - Re-design for new stats structure
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 import java.util.Collection;
 
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeRootFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/StatisticsTreeRootFactory.java
index 2b4d003438..5db288224a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeRootFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/StatisticsTreeRootFactory.java
@@ -10,7 +10,7 @@
  *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+package org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/messages.properties
index 7e88de5815..7e88de5815 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/statistics/model/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/Messages.java
index 85350113a0..481724678a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.ui.views.timeframe;
+package org.eclipse.linuxtools.internal.lttng.ui.views.timeframe;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.timeframe.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.timeframe.messages"; //$NON-NLS-1$
     public static String TimeFrameView_CurrentTime;
     public static String TimeFrameView_WindowEndTime;
     public static String TimeFrameView_WindowRange;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/SpinnerGroup.java
index d08ee40fa5..8f7fce3452 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/SpinnerGroup.java
@@ -10,7 +10,7 @@
  *   Francois Chouinard - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.timeframe;
+package org.eclipse.linuxtools.internal.lttng.ui.views.timeframe;
 
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
@@ -67,9 +67,6 @@ public class SpinnerGroup {
     private int currentSeconds;
     private int currentNanosec;
     
-	@SuppressWarnings("unused")
-	private TimeFrameView fOwner;
-
     /**
      * <b><u>Constructor</u></b>
      * <p>
@@ -84,8 +81,6 @@ public class SpinnerGroup {
      */
     public SpinnerGroup(TimeFrameView owner, Composite parent, String groupName, TmfTimeRange range, ITmfTimestamp current) {
 
-    	fOwner = owner;
-
         // Create the group
         group = new Group(parent, SWT.BORDER);
         group.setText(groupName);
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/TimeFrameView.java
index eef0904328..05d6f78001 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/TimeFrameView.java
@@ -10,9 +10,9 @@
  *   Francois Chouinard - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng.ui.views.timeframe;
+package org.eclipse.linuxtools.internal.lttng.ui.views.timeframe;
 
-import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/messages.properties
index c070425c65..c070425c65 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/timeframe/messages.properties