diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/Command.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/Command.java
index 6a25970e..f175123b 100644
--- a/src/main/java/fi/helsinki/cs/tmc/cli/command/Command.java
+++ b/src/main/java/fi/helsinki/cs/tmc/cli/command/Command.java
@@ -4,22 +4,20 @@
  * Class is an interface for commands.
  */
 public interface Command {
-    
     /**
      * Get command description.
      * @return Description
      */
-    String description();
+    String getDescription();
 
     /**
      * Get default command name.
      * @return Name
      */
-    String name();
+    String getName();
 
     /**
      * Run command.
      */
     void run();
-
 }
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java
index acf4ea64..36e0029c 100644
--- a/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java
+++ b/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java
@@ -10,15 +10,23 @@ public class CommandMap {
 
     private Map<String, Command> commands;
 
+    /**
+     * Constructor.
+     */
     public CommandMap() {
         this.commands = new HashMap<>();
         createCommand(new TestCommand());
     }
-    
+
     private void createCommand(Command command) {
-        this.commands.put(command.name(), command);
+        this.commands.put(command.getName(), command);
     }
-    
+
+    /**
+     * Get command by default name.
+     * @param name
+     * @return Command
+     */
     public Command getCommand(String name) {
         return commands.get(name);
     }
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/TestCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/TestCommand.java
index ede6e5fd..80a3b544 100644
--- a/src/main/java/fi/helsinki/cs/tmc/cli/command/TestCommand.java
+++ b/src/main/java/fi/helsinki/cs/tmc/cli/command/TestCommand.java
@@ -4,14 +4,13 @@
  * Class is a test command class
  */
 public class TestCommand implements Command {
-
     @Override
-    public String description() {
+    public String getDescription() {
         return "This is an easter egg test command.";
     }
 
     @Override
-    public String name() {
+    public String getName() {
         return "EasterEgg";
     }
 
@@ -19,5 +18,4 @@ public String name() {
     public void run() {
         System.out.println("Let's run easter egg.");
     }
-    
 }