diff --git a/app/cmd/dispatcher.js b/app/cmd/cmd.js
similarity index 97%
rename from app/cmd/dispatcher.js
rename to app/cmd/cmd.js
index c58ac1d..0741fc0 100644
--- a/app/cmd/dispatcher.js
+++ b/app/cmd/cmd.js
@@ -1,13 +1,13 @@
 app.compose(function() {
     "use strict";
 
-    app.set('dispatcher', function() {
+    app.set('cmd', function() {
         var handlers = [];
         var is = app.get('is');
         var cmdController = app.controller('cmdController');
 
         return {
-            dispatch: function(rawInput) {
+            execute: function(rawInput) {
                 var input = rawInput.trim();
                 var handler = this.findHandler(input);
 
diff --git a/app/cmd/commandsCatalog.js b/app/cmd/commands.js
similarity index 92%
rename from app/cmd/commandsCatalog.js
rename to app/cmd/commands.js
index 00b45ca..0311b49 100644
--- a/app/cmd/commandsCatalog.js
+++ b/app/cmd/commands.js
@@ -1,9 +1,9 @@
 app.run(function() {
     "use strict";
 
-    var dispatcher = app.get('dispatcher');
+    var cmd = app.get('cmd');
 
-    dispatcher.commands({
+    cmd.commands({
         'help': function() {
             var helpResult = document.querySelector('.result .help');
             if(helpResult != null) {
@@ -22,7 +22,7 @@ app.run(function() {
     });
 
     // TODO: Make as function
-    dispatcher.command({
+    cmd.command({
         canHandle: function(input) { return app.get('expression').canParse(input); },
         handle: function(input) {
             return app.get('expression').parse(input);
diff --git a/app/controllers.js b/app/controllers.js
index e2c0860..6c21849 100644
--- a/app/controllers.js
+++ b/app/controllers.js
@@ -2,12 +2,10 @@ app.compose(function() {
     "use strict";
 
     app.controller('expressionInputCtrl', function (){
-        var dispatcher = app.get('dispatcher');
+        var cmd = app.get('cmd');
 
         return {
             onViewAttached: function () {
-                var d = dispatcher;
-
                 var self = this;
                 self.history =[];
                 self.historyIndex = 0;
@@ -22,7 +20,7 @@ app.compose(function() {
                     }
 
                     // Enter
-                    d.dispatch(inpt.value);
+                    cmd.execute(inpt.value);
                     self.history.unshift(inpt.value);
                     self.historyIndex = 0;
                     inpt.value = '';
diff --git a/index.html b/index.html
index ac7c899..ea8fb55 100644
--- a/index.html
+++ b/index.html
@@ -27,10 +27,10 @@
     <script type="text/javascript" src="app/models.js"></script>
     <script type="text/javascript" src="app/modelViews.js"></script>
 
-    <script type="text/javascript" src="app/cmd/dispatcher.js"></script>
+    <script type="text/javascript" src="app/cmd/cmd.js"></script>
     <script type="text/javascript" src="app/services.js"></script>
     <script type="text/javascript" src="app/controllers.js"></script>
-    <script type="text/javascript" src="app/cmd/commandsCatalog.js"></script>
+    <script type="text/javascript" src="app/cmd/commands.js"></script>
 
     <link rel="stylesheet" type="text/css" href="css/styles.css" />
 </head>
@@ -136,10 +136,11 @@
 
     var app = window.app;
     app.bootstrap(document.getElementById('rootView'));
+    var cmd = app.get('cmd');
 
-    app.get('dispatcher').dispatch('help');
-    app.get('dispatcher').dispatch('1|2');
-    app.get('dispatcher').dispatch('2 4 8 16 32');
+    cmd.execute('help');
+    cmd.execute('1|2');
+    cmd.execute('2 4 8 16 32');
 
 </script>
 </body>