From a6140f0197031120ab848ddb731e9a2c7a7123bf Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Wed, 24 Sep 2014 15:59:34 -0400
Subject: [PATCH] Move RCP plugins to the Trace Compass namespace

Change-Id: I99b76ca059ea50ecb341b9928f5b4e992e9004e6
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
---
 .../.project                                  |   2 +-
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../build.properties                          |   1 +
 .../feature.properties                        |   6 ++--
 .../feature.xml                               |   4 +--
 .../p2.inf                                    |   0
 .../pom.xml                                   |   9 +++---
 .../.classpath                                |   0
 .../.project                                  |   2 +-
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../about.html                                |   0
 .../about.ini                                 |   0
 .../about.properties                          |   5 +--
 .../build.properties                          |   1 +
 .../help_data.xml                             |   0
 .../icons/alt_about.gif                       | Bin
 .../icons/alt_window_16.gif                   | Bin
 .../icons/alt_window_32.gif                   | Bin
 .../plugin.properties                         |   7 ++--
 .../plugin.xml                                |   6 ++--
 .../plugin_customization.ini                  |   0
 .../pom.xml                                   |   8 ++---
 .../.empty.dtd                                |   0
 .../RCP Help Builder.launch                   |   2 +-
 .../.project                                  |   2 +-
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../README                                    |   2 +-
 .../about.html                                |   0
 .../book.css                                  |   0
 .../build.properties                          |   0
 .../build.xml                                 |   0
 .../doc/.gitignore                            |   0
 .../doc/User-Guide.mediawiki                  |   0
 .../doc/images/home.gif                       | Bin
 .../doc/images/next.gif                       | Bin
 .../doc/images/prev.gif                       | Bin
 .../plugin.properties                         |   7 ++--
 .../plugin.xml                                |   0
 .../pom.xml                                   |   6 ++--
 .../.project                                  |   2 +-
 .../about.html                                |   0
 .../epl-v10.html                              |   0
 .../license.html                              |   0
 .../pom.xml                                   |  10 +++---
 .../tracing.product                           |  30 +++++++++---------
 .../.classpath                                |   0
 .../.project                                  |   2 +-
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.settings/org.eclipse.pde.api.tools.prefs |   0
 .../.settings/org.eclipse.pde.prefs           |   0
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../about.html                                |   0
 .../build.properties                          |   1 +
 .../icons/alt_about.gif                       | Bin
 .../icons/alt_window_16.gif                   | Bin
 .../icons/alt_window_32.gif                   | Bin
 .../plugin.properties                         |  13 ++++----
 .../plugin.xml                                |   0
 .../pom.xml                                   |   8 ++---
 .../internal/tracing/rcp/ui/Application.java  |   0
 .../rcp/ui/ApplicationActionBarAdvisor.java   |   0
 .../rcp/ui/ApplicationWorkbenchAdvisor.java   |   0
 .../ui/ApplicationWorkbenchWindowAdvisor.java |   0
 .../tracing/rcp/ui/TracingRcpPlugin.java      |   0
 .../tracing/rcp/ui/cli/CliParser.java         |   0
 .../rcp/ui/cli/TracingRCPCliException.java    |   0
 .../tracing/rcp/ui/messages/Messages.java     |   0
 .../rcp/ui/messages/messages.properties       |   0
 .../.project                                  |   2 +-
 .../org.eclipse.core.resources.prefs          |   0
 .../.settings/org.eclipse.core.runtime.prefs  |   0
 .../build.properties                          |   1 +
 .../feature.properties                        |   6 ++--
 .../feature.xml                               |   8 ++---
 .../p2.inf                                    |   0
 .../pom.xml                                   |   9 +++---
 .../category.xml                              |   4 +--
 pom.xml                                       |  10 +++---
 87 files changed, 91 insertions(+), 91 deletions(-)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/.project (83%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/build.properties (99%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/feature.properties (77%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/feature.xml (83%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/p2.inf (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding.feature => org.eclipse.tracecompass.rcp.branding.feature}/pom.xml (86%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/.classpath (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/.project (91%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/META-INF/MANIFEST.MF (78%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/about.html (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/about.ini (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/about.properties (95%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/build.properties (99%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/help_data.xml (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/icons/alt_about.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/icons/alt_window_16.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/icons/alt_window_32.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.branding}/plugin.properties (77%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/plugin.xml (69%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/plugin_customization.ini (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.branding}/pom.xml (73%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/.empty.dtd (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/.externalToolBuilders/RCP Help Builder.launch (94%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/.project (94%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/META-INF/MANIFEST.MF (71%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/README (92%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/about.html (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/book.css (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/build.properties (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/build.xml (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/doc/.gitignore (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/doc/User-Guide.mediawiki (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/doc/images/home.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/doc/images/next.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/doc/images/prev.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.branding => org.eclipse.tracecompass.rcp.help}/plugin.properties (76%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/plugin.xml (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.help => org.eclipse.tracecompass.rcp.help}/pom.xml (93%)
 rename {org.eclipse.linuxtools.tracing.rcp.product => org.eclipse.tracecompass.rcp.product}/.project (75%)
 rename {org.eclipse.linuxtools.tracing.rcp.product => org.eclipse.tracecompass.rcp.product}/about.html (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.product => org.eclipse.tracecompass.rcp.product}/epl-v10.html (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.product => org.eclipse.tracecompass.rcp.product}/license.html (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.product => org.eclipse.tracecompass.rcp.product}/pom.xml (85%)
 rename {org.eclipse.linuxtools.tracing.rcp.product => org.eclipse.tracecompass.rcp.product}/tracing.product (91%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.classpath (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.project (93%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.settings/org.eclipse.pde.api.tools.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/.settings/org.eclipse.pde.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/META-INF/MANIFEST.MF (92%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/about.html (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/build.properties (99%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/icons/alt_about.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/icons/alt_window_16.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/icons/alt_window_32.gif (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/plugin.properties (83%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/plugin.xml (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/pom.xml (78%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/Application.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationActionBarAdvisor.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchAdvisor.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchWindowAdvisor.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/TracingRcpPlugin.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/TracingRCPCliException.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/Messages.java (100%)
 rename {org.eclipse.linuxtools.tracing.rcp.ui => org.eclipse.tracecompass.rcp.ui}/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/messages.properties (100%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/.project (87%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/.settings/org.eclipse.core.runtime.prefs (100%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/build.properties (99%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/feature.properties (84%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/feature.xml (90%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/p2.inf (100%)
 rename {org.eclipse.linuxtools.tracing.rcp => org.eclipse.tracecompass.rcp}/pom.xml (94%)

diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/.project b/org.eclipse.tracecompass.rcp.branding.feature/.project
similarity index 83%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/.project
rename to org.eclipse.tracecompass.rcp.branding.feature/.project
index 57a64b23cb..b30f299394 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding.feature/.project
+++ b/org.eclipse.tracecompass.rcp.branding.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tracing.rcp.branding.feature</name>
+	<name>org.eclipse.tracecompass.rcp.branding.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.tracecompass.rcp.branding.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.tracecompass.rcp.branding.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.tracecompass.rcp.branding.feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.tracecompass.rcp.branding.feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/build.properties b/org.eclipse.tracecompass.rcp.branding.feature/build.properties
similarity index 99%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/build.properties
rename to org.eclipse.tracecompass.rcp.branding.feature/build.properties
index 988d4c1b15..bc2d9af3a2 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding.feature/build.properties
+++ b/org.eclipse.tracecompass.rcp.branding.feature/build.properties
@@ -9,6 +9,7 @@
 # Contributors:
 #    Ericsson - Initial API and implementation
 ###############################################################################
+
 bin.includes = feature.xml,\
                feature.properties,\
                p2.inf
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/feature.properties b/org.eclipse.tracecompass.rcp.branding.feature/feature.properties
similarity index 77%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/feature.properties
rename to org.eclipse.tracecompass.rcp.branding.feature/feature.properties
index 8954bb0ef8..fe8382be8c 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding.feature/feature.properties
+++ b/org.eclipse.tracecompass.rcp.branding.feature/feature.properties
@@ -10,11 +10,11 @@
 #     Bernd Hufmann - Initial API and implementation
 ###############################################################################
 
-featureName=Linux Tools Trace Viewer Branding Feature
+featureName=Trace Compass RCP Branding Feature
 
-description=Feature provides the Trace Viewer branding information.
+description=Feature provides the Trace Compass RCP branding information.
 
-featureProvider=Eclipse Linux Tools
+featureProvider=Eclipse Trace Compass
 
 copyright=Copyright 2014 Ericsson
 
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/feature.xml b/org.eclipse.tracecompass.rcp.branding.feature/feature.xml
similarity index 83%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/feature.xml
rename to org.eclipse.tracecompass.rcp.branding.feature/feature.xml
index 9be21bce41..95b2dd7e92 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding.feature/feature.xml
+++ b/org.eclipse.tracecompass.rcp.branding.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.linuxtools.tracing.rcp.branding.feature"
+      id="org.eclipse.tracecompass.rcp.branding.feature"
       label="%featureName"
       version="1.1.0.qualifier"
       provider-name="%featureProvider"
@@ -24,7 +24,7 @@
    </url>
 
    <plugin
-         id="org.eclipse.linuxtools.tracing.rcp.branding"
+         id="org.eclipse.tracecompass.rcp.branding"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/p2.inf b/org.eclipse.tracecompass.rcp.branding.feature/p2.inf
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/p2.inf
rename to org.eclipse.tracecompass.rcp.branding.feature/p2.inf
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml b/org.eclipse.tracecompass.rcp.branding.feature/pom.xml
similarity index 86%
rename from org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
rename to org.eclipse.tracecompass.rcp.branding.feature/pom.xml
index ab760f3d7f..ad0bc33ce2 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
+++ b/org.eclipse.tracecompass.rcp.branding.feature/pom.xml
@@ -17,13 +17,12 @@
     <version>3.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.linuxtools.tracing.rcp.branding.feature</artifactId>
+  <artifactId>org.eclipse.tracecompass.rcp.branding.feature</artifactId>
+  <groupId>org.eclipse.tracecompass</groupId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
-  <name>Linux Tools Trace Viewer Branding Feature</name>
-
-  <groupId>org.eclipse.linuxtools.tracing.rcp.branding</groupId>
+  <name>Trace Compass RCP Branding Feature</name>
 
   <build>
     <plugins>
@@ -40,7 +39,7 @@
             </goals>
             <configuration>
               <excludes>
-                <plugin id="org.eclipse.linuxtools.tracing.rcp.branding"/>
+                <plugin id="org.eclipse.tracecompass.rcp.branding"/>
               </excludes>
             </configuration>
           </execution>
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.classpath b/org.eclipse.tracecompass.rcp.branding/.classpath
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/.classpath
rename to org.eclipse.tracecompass.rcp.branding/.classpath
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.project b/org.eclipse.tracecompass.rcp.branding/.project
similarity index 91%
rename from org.eclipse.linuxtools.tracing.rcp.branding/.project
rename to org.eclipse.tracecompass.rcp.branding/.project
index 52c2c73f55..ab4e944231 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/.project
+++ b/org.eclipse.tracecompass.rcp.branding/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tracing.rcp.branding</name>
+	<name>org.eclipse.tracecompass.rcp.branding</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.core.resources.prefs b/org.eclipse.tracecompass.rcp.branding/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.tracecompass.rcp.branding/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tracecompass.rcp.branding/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.tracecompass.rcp.branding/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.tracecompass.rcp.branding/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/.settings/org.eclipse.m2e.core.prefs
rename to org.eclipse.tracecompass.rcp.branding/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF b/org.eclipse.tracecompass.rcp.branding/META-INF/MANIFEST.MF
similarity index 78%
rename from org.eclipse.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF
rename to org.eclipse.tracecompass.rcp.branding/META-INF/MANIFEST.MF
index a0e4de5b35..9b129d71fa 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/META-INF/MANIFEST.MF
+++ b/org.eclipse.tracecompass.rcp.branding/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.linuxtools.tracing.rcp.branding;singleton:=true
+Bundle-SymbolicName: org.eclipse.tracecompass.rcp.branding;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Eclipse-BundleShape: dir
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/about.html b/org.eclipse.tracecompass.rcp.branding/about.html
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/about.html
rename to org.eclipse.tracecompass.rcp.branding/about.html
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/about.ini b/org.eclipse.tracecompass.rcp.branding/about.ini
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/about.ini
rename to org.eclipse.tracecompass.rcp.branding/about.ini
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/about.properties b/org.eclipse.tracecompass.rcp.branding/about.properties
similarity index 95%
rename from org.eclipse.linuxtools.tracing.rcp.branding/about.properties
rename to org.eclipse.tracecompass.rcp.branding/about.properties
index 16366197d4..b51d5a7b12 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/about.properties
+++ b/org.eclipse.tracecompass.rcp.branding/about.properties
@@ -8,13 +8,14 @@
 # Contributors:
 #     Bernd Hufmann - initial API and implementation
 ###############################################################################
+
 # about.properties
 # contains externalized strings for about.ini
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # fill-ins are supplied by about.mappings
 # This file should be translated.
 
-blurb=Linux Tools Trace Viewer\n\
+blurb=Trace Compass\n\
 \n\
 Version: {featureVersion}\n\
 \n\
@@ -25,4 +26,4 @@ made available under the terms of the Eclipse Public License v1.0 which\n\
 accompanies this distribution, and is available at\n\
 http://www.eclipse.org/legal/epl-v10.html\n\
 
-#Build id: {0}\n\
\ No newline at end of file
+#Build id: {0}\n\
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/build.properties b/org.eclipse.tracecompass.rcp.branding/build.properties
similarity index 99%
rename from org.eclipse.linuxtools.tracing.rcp.branding/build.properties
rename to org.eclipse.tracecompass.rcp.branding/build.properties
index 29f7777446..7544f05a19 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/build.properties
+++ b/org.eclipse.tracecompass.rcp.branding/build.properties
@@ -9,6 +9,7 @@
 # Contributors:
 #    Ericsson - Initial API and implementation
 ###############################################################################
+
 bin.includes = .,\
                plugin.xml,\
                META-INF/,\
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/help_data.xml b/org.eclipse.tracecompass.rcp.branding/help_data.xml
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/help_data.xml
rename to org.eclipse.tracecompass.rcp.branding/help_data.xml
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_about.gif b/org.eclipse.tracecompass.rcp.branding/icons/alt_about.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_about.gif
rename to org.eclipse.tracecompass.rcp.branding/icons/alt_about.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_window_16.gif b/org.eclipse.tracecompass.rcp.branding/icons/alt_window_16.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_window_16.gif
rename to org.eclipse.tracecompass.rcp.branding/icons/alt_window_16.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_window_32.gif b/org.eclipse.tracecompass.rcp.branding/icons/alt_window_32.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_window_32.gif
rename to org.eclipse.tracecompass.rcp.branding/icons/alt_window_32.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/plugin.properties b/org.eclipse.tracecompass.rcp.branding/plugin.properties
similarity index 77%
rename from org.eclipse.linuxtools.tracing.rcp.help/plugin.properties
rename to org.eclipse.tracecompass.rcp.branding/plugin.properties
index 252d9b3171..bc397afbab 100644
--- a/org.eclipse.linuxtools.tracing.rcp.help/plugin.properties
+++ b/org.eclipse.tracecompass.rcp.branding/plugin.properties
@@ -10,6 +10,7 @@
 #     Bernd Hufmann - Initial API and implementation
 ###############################################################################
 
-#Properties file for org.eclipse.linuxtools.lttng.help
-Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = Linux Tools Trace Viewer Help Plug-in
+Bundle-Vendor = Eclipse Trace Compass
+Bundle-Name = Trace Compass RCP Branding Plug-in
+
+
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/plugin.xml b/org.eclipse.tracecompass.rcp.branding/plugin.xml
similarity index 69%
rename from org.eclipse.linuxtools.tracing.rcp.branding/plugin.xml
rename to org.eclipse.tracecompass.rcp.branding/plugin.xml
index f08574f582..3a2fd322a9 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/plugin.xml
+++ b/org.eclipse.tracecompass.rcp.branding/plugin.xml
@@ -6,10 +6,10 @@
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.linuxtools.tracing.rcp.ui.application"
-            name="Trace Viewer">
+            name="Trace Compass">
             <property
                   name="appName"
-                  value="Trace Viewer">
+                  value="Trace Compass">
             </property>
             <property
                   name="cssTheme"
@@ -25,7 +25,7 @@
             </property>
             <property
                   name="aboutText"
-                  value="Linux Tools Trace Viewer&#x0A;&#x0A;Version: 1.1.0&#x0A;&#x0A;Copyright (c) 2014 Ericsson&#x0A;&#x0A;All rights reserved. This program and the accompanying materials are&#x0A;made available under the terms of the Eclipse Public License v1.0 which&#x0A;accompanies this distribution, and is available at&#x0A;http://www.eclipse.org/legal/epl-v10.html">
+                  value="Trace Compass&#x0A;&#x0A;Version: 1.1.0&#x0A;&#x0A;Copyright (c) 2014 Ericsson&#x0A;&#x0A;All rights reserved. This program and the accompanying materials are&#x0A;made available under the terms of the Eclipse Public License v1.0 which&#x0A;accompanies this distribution, and is available at&#x0A;http://www.eclipse.org/legal/epl-v10.html">
             </property>
             <property
                   name="windowImages"
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/plugin_customization.ini b/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.branding/plugin_customization.ini
rename to org.eclipse.tracecompass.rcp.branding/plugin_customization.ini
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml b/org.eclipse.tracecompass.rcp.branding/pom.xml
similarity index 73%
rename from org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
rename to org.eclipse.tracecompass.rcp.branding/pom.xml
index 38f6e34b4f..5529cb8710 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
+++ b/org.eclipse.tracecompass.rcp.branding/pom.xml
@@ -3,16 +3,16 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <artifactId>org.eclipse.tracecompass.rcp.branding</artifactId>
+  <groupId>org.eclipse.tracecompass</groupId>
   <version>1.1.0-SNAPSHOT</version>
-  <artifactId>org.eclipse.linuxtools.tracing.rcp.branding</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <name>Linux Tools Trace Viewer Branding plug-in</name>
 
-  <groupId>org.eclipse.linuxtools.tracing.rcp.branding</groupId>
+  <name>Trace Compass RCP Branding plug-in</name>
 
   <parent>
-    <groupId>org.eclipse.tracecompass</groupId>
     <artifactId>org.eclipse.tracecompass</artifactId>
+    <groupId>org.eclipse.tracecompass</groupId>
     <version>3.2.0-SNAPSHOT</version>
   </parent>
 
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/.empty.dtd b/org.eclipse.tracecompass.rcp.help/.empty.dtd
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/.empty.dtd
rename to org.eclipse.tracecompass.rcp.help/.empty.dtd
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/.externalToolBuilders/RCP Help Builder.launch b/org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch
similarity index 94%
rename from org.eclipse.linuxtools.tracing.rcp.help/.externalToolBuilders/RCP Help Builder.launch
rename to org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch
index 58338d6555..516ed78f5f 100644
--- a/org.eclipse.linuxtools.tracing.rcp.help/.externalToolBuilders/RCP Help Builder.launch	
+++ b/org.eclipse.tracecompass.rcp.help/.externalToolBuilders/RCP Help Builder.launch	
@@ -11,7 +11,7 @@
 <mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
 <mapEntry key="eclipse.home" value="${eclipse_home}"/>
 </mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.linuxtools.tracing.rcp.help/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tracecompass.rcp.help/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/.project b/org.eclipse.tracecompass.rcp.help/.project
similarity index 94%
rename from org.eclipse.linuxtools.tracing.rcp.help/.project
rename to org.eclipse.tracecompass.rcp.help/.project
index 420a0cc602..57c51b5b98 100644
--- a/org.eclipse.linuxtools.tracing.rcp.help/.project
+++ b/org.eclipse.tracecompass.rcp.help/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tracing.rcp.help</name>
+	<name>org.eclipse.tracecompass.rcp.help</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/.settings/org.eclipse.core.resources.prefs b/org.eclipse.tracecompass.rcp.help/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.tracecompass.rcp.help/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.tracecompass.rcp.help/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.tracecompass.rcp.help/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/META-INF/MANIFEST.MF b/org.eclipse.tracecompass.rcp.help/META-INF/MANIFEST.MF
similarity index 71%
rename from org.eclipse.linuxtools.tracing.rcp.help/META-INF/MANIFEST.MF
rename to org.eclipse.tracecompass.rcp.help/META-INF/MANIFEST.MF
index fd9053a3f9..fff7ef2566 100644
--- a/org.eclipse.linuxtools.tracing.rcp.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.tracecompass.rcp.help/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.linuxtools.tracing.rcp.help;singleton:=true
+Bundle-SymbolicName: org.eclipse.tracecompass.rcp.help;singleton:=true
 Require-Bundle: org.eclipse.help
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/README b/org.eclipse.tracecompass.rcp.help/README
similarity index 92%
rename from org.eclipse.linuxtools.tracing.rcp.help/README
rename to org.eclipse.tracecompass.rcp.help/README
index 1729158783..75f8527693 100644
--- a/org.eclipse.linuxtools.tracing.rcp.help/README
+++ b/org.eclipse.tracecompass.rcp.help/README
@@ -1,4 +1,4 @@
-This describes how to build the documentation found in the o.e.l.tracing.rcp.help
+This describes how to build the documentation found in the o.e.t.tracing.rcp.help
 plugin.
 
 
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/about.html b/org.eclipse.tracecompass.rcp.help/about.html
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/about.html
rename to org.eclipse.tracecompass.rcp.help/about.html
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/book.css b/org.eclipse.tracecompass.rcp.help/book.css
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/book.css
rename to org.eclipse.tracecompass.rcp.help/book.css
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/build.properties b/org.eclipse.tracecompass.rcp.help/build.properties
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/build.properties
rename to org.eclipse.tracecompass.rcp.help/build.properties
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/build.xml b/org.eclipse.tracecompass.rcp.help/build.xml
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/build.xml
rename to org.eclipse.tracecompass.rcp.help/build.xml
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/doc/.gitignore b/org.eclipse.tracecompass.rcp.help/doc/.gitignore
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/doc/.gitignore
rename to org.eclipse.tracecompass.rcp.help/doc/.gitignore
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/doc/User-Guide.mediawiki b/org.eclipse.tracecompass.rcp.help/doc/User-Guide.mediawiki
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/doc/User-Guide.mediawiki
rename to org.eclipse.tracecompass.rcp.help/doc/User-Guide.mediawiki
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/doc/images/home.gif b/org.eclipse.tracecompass.rcp.help/doc/images/home.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/doc/images/home.gif
rename to org.eclipse.tracecompass.rcp.help/doc/images/home.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/doc/images/next.gif b/org.eclipse.tracecompass.rcp.help/doc/images/next.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/doc/images/next.gif
rename to org.eclipse.tracecompass.rcp.help/doc/images/next.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/doc/images/prev.gif b/org.eclipse.tracecompass.rcp.help/doc/images/prev.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/doc/images/prev.gif
rename to org.eclipse.tracecompass.rcp.help/doc/images/prev.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.branding/plugin.properties b/org.eclipse.tracecompass.rcp.help/plugin.properties
similarity index 76%
rename from org.eclipse.linuxtools.tracing.rcp.branding/plugin.properties
rename to org.eclipse.tracecompass.rcp.help/plugin.properties
index 5ee0ff7702..e9fdc23af1 100644
--- a/org.eclipse.linuxtools.tracing.rcp.branding/plugin.properties
+++ b/org.eclipse.tracecompass.rcp.help/plugin.properties
@@ -10,8 +10,5 @@
 #     Bernd Hufmann - Initial API and implementation
 ###############################################################################
 
-#Properties file for org.eclipse.linuxtools.tracing.rcp.branding
-Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = Linux Tools Trace Viewer Branding Plug-in
-
-
+Bundle-Vendor = Eclipse Trace Compass
+Bundle-Name = Trace Compass RCP Help Plug-in
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/plugin.xml b/org.eclipse.tracecompass.rcp.help/plugin.xml
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.help/plugin.xml
rename to org.eclipse.tracecompass.rcp.help/plugin.xml
diff --git a/org.eclipse.linuxtools.tracing.rcp.help/pom.xml b/org.eclipse.tracecompass.rcp.help/pom.xml
similarity index 93%
rename from org.eclipse.linuxtools.tracing.rcp.help/pom.xml
rename to org.eclipse.tracecompass.rcp.help/pom.xml
index 6c23364fc5..9876334f62 100644
--- a/org.eclipse.linuxtools.tracing.rcp.help/pom.xml
+++ b/org.eclipse.tracecompass.rcp.help/pom.xml
@@ -17,11 +17,11 @@
     <version>3.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.linuxtools.tracing.rcp.help</artifactId>
+  <artifactId>org.eclipse.tracecompass.rcp.help</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools Trace Viewer Help Plug-in</name>
+  <name>Trace Compass RCP Help Plug-in</name>
 
   <build>
     <plugins>
@@ -82,5 +82,5 @@
     </plugins>
   </build>
 
-  <groupId>org.eclipse.linuxtools.tracing.rcp</groupId>
+  <groupId>org.eclipse.tracecompass</groupId>
 </project>
diff --git a/org.eclipse.linuxtools.tracing.rcp.product/.project b/org.eclipse.tracecompass.rcp.product/.project
similarity index 75%
rename from org.eclipse.linuxtools.tracing.rcp.product/.project
rename to org.eclipse.tracecompass.rcp.product/.project
index e709a5114f..a82a3b9400 100644
--- a/org.eclipse.linuxtools.tracing.rcp.product/.project
+++ b/org.eclipse.tracecompass.rcp.product/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tracing.rcp.product</name>
+	<name>org.eclipse.tracecompass.rcp.product</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tracing.rcp.product/about.html b/org.eclipse.tracecompass.rcp.product/about.html
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.product/about.html
rename to org.eclipse.tracecompass.rcp.product/about.html
diff --git a/org.eclipse.linuxtools.tracing.rcp.product/epl-v10.html b/org.eclipse.tracecompass.rcp.product/epl-v10.html
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.product/epl-v10.html
rename to org.eclipse.tracecompass.rcp.product/epl-v10.html
diff --git a/org.eclipse.linuxtools.tracing.rcp.product/license.html b/org.eclipse.tracecompass.rcp.product/license.html
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.product/license.html
rename to org.eclipse.tracecompass.rcp.product/license.html
diff --git a/org.eclipse.linuxtools.tracing.rcp.product/pom.xml b/org.eclipse.tracecompass.rcp.product/pom.xml
similarity index 85%
rename from org.eclipse.linuxtools.tracing.rcp.product/pom.xml
rename to org.eclipse.tracecompass.rcp.product/pom.xml
index ff4024b0ea..85e5a4bcd5 100644
--- a/org.eclipse.linuxtools.tracing.rcp.product/pom.xml
+++ b/org.eclipse.tracecompass.rcp.product/pom.xml
@@ -7,7 +7,7 @@
     <version>1.1.0</version>
     <artifactId>tracing</artifactId>
     <packaging>eclipse-repository</packaging>
-    <name>Linux Tools Trace Viewer Product</name>
+    <name>Trace Compass RCP Product</name>
 
     <parent>
       <artifactId>org.eclipse.tracecompass</artifactId>
@@ -16,7 +16,7 @@
     </parent>
 
     <properties>
-        <productId>org.eclipse.linuxtools.tracing.rcp</productId>
+        <productId>org.eclipse.tracecompass.rcp</productId>
         <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
     </properties>
 
@@ -51,14 +51,14 @@
                 <configuration>
                     <products>
                         <product>
-                            <archiveFileName>linuxtools-trace-viewer-${project.version}-${build.timestamp}</archiveFileName>
+                            <archiveFileName>trace-compass-${project.version}-${build.timestamp}</archiveFileName>
                             <id>${productId}</id>
-                            <rootFolder>linuxtools-trace-viewer</rootFolder>
+                            <rootFolder>trace-compass</rootFolder>
                         </product>
                     </products>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    <groupId>org.eclipse.linuxtools.tracing.rcp</groupId>
+    <groupId>org.eclipse.tracecompass</groupId>
 </project>
diff --git a/org.eclipse.linuxtools.tracing.rcp.product/tracing.product b/org.eclipse.tracecompass.rcp.product/tracing.product
similarity index 91%
rename from org.eclipse.linuxtools.tracing.rcp.product/tracing.product
rename to org.eclipse.tracecompass.rcp.product/tracing.product
index ab26e97844..e4d33ad07a 100644
--- a/org.eclipse.linuxtools.tracing.rcp.product/tracing.product
+++ b/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Trace Viewer" uid="org.eclipse.linuxtools.tracing.rcp" id="org.eclipse.linuxtools.tracing.rcp.branding.product" application="org.eclipse.linuxtools.tracing.rcp.ui.application" version="1.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="1.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
-      <image path="/org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_about.gif"/>
+      <image path="/org.eclipse.tracecompass.tracing.rcp.branding/icons/alt_about.gif"/>
       <text>
-         Linux Tools Trace Viewer
+         Trace Compass
 
 Version: 1.1.0
 
@@ -37,9 +37,9 @@ http://www.eclipse.org/legal/epl-v10.html
       </vmArgsWin>
    </launcherArgs>
 
-   <windowImages i16="/org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_window_16.gif" i32="/org.eclipse.linuxtools.tracing.rcp.branding/icons/alt_window_32.gif"/>
+   <windowImages i16="/org.eclipse.tracecompass.rcp.branding/icons/alt_window_16.gif" i32="/org.eclipse.tracecompass.rcp.branding/icons/alt_window_32.gif"/>
 
-   <launcher name="traceViewer">
+   <launcher name="tracecompass">
       <solaris/>
       <win useIco="false">
          <bmp/>
@@ -186,11 +186,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    </plugins>
 
    <features>
-      <feature id="org.eclipse.linuxtools.tracing.rcp.branding.feature"/>
-      <feature id="org.eclipse.linuxtools.tracing.rcp"/>
-      <feature id="org.eclipse.linuxtools.lttng2.kernel"/>
-      <feature id="org.eclipse.linuxtools.lttng2.ust"/>
-      <feature id="org.eclipse.linuxtools.lttng2.control"/>
+      <feature id="org.eclipse.tracecompass.rcp.branding.feature"/>
+      <feature id="org.eclipse.tracecompass.rcp"/>
+      <feature id="org.eclipse.tracecompass.lttng2.kernel"/>
+      <feature id="org.eclipse.tracecompass.lttng2.ust"/>
+      <feature id="org.eclipse.tracecompass.lttng2.control"/>
       <feature id="org.eclipse.equinox.p2.core.feature"/>
       <feature id="org.eclipse.rse.local"/>
       <feature id="org.eclipse.rse.dstore"/>
@@ -201,7 +201,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.emf.ecore"/>
       <feature id="org.eclipse.equinox.p2.rcp.feature"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.linuxtools.tmf"/>
+      <feature id="org.eclipse.tracecompass.tmf"/>
       <feature id="org.eclipse.rse.ssh"/>
       <feature id="org.eclipse.rse.core"/>
       <feature id="org.eclipse.rse.ftp"/>
@@ -211,9 +211,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.emf.common"/>
       <feature id="org.eclipse.rse.terminals"/>
       <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.linuxtools.ctf"/>
-      <feature id="org.eclipse.linuxtools.tmf.ctf"/>
-      <feature id="org.eclipse.linuxtools.tmf.pcap"/>
+      <feature id="org.eclipse.tracecompass.ctf"/>
+      <feature id="org.eclipse.tracecompass.tmf.ctf"/>
+      <feature id="org.eclipse.tracecompass.tmf.pcap"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
       <feature id="org.eclipse.ecf.core.ssl.feature"/>
@@ -227,7 +227,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.linuxtools.tracing.rcp.ui" autoStart="false" startLevel="5" />
+      <plugin id="org.eclipse.tracecompass.rcp.ui" autoStart="false" startLevel="5" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
    </configurations>
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.classpath b/org.eclipse.tracecompass.rcp.ui/.classpath
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.classpath
rename to org.eclipse.tracecompass.rcp.ui/.classpath
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.project b/org.eclipse.tracecompass.rcp.ui/.project
similarity index 93%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.project
rename to org.eclipse.tracecompass.rcp.ui/.project
index 7e5c96048a..8506cbb677 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/.project
+++ b/org.eclipse.tracecompass.rcp.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tracing.rcp.ui</name>
+	<name>org.eclipse.tracecompass.rcp.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.jdt.ui.prefs
rename to org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/.settings/org.eclipse.pde.prefs
rename to org.eclipse.tracecompass.rcp.ui/.settings/org.eclipse.pde.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF b/org.eclipse.tracecompass.rcp.ui/META-INF/MANIFEST.MF
similarity index 92%
rename from org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF
rename to org.eclipse.tracecompass.rcp.ui/META-INF/MANIFEST.MF
index c2279aef5f..8b01efc4c3 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.tracecompass.rcp.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.linuxtools.tracing.rcp.ui;singleton:=true
+Bundle-SymbolicName: org.eclipse.tracecompass.rcp.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tracing.rcp.ui.TracingRcpPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/about.html b/org.eclipse.tracecompass.rcp.ui/about.html
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/about.html
rename to org.eclipse.tracecompass.rcp.ui/about.html
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/build.properties b/org.eclipse.tracecompass.rcp.ui/build.properties
similarity index 99%
rename from org.eclipse.linuxtools.tracing.rcp.ui/build.properties
rename to org.eclipse.tracecompass.rcp.ui/build.properties
index 6e6ad65119..caf7d4dbe6 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/build.properties
+++ b/org.eclipse.tracecompass.rcp.ui/build.properties
@@ -9,6 +9,7 @@
 # Contributors:
 #    Ericsson - Initial API and implementation
 ###############################################################################
+
 source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/icons/alt_about.gif b/org.eclipse.tracecompass.rcp.ui/icons/alt_about.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/icons/alt_about.gif
rename to org.eclipse.tracecompass.rcp.ui/icons/alt_about.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/icons/alt_window_16.gif b/org.eclipse.tracecompass.rcp.ui/icons/alt_window_16.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/icons/alt_window_16.gif
rename to org.eclipse.tracecompass.rcp.ui/icons/alt_window_16.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/icons/alt_window_32.gif b/org.eclipse.tracecompass.rcp.ui/icons/alt_window_32.gif
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/icons/alt_window_32.gif
rename to org.eclipse.tracecompass.rcp.ui/icons/alt_window_32.gif
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties b/org.eclipse.tracecompass.rcp.ui/plugin.properties
similarity index 83%
rename from org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties
rename to org.eclipse.tracecompass.rcp.ui/plugin.properties
index 592e8a5a4c..3bb4d8861c 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties
+++ b/org.eclipse.tracecompass.rcp.ui/plugin.properties
@@ -10,16 +10,15 @@
 #     Bernd Hufmann - Initial API and implementation
 ###############################################################################
 
-#Properties file for org.eclipse.linuxtools.tracing.rcp.ui
-Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = Linux Tools Trace Viewer UI Plug-in
+Bundle-Vendor = Eclipse Trace Compass
+Bundle-Name = Trace Compass RCP UI Plug-in
 
 menu.main.file = File
 menu.main.window = Window
 menu.main.help = Help
-product.name = Linux Tools Trace Viewer
-activity.description = Linux Tools Tracing RCP
-activity.name = Linux Tools Tracing RCP
+product.name = Trace Compass
+activity.description = Trace Compass RCP
+activity.name = Trace Compass RCP
 activity.description.javaPerspective = (Unwanted) Java Perspective
 activity.name.javaPerspective = Unwanted Java Perspective
 activity.description.teamPerspective = (Unwanted) Team Perspective
@@ -36,4 +35,4 @@ command.OpenFile.label = Open Trace...
 command.import = Import...
 menu.mnemonic = F
 menu.label = Open
-menu.mnemonic.0 = H
\ No newline at end of file
+menu.mnemonic.0 = H
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.xml b/org.eclipse.tracecompass.rcp.ui/plugin.xml
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/plugin.xml
rename to org.eclipse.tracecompass.rcp.ui/plugin.xml
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/pom.xml b/org.eclipse.tracecompass.rcp.ui/pom.xml
similarity index 78%
rename from org.eclipse.linuxtools.tracing.rcp.ui/pom.xml
rename to org.eclipse.tracecompass.rcp.ui/pom.xml
index e802528ff1..20026d1874 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/pom.xml
+++ b/org.eclipse.tracecompass.rcp.ui/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <version>1.1.0-SNAPSHOT</version>
-    <artifactId>org.eclipse.linuxtools.tracing.rcp.ui</artifactId>
-    <groupId>org.eclipse.linuxtools.tracing.rcp</groupId>
+    <artifactId>org.eclipse.tracecompass.rcp.ui</artifactId>
+    <groupId>org.eclipse.tracecompass</groupId>
 
-    <name>Linux Tools Trace Viewer UI Plug-in</name>
+    <name>Trace Compass RCP UI Plug-in</name>
 
     <parent>
       <artifactId>org.eclipse.tracecompass</artifactId>
@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <productId>org.eclipse.linuxtools.tracing.rcp.ui.product</productId>
+        <productId>org.eclipse.tracecompass.rcp.ui.product</productId>
     </properties>
 
  <build>
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/Application.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/Application.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/Application.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/Application.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationActionBarAdvisor.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationActionBarAdvisor.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationActionBarAdvisor.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationActionBarAdvisor.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchAdvisor.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchAdvisor.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchAdvisor.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchAdvisor.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchWindowAdvisor.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchWindowAdvisor.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchWindowAdvisor.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/ApplicationWorkbenchWindowAdvisor.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/TracingRcpPlugin.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/TracingRcpPlugin.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/TracingRcpPlugin.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/TracingRcpPlugin.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/CliParser.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/TracingRCPCliException.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/TracingRCPCliException.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/TracingRCPCliException.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/cli/TracingRCPCliException.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/Messages.java b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/Messages.java
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/Messages.java
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/Messages.java
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/messages.properties b/org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/messages.properties
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/messages.properties
rename to org.eclipse.tracecompass.rcp.ui/src/org/eclipse/linuxtools/internal/tracing/rcp/ui/messages/messages.properties
diff --git a/org.eclipse.linuxtools.tracing.rcp/.project b/org.eclipse.tracecompass.rcp/.project
similarity index 87%
rename from org.eclipse.linuxtools.tracing.rcp/.project
rename to org.eclipse.tracecompass.rcp/.project
index 97b38e425c..57e381b4e3 100644
--- a/org.eclipse.linuxtools.tracing.rcp/.project
+++ b/org.eclipse.tracecompass.rcp/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tracing.rcp</name>
+	<name>org.eclipse.tracecompass.rcp</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tracing.rcp/.settings/org.eclipse.core.resources.prefs b/org.eclipse.tracecompass.rcp/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.tracecompass.rcp/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.tracecompass.rcp/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.tracecompass.rcp/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.linuxtools.tracing.rcp/build.properties b/org.eclipse.tracecompass.rcp/build.properties
similarity index 99%
rename from org.eclipse.linuxtools.tracing.rcp/build.properties
rename to org.eclipse.tracecompass.rcp/build.properties
index 988d4c1b15..bc2d9af3a2 100644
--- a/org.eclipse.linuxtools.tracing.rcp/build.properties
+++ b/org.eclipse.tracecompass.rcp/build.properties
@@ -9,6 +9,7 @@
 # Contributors:
 #    Ericsson - Initial API and implementation
 ###############################################################################
+
 bin.includes = feature.xml,\
                feature.properties,\
                p2.inf
diff --git a/org.eclipse.linuxtools.tracing.rcp/feature.properties b/org.eclipse.tracecompass.rcp/feature.properties
similarity index 84%
rename from org.eclipse.linuxtools.tracing.rcp/feature.properties
rename to org.eclipse.tracecompass.rcp/feature.properties
index 0e59de1a29..ac4a877871 100644
--- a/org.eclipse.linuxtools.tracing.rcp/feature.properties
+++ b/org.eclipse.tracecompass.rcp/feature.properties
@@ -10,11 +10,11 @@
 #     Bernd Hufmann - Initial API and implementation
 ###############################################################################
 
-featureName=Linux Tools Trace Viewer Feature
+featureName=Trace Compass Trace Viewer Feature
 
-description=Feature aggregating the plug-in dependencies for the Trace Viewer application.
+description=Feature aggregating the plug-in dependencies for the Trace Compass application.
 
-featureProvider=Eclipse Linux Tools
+featureProvider=Eclipse Trace Compass
 
 copyright=Copyright 2014 Ericsson
 
diff --git a/org.eclipse.linuxtools.tracing.rcp/feature.xml b/org.eclipse.tracecompass.rcp/feature.xml
similarity index 90%
rename from org.eclipse.linuxtools.tracing.rcp/feature.xml
rename to org.eclipse.tracecompass.rcp/feature.xml
index ecab6335c5..c8d8b5e5aa 100644
--- a/org.eclipse.linuxtools.tracing.rcp/feature.xml
+++ b/org.eclipse.tracecompass.rcp/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.linuxtools.tracing.rcp"
+      id="org.eclipse.tracecompass.rcp"
       label="%featureName"
       version="1.1.0.qualifier"
       provider-name="%featureProvider"
-      plugin="org.eclipse.linuxtools.tracing.rcp.branding"
+      plugin="org.eclipse.tracecompass.rcp.branding"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
@@ -41,14 +41,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.linuxtools.tracing.rcp.ui"
+         id="org.eclipse.tracecompass.rcp.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.linuxtools.tracing.rcp.help"
+         id="org.eclipse.tracecompass.rcp.help"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.linuxtools.tracing.rcp/p2.inf b/org.eclipse.tracecompass.rcp/p2.inf
similarity index 100%
rename from org.eclipse.linuxtools.tracing.rcp/p2.inf
rename to org.eclipse.tracecompass.rcp/p2.inf
diff --git a/org.eclipse.linuxtools.tracing.rcp/pom.xml b/org.eclipse.tracecompass.rcp/pom.xml
similarity index 94%
rename from org.eclipse.linuxtools.tracing.rcp/pom.xml
rename to org.eclipse.tracecompass.rcp/pom.xml
index 4a5eed2ca8..6ee5dd132f 100644
--- a/org.eclipse.linuxtools.tracing.rcp/pom.xml
+++ b/org.eclipse.tracecompass.rcp/pom.xml
@@ -17,13 +17,12 @@
     <version>3.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.linuxtools.tracing.rcp</artifactId>
+  <artifactId>org.eclipse.tracecompass.rcp</artifactId>
   <version>1.1.0-SNAPSHOT</version>
+  <groupId>org.eclipse.tracecompass</groupId>
   <packaging>eclipse-feature</packaging>
 
-  <name>Linux Tools Trace Viewer Feature</name>
-
-  <groupId>org.eclipse.linuxtools.tracing.rcp</groupId>
+  <name>Trace Compass RCP Feature</name>
 
   <build>
     <plugins>
@@ -67,7 +66,7 @@
                 <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
                 <plugin id="org.eclipse.core.net.win32.x86"/>
                 <plugin id="org.eclipse.core.net.linux.x86"/>
-                <plugin id="org.eclipse.linuxtools.tracing.rcp.help"/>
+                <plugin id="org.eclipse.tracecompass.tracing.rcp.help"/>
                 <plugin id="org.sat4j.core"/>
                 <plugin id="org.sat4j.pb"/>
                 <plugin id="org.swtchart"/>
diff --git a/org.eclipse.tracecompass.releng-site/category.xml b/org.eclipse.tracecompass.releng-site/category.xml
index 9fdf635b52..29f1753517 100644
--- a/org.eclipse.tracecompass.releng-site/category.xml
+++ b/org.eclipse.tracecompass.releng-site/category.xml
@@ -15,10 +15,10 @@
    <feature url="features/org.eclipse.tracecompass.tmf.pcap_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.tmf.pcap" version="0.0.0">
       <category name="Trace Compass"/>
    </feature>
-   <feature url="features/org.eclipse.linuxtools.tracing.rcp_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp" version="0.0.0">
+   <feature url="features/org.eclipse.tracecompass.rcp_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.rcp" version="0.0.0">
       <category name="Trace Compass RCP"/>
    </feature>
-   <feature url="features/org.eclipse.linuxtools.tracing.rcp.branding.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.branding.feature" version="0.0.0">
+   <feature url="features/org.eclipse.tracecompass.rcp.branding.feature_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.rcp.branding.feature" version="0.0.0">
       <category name="Trace Compass RCP"/>
    </feature>
    <feature url="features/org.eclipse.linuxtools.lttng.testing_1.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.testing" version="1.0.0.qualifier">
diff --git a/pom.xml b/pom.xml
index b558c65a79..58f64d82e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,11 +171,11 @@
     <module>org.eclipse.tracecompass.gdbtrace.ui.tests</module>
     <module>org.eclipse.tracecompass.gdbtrace.help</module>
 
-    <module>org.eclipse.linuxtools.tracing.rcp.branding</module>
-    <module>org.eclipse.linuxtools.tracing.rcp.branding.feature</module>
-    <module>org.eclipse.linuxtools.tracing.rcp</module>
-    <module>org.eclipse.linuxtools.tracing.rcp.help</module>
-    <module>org.eclipse.linuxtools.tracing.rcp.ui</module>
+    <module>org.eclipse.tracecompass.rcp.branding</module>
+    <module>org.eclipse.tracecompass.rcp.branding.feature</module>
+    <module>org.eclipse.tracecompass.rcp</module>
+    <module>org.eclipse.tracecompass.rcp.help</module>
+    <module>org.eclipse.tracecompass.rcp.ui</module>
 
     <module>org.eclipse.linuxtools.tracing.examples</module>
   </modules>
-- 
2.34.1