diff --git a/src/main/java/fucoin/configurations/AbstractConfiguration.java b/src/main/java/fucoin/configurations/AbstractConfiguration.java
index 2bb74bd14a1816e26820d8e8875b5bfed9cf894d..a3ac5a4069785610d6013c338f27e95a7cde2783 100644
--- a/src/main/java/fucoin/configurations/AbstractConfiguration.java
+++ b/src/main/java/fucoin/configurations/AbstractConfiguration.java
@@ -78,11 +78,4 @@ public abstract class AbstractConfiguration extends AbstractNode {
     }
 
     public abstract void run();
-
-    public abstract String getName();
-
-    @Override
-    public String toString() {
-        return getName();
-    }
 }
diff --git a/src/main/java/fucoin/configurations/DefaultConfiguration.java b/src/main/java/fucoin/configurations/DefaultConfiguration.java
index 924739084beef7a092174c9e98449e283c1c7f70..ff6df01c578390927427822f4b069a6a4ae508be 100644
--- a/src/main/java/fucoin/configurations/DefaultConfiguration.java
+++ b/src/main/java/fucoin/configurations/DefaultConfiguration.java
@@ -27,11 +27,6 @@ public class DefaultConfiguration extends AbstractConfiguration {
         wallet1.tell(new ActionWalletSendMoney("Wallet1", 50), wallet1);
     }
 
-    @Override
-    public String getName() {
-        return "Default Configuration";
-    }
-
     @Override
     public void onReceive(Object message) {
 
diff --git a/src/main/java/fucoin/configurations/MassWalletConfiguration.java b/src/main/java/fucoin/configurations/MassWalletConfiguration.java
index 625c34bc83828d1e4266065aeb3d3d534ac158af..0439612a335796f2dcceb859fc5a51bd6a24b221 100644
--- a/src/main/java/fucoin/configurations/MassWalletConfiguration.java
+++ b/src/main/java/fucoin/configurations/MassWalletConfiguration.java
@@ -1,8 +1,11 @@
 package fucoin.configurations;
 
+import fucoin.configurations.internal.ConfigurationName;
+
 /**
  *
  */
+@ConfigurationName("Lots of Wallets")
 public class MassWalletConfiguration extends AbstractConfiguration {
     @Override
     public void run() {
@@ -10,11 +13,6 @@ public class MassWalletConfiguration extends AbstractConfiguration {
         spawnWallets(200, false);
     }
 
-    @Override
-    public String getName() {
-        return "Lots of wallets";
-    }
-
     @Override
     public void onReceive(Object message) {
 
diff --git a/src/main/java/fucoin/configurations/internal/ConfigurationName.java b/src/main/java/fucoin/configurations/internal/ConfigurationName.java
index c822acb2543e430c1224185f453f31ffc08602ae..de15502f4b12e17aca529324bae36b638722974d 100644
--- a/src/main/java/fucoin/configurations/internal/ConfigurationName.java
+++ b/src/main/java/fucoin/configurations/internal/ConfigurationName.java
@@ -1,8 +1,12 @@
 package fucoin.configurations.internal;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  *
  */
+@Retention(RetentionPolicy.RUNTIME)
 public @interface ConfigurationName {
     String value();
 }
diff --git a/src/main/java/fucoin/configurations/internal/ConfigurationSelection.java b/src/main/java/fucoin/configurations/internal/ConfigurationSelection.java
index e019f4a4ea5a8d6780946581458e8dd5a4984826..935ba072bf683ffb6b2e569d1c4935c9edb28d26 100644
--- a/src/main/java/fucoin/configurations/internal/ConfigurationSelection.java
+++ b/src/main/java/fucoin/configurations/internal/ConfigurationSelection.java
@@ -20,7 +20,9 @@ public class ConfigurationSelection {
 
     @Override
     public String toString() {
-        System.out.println(configurationClass.isAnnotationPresent(ConfigurationName.class));
+        if (configurationClass.isAnnotationPresent(ConfigurationName.class)) {
+            return configurationClass.getAnnotation(ConfigurationName.class).value();
+        }
         return configurationClass.getSimpleName();
     }
 }