diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
index 91c889bad..7c59a81f4 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
@@ -90,7 +90,7 @@ import se.sics.cooja.util.StringUtils;
  *
  * @author Fredrik Osterlind
  */
-@ClassDescription("Cooja Mote Type")
+@ClassDescription("Cooja mote...")
 @AbstractionLevelDescription("OS level")
 public class ContikiMoteType implements MoteType {
   private static Logger logger = Logger.getLogger(ContikiMoteType.class);
diff --git a/tools/cooja/java/se/sics/cooja/motes/ImportAppMoteType.java b/tools/cooja/java/se/sics/cooja/motes/ImportAppMoteType.java
index 821d9dda2..bc850f624 100644
--- a/tools/cooja/java/se/sics/cooja/motes/ImportAppMoteType.java
+++ b/tools/cooja/java/se/sics/cooja/motes/ImportAppMoteType.java
@@ -52,7 +52,7 @@ import se.sics.cooja.util.ArrayUtils;
 /**
  * @author Fredrik Osterlind
  */
-@ClassDescription("Imported App Mote Type")
+@ClassDescription("Import Java mote...")
 @AbstractionLevelDescription("Application level")
 public class ImportAppMoteType extends AbstractApplicationMoteType {
 
diff --git a/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java b/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java
index 0a22206a5..794d0a0c9 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java
@@ -107,7 +107,7 @@ import se.sics.cooja.util.StringUtils;
 /**
  * @author Fredrik Osterlind, Niclas Finne
  */
-@ClassDescription("Buffer Listener")
+@ClassDescription("Buffer view...")
 @PluginType(PluginType.SIM_PLUGIN)
 public class BufferListener extends VisPlugin {
   private static final long serialVersionUID = 1L;
diff --git a/tools/cooja/java/se/sics/cooja/plugins/EventListener.java b/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
index 5a3588af9..8fec46392 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
@@ -47,7 +47,7 @@ import se.sics.cooja.interfaces.*;
  *
  * @author Fredrik Osterlind
  */
-@ClassDescription("Event Listener")
+@ClassDescription("Breakpoints...")
 @PluginType(PluginType.SIM_PLUGIN)
 public class EventListener extends VisPlugin {
   private static final long serialVersionUID = 1L;