diff --git a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerAction.java
similarity index 88%
rename from org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java
rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerAction.java
index 0afb5904..12e3e24d 100644
--- a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java
+++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerAction.java
@@ -14,9 +14,9 @@
 import org.sf.feeling.decompiler.vineflower.i18n.Messages;
 import org.sf.feeling.decompiler.util.UIUtil;
 
-public class DecompileWithVineflowerCoreAction extends Action {
+public class DecompileWithVineflowerAction extends Action {
 
-	public DecompileWithVineflowerCoreAction() {
+	public DecompileWithVineflowerAction() {
 		super(Messages.getString("JavaDecompilerActionBarContributor.Action.DecompileWithVineflower")); //$NON-NLS-1$
 		this.setImageDescriptor(VineflowerDecompilerPlugin.getImageDescriptor("icons/vineflower_16.png")); //$NON-NLS-1$
 	}
@@ -24,7 +24,7 @@ public DecompileWithVineflowerCoreAction() {
 	@Override
 	public void run() {
 		try {
-			new DecompileWithVineflowerCoreHandler().execute(null);
+			new DecompileWithVineflowerHandler().execute(null);
 		} catch (ExecutionException e) {
 		}
 	}
diff --git a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerHandler.java
similarity index 92%
rename from org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java
rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerHandler.java
index 4d160f5e..8e1eac46 100644
--- a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java
+++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerHandler.java
@@ -13,7 +13,7 @@
 import org.sf.feeling.decompiler.actions.BaseDecompilerHandler;
 import org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin;
 
-public class DecompileWithVineflowerCoreHandler extends BaseDecompilerHandler {
+public class DecompileWithVineflowerHandler extends BaseDecompilerHandler {
 
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java
index 925e91c1..cfeb78a3 100644
--- a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java
+++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java
@@ -4,7 +4,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.sf.feeling.decompiler.editor.*;
 import org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin;
-import org.sf.feeling.decompiler.vineflower.actions.DecompileWithVineflowerCoreAction;
+import org.sf.feeling.decompiler.vineflower.actions.DecompileWithVineflowerAction;
 import org.sf.feeling.decompiler.vineflower.i18n.Messages;
 
 public class VineflowerDecompilerDescriptor implements IDecompilerDescriptor {
@@ -42,7 +42,7 @@ public BaseDecompilerSourceMapper getDecompilerSourceMapper() {
 	@Override
 	public Action getDecompileAction() {
 		if (decompileAction == null) {
-			decompileAction = new DecompileWithVineflowerCoreAction();
+			decompileAction = new DecompileWithVineflowerAction();
 		}
 		return decompileAction;
 	}
diff --git a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java
index e2f916c4..c8c1ea35 100644
--- a/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java
+++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java
@@ -16,7 +16,6 @@ private Messages() {
 	}
 
 	public static String getString(String key) {
-
 		try {
 			String result = RESOURCE_BUNDLE.getString(key);
 			result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);