diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java
index c97f008ce..1a8455329 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java
@@ -112,7 +112,7 @@ public class Machine extends Resource {
     }
 
     public String getShortDescription() {
-        return getCode() + " :: " + name;
+        return name + " (" + getCode() + ")";
     }
 
     public void setDescription(String description) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java
index 4e40c93b9..f1b47b140 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java
@@ -38,7 +38,7 @@ public class VirtualWorker extends Worker {
     public static VirtualWorker create() {
         VirtualWorker virtualWorker = new VirtualWorker();
         virtualWorker.setNewObject(true);
-        virtualWorker.setNif("[Virtual]");
+        virtualWorker.setNif("(Virtual)");
         virtualWorker.setSurname("---");
         virtualWorker.getCalendar();
         return create(virtualWorker);
@@ -47,7 +47,7 @@ public class VirtualWorker extends Worker {
     public static VirtualWorker create(String code) {
         VirtualWorker virtualWorker = new VirtualWorker();
         virtualWorker.setNewObject(true);
-        virtualWorker.setNif("[Virtual]");
+        virtualWorker.setNif("(Virtual)");
         virtualWorker.setSurname("---");
         virtualWorker.getCalendar();
         return create(virtualWorker, code);
@@ -62,12 +62,17 @@ public class VirtualWorker extends Worker {
     }
 
     @Override
-    public String getDescription(){
-        return getFirstName()+" "+getSurname();
+    public String getDescription() {
+        return getFirstName();
+    }
+
+    @Override
+    public String getShortDescription() {
+        return getFirstName() + " " + getNif();
     }
 
     public String getName() {
-        return getFirstName() + " " + getSurname();
+        return getFirstName();
     }
 
     @Override
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java
index 376ceecd2..5876103a4 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java
@@ -101,12 +101,12 @@ public class Worker extends Resource implements Comparable {
     }
 
     public String getDescription() {
-        return getFirstName() + " " + getSurname();
+        return getSurname() + "," + getFirstName();
     }
 
     @Override
     public String getShortDescription() {
-        return getNif() + " :: " + getDescription();
+        return getDescription() + " (" + getNif() + ")";
     }
 
     @NotEmpty(message="worker's first name not specified")