diff --git a/.gitignore b/.gitignore
index 846d13822..720d7df4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ node_modules
 .idea
 dist
 dockerui
+*.iml
diff --git a/app/app.js b/app/app.js
index d41c7e039..c63ff313a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -15,4 +15,4 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
     .constant('DOCKER_ENDPOINT', 'dockerapi')
     .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred.  If you have a port, prefix it with a ':' i.e. :4243
     .constant('UI_VERSION', 'v0.6.0')
-    .constant('DOCKER_API_VERSION', 'v1.16');
+    .constant('DOCKER_API_VERSION', 'v1.17');
diff --git a/app/components/container/container.html b/app/components/container/container.html
index e192a2ce0..a714e92cf 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -1,6 +1,21 @@
 <div class="detail">
     
-    <h4>Container: {{ container.Name }}</h4>
+    <div ng-if="!container.edit">
+        <h4>Container: {{ container.Name }}
+            <button class="btn btn-primary"
+                    ng-click="container.edit = true;">Rename</button>
+        </h4>
+    </div>
+    <div ng-if="container.edit">
+        <h4>
+            Container:
+            <input type="text" ng-model="container.newContainerName">
+            <button class="btn btn-success"
+                    ng-click="renameContainer()">Edit</button>
+            <button class="btn btn-danger"
+                    ng-click="container.edit = false;">&times;</button>
+        </h4>
+    </div>
 
     <div class="btn-group detail">
       <button class="btn btn-success"
diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js
index 852da8cbb..e79ea8c77 100644
--- a/app/components/container/containerController.js
+++ b/app/components/container/containerController.js
@@ -2,11 +2,14 @@ angular.module('container', [])
 .controller('ContainerController', ['$scope', '$routeParams', '$location', 'Container', 'Messages', 'ViewSpinner',
 function($scope, $routeParams, $location, Container, Messages, ViewSpinner) {
     $scope.changes = [];
+    $scope.edit = false;
 
     var update = function() {
         ViewSpinner.spin();
         Container.get({id: $routeParams.id}, function(d) {
             $scope.container = d;
+            $scope.container.edit = false;
+            $scope.container.newContainerName = d.Name;
             ViewSpinner.stop();
         }, function(e) {
             if (e.status === 404) {
@@ -100,6 +103,20 @@ function($scope, $routeParams, $location, Container, Messages, ViewSpinner) {
         });
     };
 
+    $scope.renameContainer = function () {
+        // #FIXME fix me later to handle http status to show the correct error message
+        Container.rename({id: $routeParams.id, 'name': $scope.container.newContainerName}, function(data){
+            if (data.name){
+                $scope.container.Name = data.name;
+                Messages.send("Container renamed", $routeParams.id);
+            }else {
+                $scope.container.newContainerName = $scope.container.Name;
+                Messages.error("Failure", "Container failed to rename.");
+            }
+        });
+        $scope.container.edit = false;
+    };
+
     update();
     $scope.getChanges();
 }]);
diff --git a/app/shared/services.js b/app/shared/services.js
index 6dbed1f94..575a9a90e 100644
--- a/app/shared/services.js
+++ b/app/shared/services.js
@@ -16,7 +16,8 @@ angular.module('dockerui.services', ['ngResource'])
             unpause: {method: 'POST', params: {id: '@id', action: 'unpause'}},
             changes: {method: 'GET', params: {action:'changes'}, isArray: true},
             create: {method: 'POST', params: {action:'create'}},
-            remove: {method: 'DELETE', params: {id: '@id', v:0}}
+            remove: {method: 'DELETE', params: {id: '@id', v:0}},
+            rename: {method: 'POST', params: {id: '@id', action: 'rename'}, isArray: false}
         });
     })
     .factory('ContainerLogs', function($resource, $http, Settings) {
diff --git a/test/unit/app/components/containerController.spec.js b/test/unit/app/components/containerController.spec.js
new file mode 100644
index 000000000..3dcb698a0
--- /dev/null
+++ b/test/unit/app/components/containerController.spec.js
@@ -0,0 +1,57 @@
+describe('ContainerController', function() {
+    var $scope, $httpBackend, mockContainer, $routeParams;
+
+    beforeEach(module('dockerui'));
+
+
+    beforeEach(inject(function ($rootScope, $controller, _$routeParams_) {
+
+        $scope = $rootScope.$new();
+        $routeParams = _$routeParams_;
+        $controller('ContainerController', {
+            $scope: $scope
+        });
+
+        angular.mock.inject(function (_$httpBackend_, _Container_) {
+            mockContainer = _Container_;
+            $httpBackend = _$httpBackend_;
+        });
+    }));
+
+    function expectGetContainer() {
+        $httpBackend.expectGET('dockerapi/containers/json?').respond({
+            'Created': 1421817232,
+            'id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f',
+            'Image': 'dockerui:latest',
+            'Name': '/dockerui'
+        });
+    }
+
+    it("a correct create request to the Docker remote API", function () {
+
+        $routeParams.id = 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f';
+        $scope.container = {
+            'Created': 1421817232,
+            'id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f',
+            'Image': 'dockerui:latest',
+            'Name': '/dockerui'
+        };
+        $scope.container.newContainerName = "newName";
+
+        var newContainerName = "newName";
+        expectGetContainer();
+
+        $httpBackend.expectGET('dockerapi/containers/changes?').respond([{"Kind":1,"Path":"/docker.sock"}]);
+
+        $httpBackend.expectPOST('dockerapi/containers/' + $routeParams.id + '/rename?name=newName').
+            respond({
+                'name': newContainerName
+            });
+
+        $scope.renameContainer();
+
+        $httpBackend.flush();
+        expect($scope.container.Name).toBe(newContainerName);
+        expect($scope.container.edit).toBeFalsy();
+    });
+});
\ No newline at end of file
diff --git a/app/components/startContainer/startContainerController.spec.js b/test/unit/app/components/startContainerController.spec.js
similarity index 98%
rename from app/components/startContainer/startContainerController.spec.js
rename to test/unit/app/components/startContainerController.spec.js
index 6b359306e..344add9f3 100644
--- a/app/components/startContainer/startContainerController.spec.js
+++ b/test/unit/app/components/startContainerController.spec.js
@@ -41,15 +41,15 @@ describe('startContainerController', function() {
             var expectedBody = {
                 'name': 'container-name',
                 'ExposedPorts': {
-                    '9000/tcp': {},
+                    '9000/tcp': {}
                 },
                 'HostConfig': {
                     'PortBindings': {
                         '9000/tcp': [{
                             'HostPort': '9999',
-                            'HostIp': '10.20.10.15',
+                            'HostIp': '10.20.10.15'
                         }]
-                    },
+                    }
                 }
             };
 
@@ -69,7 +69,7 @@ describe('startContainerController', function() {
                 ip: '10.20.10.15',
                 extPort: '9999',
                 intPort: '9000'
-            }]
+            }];
 
             scope.create();
             $httpBackend.flush();
diff --git a/test/unit/shared/filters.spec.js b/test/unit/app/shared/filters.spec.js
similarity index 100%
rename from test/unit/shared/filters.spec.js
rename to test/unit/app/shared/filters.spec.js
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index 40cb82077..39555ec2e 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -8,6 +8,7 @@ files = [
   'assets/js/jquery-1.11.1.min.js',
   'assets/js/jquery.gritter.min.js',
   'assets/js/bootstrap.min.js',
+  'assets/js/spin.js',
   'assets/js/angularjs/1.2.6/angular.min.js',
   'assets/js/angularjs/1.2.6/angular-route.min.js',
   'assets/js/angularjs/1.2.6/angular-resource.min.js',