Updated feature and bundle names
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
index 92e1e33..e4ba821 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
@@ -1,25 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.app4mc.emfutils.content.extractor.feature" label="AMALTHEA Graphical Tools" provider-name="Eclipse APP4MC" version="0.8.3">
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
- <includes id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" version="0.0.0"/>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
- <plugin download-size="0" id="net.sourceforge.plantuml" install-size="0" version="0.0.0"/>
- <plugin download-size="0" id="org.eclipse.app4mc.emfutils.content.extractor" install-size="0" unpack="false" version="0.0.0"/>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.sphinx.emf"/>
- <import plugin="org.eclipse.sphinx.emf.editors"/>
- <import plugin="org.eclipse.sphinx.emf.editors.forms"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.browser"/>
- </requires>
+<feature
+ id="org.eclipse.app4mc.emfutils.content.extractor.feature"
+ label="APP4MC EMF Graphical Tools"
+ version="0.8.3"
+ provider-name="Eclipse APP4MC">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <includes
+ id="org.eclipse.app4mc.emfutils.metamodelviewer.feature"
+ version="0.0.0"/>
+
+ <requires>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.emf.ecore"/>
+ <import plugin="org.eclipse.emf.ecore.xmi"/>
+ <import plugin="org.eclipse.sphinx.emf"/>
+ <import plugin="org.eclipse.sphinx.emf.editors"/>
+ <import plugin="org.eclipse.sphinx.emf.editors.forms"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.browser"/>
+ </requires>
+
+ <plugin
+ id="net.sourceforge.plantuml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.app4mc.emfutils.content.extractor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
index e6a90b8..624d5b5 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
@@ -1,18 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" label="AMALTHEA MetaModel Viewer" provider-name="Eclipse APP4MC" version="0.8.3">
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
- <plugin download-size="0" id="org.eclipse.app4mc.emfutils.metamodelviewer" install-size="0" unpack="false" version="0.0.0"/>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.sphinx.emf"/>
- <import plugin="org.eclipse.ui"/>
- </requires>
+<feature
+ id="org.eclipse.app4mc.emfutils.metamodelviewer.feature"
+ label="APP4MC EMF MetaModel Viewer"
+ version="0.8.3"
+ provider-name="Eclipse APP4MC">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <requires>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.sphinx.emf"/>
+ <import plugin="org.eclipse.ui"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.app4mc.emfutils.metamodelviewer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF
index 81e2803..4a9d5e8 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.metamodelviewer/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: EMF Metamodel Viewer
+Bundle-Name: APP4MC EMF Metamodel Viewer
Bundle-SymbolicName: org.eclipse.app4mc.emfutils.metamodelviewer;singleton:=true
Bundle-Version: 0.8.3
Bundle-Vendor: Eclipse APP4MC