diff --git a/README.md b/README.md
index 5f6972d2..8f90d687 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,15 @@
-**This is a ad-free fork of the Eclipse Decompiler Plugin. It is still under development**
+# Enhanced Class Decompiler
+Enhanced Class Decompiler integrates **JD**, **Jad**, **FernFlower**, **CFR**, **Procyon** seamlessly with Eclipse and allows Java developers to **debug class files without source code directly**. It also integrates with the eclipse class editor, m2e plugin, supports **Javadoc**,  **reference search**, **library source attaching**, **byte code view** and the syntax of JDK8 **lambda** expression.
 
-# Eclipse Class Decompiler
-Eclipse Class Decompiler integrates **JD**, **Jad**, **FernFlower**, **CFR**, **Procyon** seamlessly with Eclipse and allows Java developers to **debug class files without source code directly**. It also integrates with the eclipse class editor, m2e plugin, supports **Javadoc**,  **reference search**, **library source attaching**, **byte code view** and the syntax of JDK8 **lambda** expression.
+<p align="center"><img src="https://pbi-qfs.github.io/ecd/doc//o_debug_class.png"></p>
 
-<p align="center"><img src="http://www.cpupk.com/decompiler/images/o_debug_class.png"></p>
-
-*Currently, there is no update site for this project available, yet.*
+*Remark: Currently, there is no update site for this project available, yet.*
 
 ## Description
-Eclipse Class Decompiler is a plug-in for the Eclipse platform. It integrates JD, Jad, FernFlower, CFR, Procyon seamlessly with Eclipse, allows you to display all the Java sources during your debugging process, even if you do not have them all, and you can debug these class files without source code directly.
+Enhanced Class Decompiler is a plug-in for the Eclipse platform. It integrates JD, Jad, FernFlower, CFR, Procyon seamlessly with Eclipse, allows you to display all the Java sources during your debugging process, even if you do not have them all, and you can debug these class files without source code directly.
+
+## Why is this plug-In "enhanced"?
+This is a ad-free fork of the Eclipse Decompiler Plugin. So it is enhanced by removing all code which might compromise your privacy or security (to the best of our knowledge).
 
 ## How to build from source?
 
@@ -23,12 +24,13 @@ If you want to test the latest features of this plugin, you have to build it fro
 7. Copy the jar files generated in the _build/features_ and _build/plugins_ folder of the project into the correspondent folders of your normal Eclipse installation.
 
 
-## How to install Eclipse Class Decompiler ?
+## How to install Enhanced Class Decompiler ?
+**This option is currently not available, [we're working on it](https://github.com/pbi-qfs/ecd/issues/2).**
   1. Launch _Eclipse_,
   2. Click on _"Help > Install New Software..."_,
   3. Click on button _"Add..."_ to add an new repository,
-  4. Enter name as _"Eclipse Class Decompiler Update Site"_ and enter location as _"//TODO//"_, then click on button _"OK"_,
-  5. Check _"Eclipse Class Decompiler"_,
+  4. Enter name as _"Enhanced Class Decompiler Update Site"_ and enter location as _"//TODO//"_, then click on button _"OK"_,
+  5. Check _"Enhanced Class Decompiler"_,
   6. Next, next, next... and restart.
 
 ## How to check the file associations ?
@@ -36,12 +38,12 @@ If you want to test the latest features of this plugin, you have to build it fro
   2. _"*.class"_ : _"Class Decompiler Viewer"_ is selected by default.
   3. _"*.class without source"_ : _"Class Decompiler Viewer"_ is selected by default.
 
-## How to configure Eclipse Class Decompiler ?
+## How to configure Enhanced Class Decompiler ?
   1. Click on _"Window > Preferences > Java > Decompiler"_
 
-## How to uninstall Eclipse Class Decompiler ?
+## How to uninstall Enhanced Class Decompiler ?
   1. Click on _"Help > About Eclipse > Installation Details > Installation Software"_,
-  2. Select _"Eclipse Class Decompiler"_,
+  2. Select _"Enhanced Class Decompiler"_,
   3. Click on _"Uninstall..."_.
 
 ## License
diff --git a/doc/o_debug_class.png b/doc/o_debug_class.png
new file mode 100644
index 00000000..9f94b73e
Binary files /dev/null and b/doc/o_debug_class.png differ
diff --git a/org.sf.feeling.decompiler.cfr.feature/feature.properties b/org.sf.feeling.decompiler.cfr.feature/feature.properties
index 4da5a65e..1594d53e 100644
--- a/org.sf.feeling.decompiler.cfr.feature/feature.properties
+++ b/org.sf.feeling.decompiler.cfr.feature/feature.properties
@@ -16,16 +16,16 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse Class Decompiler CFR Extension (Optional)
+featureName=Enhanced Class Decompiler CFR Extension (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Chen Chao
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Class Decompiler Updates
+updateSiteName=Enhanced Class Decompiler Updates
 
 # "description" property - description of the feature
-description=Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
+description=Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
 It allows Java developers to debug class files without source code directly.
 
 copyrightURL=http://www.cpupk.com/decompiler/update
@@ -132,4 +132,4 @@ and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
 and re-export of encryption software, to see if this is permitted.\n
-########### end of license property ##########################################
\ No newline at end of file
+########### end of license property ##########################################
diff --git a/org.sf.feeling.decompiler.cfr.feature/feature.xml b/org.sf.feeling.decompiler.cfr.feature/feature.xml
index eefbb091..3ebe5977 100644
--- a/org.sf.feeling.decompiler.cfr.feature/feature.xml
+++ b/org.sf.feeling.decompiler.cfr.feature/feature.xml
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <update label="Eclipse Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
+      <update label="Enhanced Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
       <discovery label="%updateSiteName" url="http://www.cpupk.com/decompiler/update"/>
    </url>
 
diff --git a/org.sf.feeling.decompiler.cfr/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.cfr/META-INF/MANIFEST.MF
index 9899a67d..17ce6a3d 100644
--- a/org.sf.feeling.decompiler.cfr/META-INF/MANIFEST.MF
+++ b/org.sf.feeling.decompiler.cfr/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Class Decompiler CFR Extension
+Bundle-Name: Enhanced Class Decompiler CFR Extension
 Bundle-SymbolicName: org.sf.feeling.decompiler.cfr;singleton:=true
 Bundle-Version: 2.10.0.qualifier
 Bundle-Activator: org.sf.feeling.decompiler.cfr.CfrDecompilerPlugin
diff --git a/org.sf.feeling.decompiler.feature/feature.properties b/org.sf.feeling.decompiler.feature/feature.properties
index 0749a12a..cbb6ccc8 100644
--- a/org.sf.feeling.decompiler.feature/feature.properties
+++ b/org.sf.feeling.decompiler.feature/feature.properties
@@ -16,16 +16,16 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse Class Decompiler (Core)
+featureName=Enhanced Class Decompiler (Core)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Chen Chao
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Class Decompiler Updates
+updateSiteName=Enhanced Class Decompiler Updates
 
 # "description" property - description of the feature
-description=Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
+description=Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
 It allows Java developers to debug class files without source code directly.
 
 copyrightURL=http://www.cpupk.com/decompiler/update
diff --git a/org.sf.feeling.decompiler.feature/feature.xml b/org.sf.feeling.decompiler.feature/feature.xml
index 9f7ecac1..f844512d 100644
--- a/org.sf.feeling.decompiler.feature/feature.xml
+++ b/org.sf.feeling.decompiler.feature/feature.xml
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <update label="Eclipse Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
+      <update label="Enhanced Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
       <discovery label="%updateSiteName" url="http://www.cpupk.com/decompiler/update"/>
    </url>
 
diff --git a/org.sf.feeling.decompiler.jad.feature/feature.properties b/org.sf.feeling.decompiler.jad.feature/feature.properties
index a9ead388..a2d344a9 100644
--- a/org.sf.feeling.decompiler.jad.feature/feature.properties
+++ b/org.sf.feeling.decompiler.jad.feature/feature.properties
@@ -16,16 +16,16 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse Class Decompiler Jad Extension (Optional)
+featureName=Enhanced Class Decompiler Jad Extension (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Chen Chao
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Class Decompiler Updates
+updateSiteName=Enhanced Class Decompiler Updates
 
 # "description" property - description of the feature
-description=Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
+description=Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
 It allows Java developers to debug class files without source code directly.
 
 copyrightURL=http://www.cpupk.com/decompiler/update
diff --git a/org.sf.feeling.decompiler.jad.feature/feature.xml b/org.sf.feeling.decompiler.jad.feature/feature.xml
index d8852f13..47653bf5 100644
--- a/org.sf.feeling.decompiler.jad.feature/feature.xml
+++ b/org.sf.feeling.decompiler.jad.feature/feature.xml
@@ -21,7 +21,7 @@
    </license>
 
    <url>
-      <update label="Eclipse Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
+      <update label="Enhanced Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
       <discovery label="%updateSiteName" url="http://www.cpupk.com/decompiler/update"/>
    </url>
 
diff --git a/org.sf.feeling.decompiler.jad/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.jad/META-INF/MANIFEST.MF
index 2e5b47ea..c3845d81 100644
--- a/org.sf.feeling.decompiler.jad/META-INF/MANIFEST.MF
+++ b/org.sf.feeling.decompiler.jad/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Class Decompiler Jad Extension
+Bundle-Name: Enhanced Class Decompiler Jad Extension
 Bundle-SymbolicName: org.sf.feeling.decompiler.jad;singleton:=true
 Bundle-Version: 2.10.0.qualifier
 Bundle-Activator: org.sf.feeling.decompiler.jad.JadDecompilerPlugin
diff --git a/org.sf.feeling.decompiler.jd.feature/feature.properties b/org.sf.feeling.decompiler.jd.feature/feature.properties
index 7a2493b8..fd65ba96 100644
--- a/org.sf.feeling.decompiler.jd.feature/feature.properties
+++ b/org.sf.feeling.decompiler.jd.feature/feature.properties
@@ -16,16 +16,16 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse Class Decompiler JD-Core Extension (Optional)
+featureName=Enhanced Class Decompiler JD-Core Extension (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Chen Chao
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Class Decompiler Updates
+updateSiteName=Enhanced Class Decompiler Updates
 
 # "description" property - description of the feature
-description=Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
+description=Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
 It allows Java developers to debug class files without source code directly.
 
 copyrightURL=http://www.cpupk.com/decompiler/update
diff --git a/org.sf.feeling.decompiler.jd.feature/feature.xml b/org.sf.feeling.decompiler.jd.feature/feature.xml
index 815f78c6..64ced5cf 100644
--- a/org.sf.feeling.decompiler.jd.feature/feature.xml
+++ b/org.sf.feeling.decompiler.jd.feature/feature.xml
@@ -21,7 +21,7 @@
    </license>
 
    <url>
-      <update label="Eclipse Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
+      <update label="Enhanced Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
       <discovery label="%updateSiteName" url="http://www.cpupk.com/decompiler/update"/>
    </url>
 
diff --git a/org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF
index c42dd949..24f490ab 100644
--- a/org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF
+++ b/org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Class Decompiler JD-Core Extension
+Bundle-Name: Enhanced Class Decompiler JD-Core Extension
 Bundle-SymbolicName: org.sf.feeling.decompiler.jd;singleton:=true
 Bundle-Version: 2.10.0.qualifier
 Bundle-Activator: org.sf.feeling.decompiler.jd.JDCoreDecompilerPlugin
diff --git a/org.sf.feeling.decompiler.procyon.feature/feature.properties b/org.sf.feeling.decompiler.procyon.feature/feature.properties
index f183f59d..cecaec12 100644
--- a/org.sf.feeling.decompiler.procyon.feature/feature.properties
+++ b/org.sf.feeling.decompiler.procyon.feature/feature.properties
@@ -16,16 +16,16 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse Class Decompiler Procyon Extension (Optional)
+featureName=Enhanced Class Decompiler Procyon Extension (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Chen Chao
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Class Decompiler Updates
+updateSiteName=Enhanced Class Decompiler Updates
 
 # "description" property - description of the feature
-description=Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
+description=Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
 It allows Java developers to debug class files without source code directly.
 
 copyrightURL=http://www.cpupk.com/decompiler/update
diff --git a/org.sf.feeling.decompiler.procyon.feature/feature.xml b/org.sf.feeling.decompiler.procyon.feature/feature.xml
index 851e59e0..187ac95d 100644
--- a/org.sf.feeling.decompiler.procyon.feature/feature.xml
+++ b/org.sf.feeling.decompiler.procyon.feature/feature.xml
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <update label="Eclipse Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
+      <update label="Enhanced Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
       <discovery label="%updateSiteName" url="http://www.cpupk.com/decompiler/update"/>
    </url>
 
diff --git a/org.sf.feeling.decompiler.procyon/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.procyon/META-INF/MANIFEST.MF
index 00be0900..57a71c97 100644
--- a/org.sf.feeling.decompiler.procyon/META-INF/MANIFEST.MF
+++ b/org.sf.feeling.decompiler.procyon/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Class Decompiler Procyon Extension
+Bundle-Name: Enhanced Class Decompiler Procyon Extension
 Bundle-SymbolicName: org.sf.feeling.decompiler.procyon;singleton:=true
 Bundle-Version: 2.10.0.qualifier
 Bundle-Activator: org.sf.feeling.decompiler.procyon.ProcyonDecompilerPlugin
diff --git a/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
index e37949bf..3ec49306 100644
--- a/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
+++ b/org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Class Decompiler Source Attach
+Bundle-Name: Enhanced Class Decompiler Source Attach
 Bundle-SymbolicName: org.sf.feeling.decompiler.source.attach;singleton:=true
 Bundle-Version: 2.10.0.qualifier
 Bundle-Activator: org.sf.feeling.decompiler.source.attach.SourceAttachPlugin
diff --git a/org.sf.feeling.decompiler.source.feature/feature.properties b/org.sf.feeling.decompiler.source.feature/feature.properties
index 36168e99..ae9ea618 100644
--- a/org.sf.feeling.decompiler.source.feature/feature.properties
+++ b/org.sf.feeling.decompiler.source.feature/feature.properties
@@ -16,16 +16,16 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse Class Decompiler Source (Optional)
+featureName=Enhanced Class Decompiler Source (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Chen Chao
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse Class Decompiler Updates
+updateSiteName=Enhanced Class Decompiler Updates
 
 # "description" property - description of the feature
-description=Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
+description=Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. \
 It allows Java developers to debug class files without source code directly.
 
 copyrightURL=http://www.cpupk.com/decompiler/update
diff --git a/org.sf.feeling.decompiler.source.feature/feature.xml b/org.sf.feeling.decompiler.source.feature/feature.xml
index 393434a0..44c7796b 100644
--- a/org.sf.feeling.decompiler.source.feature/feature.xml
+++ b/org.sf.feeling.decompiler.source.feature/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <url>
-      <update label="Eclipse Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
+      <update label="Enhanced Class Decompiler Updates" url="http://www.cpupk.com/decompiler/update"/>
       <discovery label="%updateSiteName" url="http://www.cpupk.com/decompiler/update"/>
    </url>
 
diff --git a/org.sf.feeling.decompiler.updatesite/build/index.html b/org.sf.feeling.decompiler.updatesite/build/index.html
index 5731ef18..bbf90ee0 100644
--- a/org.sf.feeling.decompiler.updatesite/build/index.html
+++ b/org.sf.feeling.decompiler.updatesite/build/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Eclipse Class Decompiler Project Update</title>
+<title>Enhanced Class Decompiler Project Update</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style>@import url("site.css");</style>
 <script type="text/javascript">
diff --git a/org.sf.feeling.decompiler.updatesite/build/site.xml b/org.sf.feeling.decompiler.updatesite/build/site.xml
index 72ee193a..b32fa1e3 100644
--- a/org.sf.feeling.decompiler.updatesite/build/site.xml
+++ b/org.sf.feeling.decompiler.updatesite/build/site.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <description name="Eclipse Class Decompiler Project Update" url="http://www.cpupk.com/decompiler/update/">
-      Eclipse Class Decompiler project update site.
+   <description name="Enhanced Class Decompiler Project Update" url="http://www.cpupk.com/decompiler/update/">
+      Enhanced Class Decompiler project update site.
    </description>
    <feature url="features/org.sf.feeling.decompiler_2.10.0.qualifier.jar" id="org.sf.feeling.decompiler" version="2.10.0.qualifier">
-      <category name="Eclipse Class Decompiler (Core)"/>
+      <category name="Enhanced Class Decompiler (Core)"/>
    </feature>
    <feature url="features/org.sf.feeling.decompiler.jad_2.10.0.qualifier.jar" id="org.sf.feeling.decompiler.jad" version="2.10.0.qualifier" os="linux,macosx,win32" arch="x86,x86_64">
-      <category name="Eclipse Class Decompiler (Optional)"/>
+      <category name="Enhanced Class Decompiler (Optional)"/>
    </feature>
    <feature url="features/org.sf.feeling.decompiler.jd_2.10.0.qualifier.jar" id="org.sf.feeling.decompiler.jd" version="2.10.0.qualifier" os="linux,macosx,win32" arch="x86,x86_64">
-      <category name="Eclipse Class Decompiler (Optional)"/>
+      <category name="Enhanced Class Decompiler (Optional)"/>
    </feature>
    <feature url="features/org.sf.feeling.decompiler.procyon_2.10.0.qualifier.jar" id="org.sf.feeling.decompiler.procyon" version="2.10.0.qualifier">
-      <category name="Eclipse Class Decompiler (Optional)"/>
+      <category name="Enhanced Class Decompiler (Optional)"/>
    </feature>
    <feature url="features/org.sf.feeling.decompiler.cfr_2.10.0.qualifier.jar" id="org.sf.feeling.decompiler.cfr" version="2.10.0.qualifier">
-      <category name="Eclipse Class Decompiler (Optional)"/>
+      <category name="Enhanced Class Decompiler (Optional)"/>
    </feature>
    <feature url="features/org.sf.feeling.decompiler.source_2.10.0.qualifier.jar" id="org.sf.feeling.decompiler.source" version="2.10.0.qualifier">
-      <category name="Eclipse Class Decompiler (Optional)"/>
+      <category name="Enhanced Class Decompiler (Optional)"/>
    </feature>
-   <category-def name="Eclipse Class Decompiler (Core)" label="Eclipse Class Decompiler (Core)">
+   <category-def name="Enhanced Class Decompiler (Core)" label="Enhanced Class Decompiler (Core)">
       <description>
-         Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. It allows Java developers to debug class files without source code directly.
+         Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. It allows Java developers to debug class files without source code directly.
       </description>
    </category-def>
-   <category-def name="Eclipse Class Decompiler (Optional)" label="Eclipse Class Decompiler (Optional)">
+   <category-def name="Enhanced Class Decompiler (Optional)" label="Enhanced Class Decompiler (Optional)">
       <description>
-         Eclipse Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. It allows Java developers to debug class files without source code directly.
+         Enhanced Class Decompiler integrates JD, Jad, FernFlower, CFR, Procyon with Eclipse seamlessly. It allows Java developers to debug class files without source code directly.
       </description>
    </category-def>
 </site>
diff --git a/org.sf.feeling.decompiler.updatesite/build/site.xsl b/org.sf.feeling.decompiler.updatesite/build/site.xsl
index a6eed759..422f66ea 100644
--- a/org.sf.feeling.decompiler.updatesite/build/site.xsl
+++ b/org.sf.feeling.decompiler.updatesite/build/site.xsl
@@ -7,14 +7,14 @@
 		<xsl:for-each select="site">
 			<html>
 				<head>
-					<title>Eclipse Class Decompiler Project Update</title>
+					<title>Enhanced Class Decompiler Project Update</title>
 					<style>@import url("site.css");</style>
 				</head>
 				<body>
-					<h1 class="title">Eclipse Class Decompiler Project Update</h1>
+					<h1 class="title">Enhanced Class Decompiler Project Update</h1>
 					<p class="bodyText">
 						<xsl:value-of select="description" />
-						<a href="http://www.cpupk.com/decompiler">Eclipse Class Decompiler</a> plugin, Copyright (c) 2017 Chen Chao.
+						<a href="http://www.cpupk.com/decompiler">Enhanced Class Decompiler</a> plugin, Copyright (c) 2017 Chen Chao.
 						Any question, please mail to
 						<a href="mailto:cnfree2000@hotmail.com">Chen Chao(cnfree2000@hotmail.com)</a>
 						. More details, please visit 
diff --git a/org.sf.feeling.decompiler/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler/META-INF/MANIFEST.MF
index 4ab4be64..8f419a55 100644
--- a/org.sf.feeling.decompiler/META-INF/MANIFEST.MF
+++ b/org.sf.feeling.decompiler/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: lib/commons-codec-1.5.jar,
  lib/com.drgarbage.asm_5.0.3.jar,
  lib/com.drgarbage.asm.util_5.0.3.jar,
  .
-Bundle-Name: Eclipse Class Decompiler
+Bundle-Name: Enhanced Class Decompiler
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.sf.feeling.decompiler/about.properties b/org.sf.feeling.decompiler/about.properties
index 284427d2..beb685ca 100644
--- a/org.sf.feeling.decompiler/about.properties
+++ b/org.sf.feeling.decompiler/about.properties
@@ -9,11 +9,11 @@
 #  Chen Chao  - initial API and implementation
 ###############################################################################
 
-featureName=Eclipse Class Decompiler
-featureText=Eclipse Class Decompiler \n\
+featureName=Enhanced Class Decompiler
+featureText=Enhanced Class Decompiler \n\
 Version: {1}\n\
 Build id: {0}\n\
 \n\
-Eclipse Class Decompiler plugin, Copyright (c) 2017 Chen Chao(cnfree2000@hotmail.com). All rights reserved. \n\
-For more information on Eclipse Class Decompiler, visit http://www.cpupk.com/decompiler \n\
+Enhanced Class Decompiler plugin, Copyright (c) 2017 Chen Chao(cnfree2000@hotmail.com). All rights reserved. \n\
+For more information on Enhanced Class Decompiler, visit http://www.cpupk.com/decompiler \n\
 For more information on other open source projects, visit http://www.cpupk.com
\ No newline at end of file
diff --git a/org.sf.feeling.decompiler/plugin.xml b/org.sf.feeling.decompiler/plugin.xml
index 99e56ff0..2b9a86c9 100644
--- a/org.sf.feeling.decompiler/plugin.xml
+++ b/org.sf.feeling.decompiler/plugin.xml
@@ -105,7 +105,7 @@
    </extension>
    <extension point="org.eclipse.ui.commands">  
       <category id="org.sf.feeling.decompiler"  
-            name="Eclipse Class Decompiler">  
+            name="Enhanced Class Decompiler">  
       </category>  
       <command  
             name="Decompile"