diff --git a/app/scripts/controllers/schema-controller.js b/app/scripts/controllers/schema-controller.js
index 882266d20eb..34b19ce53a2 100644
--- a/app/scripts/controllers/schema-controller.js
+++ b/app/scripts/controllers/schema-controller.js
@@ -44,20 +44,25 @@ schemaModule.controller("SchemaController", ['$scope', '$routeParams', '$locatio
     }
     $scope.rename = function (cls, event) {
 
-        // TODO
-//        if (!$scope.popoverPromise) {
-//            var popScope = $scope.$new(true);
-//            popScope.rename = function (name) {
-//                ClassAlterApi.changeProperty($routeParams.database, { clazz: cls.name, name: "name", value: name}).then(function (data) {
-//                    var noti = S("The class {{name}} has been renamed to {{newName}}").template({ name: cls.name, newName: name}).s;
-//                    Notification.push({content: noti});
-//                    cls.name = name;
-//                }, function err(data) {
-//                    Notification.push({content: data, error: true});
-//                });
-//            }
-//            $scope.popoverPromise = $popover(angular.element(event.target), { scope: popScope, title: 'Rename Class', template: 'views/database/changeNamePopover.html', show: true});
-//        }
+
+        //modal
+        var modalScope = $scope.$new(true);
+        modalScope.what = 'class';
+        modalScope.tmpName = cls.name;
+        var modalPromise = $modal({template: 'views/database/changeNameModal.html', scope: modalScope, show: false});
+
+        modalScope.rename = function (name) {
+            if (name != cls.name) {
+                ClassAlterApi.changeProperty($routeParams.database, { clazz: cls.name, name: "name", value: name}).then(function (data) {
+                    var noti = S("The class {{name}} has been renamed to {{newName}}").template({ name: cls.name, newName: name}).s;
+                    Notification.push({content: noti});
+                    cls.name = name;
+                }, function err(data) {
+                    Notification.push({content: data, error: true});
+                });
+            }
+        }
+        modalPromise.$promise.then(modalPromise.show);
 
     }
     $scope.dropClass = function (nameClass) {
@@ -124,7 +129,7 @@ schemaModule.controller("SchemaController", ['$scope', '$routeParams', '$locatio
 }
 ])
 ;
-schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', '$modal', '$q', '$route', '$window', 'DatabaseApi', 'Spinner', function ($scope, $routeParams, $location, Database, CommandApi, $modal, $q, $route, $window, DatabaseApi, Spinner) {
+schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', '$modal', '$q', '$route', '$window', 'DatabaseApi', 'Spinner', 'PropertyAlterApi', 'Notification', function ($scope, $routeParams, $location, Database, CommandApi, $modal, $q, $route, $window, DatabaseApi, Spinner, PropertyAlterApi, Notification) {
     Database.setWiki("https://github.com/orientechnologies/orientdb-studio/wiki/Class");
     var clazz = $routeParams.clazz;
     $scope.class2show = clazz;
@@ -181,6 +186,29 @@ schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$loca
     $scope.indexes = null;
     $scope.indexes = Database.listIndexesForClass(clazz);
 
+    $scope.rename = function (props) {
+
+
+        //modal
+        var modalScope = $scope.$new(true);
+        modalScope.what = 'property';
+        modalScope.tmpName = props.name;
+        var modalPromise = $modal({template: 'views/database/changeNameModal.html', scope: modalScope, show: false});
+
+        modalScope.rename = function (name) {
+            if (name != props.name) {
+                PropertyAlterApi.changeProperty($routeParams.database, { clazz: $scope.class2show, property: props.name, name: "name", value: name}).then(function (data) {
+                    var noti = S("The Property {{name}} has been renamed to {{newName}}").template({ name: props.name, newName: name}).s;
+                    Notification.push({content: noti});
+                    props.name = name;
+                }, function err(data) {
+                    Notification.push({content: data, error: true});
+                });
+            }
+        }
+        modalPromise.$promise.then(modalPromise.show);
+
+    }
 
     $scope.getEngine = function (index) {
         var engine = '';
diff --git a/app/scripts/services/database-services.js b/app/scripts/services/database-services.js
index 17b5441b5fd..b29f7a0de8d 100644
--- a/app/scripts/services/database-services.js
+++ b/app/scripts/services/database-services.js
@@ -783,3 +783,24 @@ database.factory('ClassAlterApi', function ($http, $resource, $q) {
     }
     return resource
 });
+database.factory('PropertyAlterApi', function ($http, $resource, $q) {
+
+
+    var resource = $resource('function/:database');
+
+
+    resource.changeProperty = function (database, props) {
+
+        var deferred = $q.defer();
+        var text = API + 'command/' + database + '/sql/-/-1?format=rid,type,version,class,graph';
+        var query = "alter property {{clazz}}.{{property}} {{name}} {{value}}"
+        var queryText = S(query).template(props).s;
+        $http.post(text, queryText).success(function (data) {
+            deferred.resolve(data)
+        }).error(function (data) {
+                deferred.reject(data);
+            });
+        return deferred.promise;
+    }
+    return resource
+});
diff --git a/app/styles/layout.css b/app/styles/layout.css
index 0f74ff09a6f..9ae855fc6de 100644
--- a/app/styles/layout.css
+++ b/app/styles/layout.css
@@ -483,3 +483,14 @@ table.result-table > thead > tr > th {
     width: 100%;
 }
 
+.cloud-db tr {
+    width: 100%;
+    display: inline-table;
+}
+.cloud-db tbody {
+    max-height: 200px;
+    width: 100%;
+    overflow: auto;
+    display:block;
+}
+
diff --git a/app/views/database/changeNameModal.html b/app/views/database/changeNameModal.html
new file mode 100644
index 00000000000..43fe1056576
--- /dev/null
+++ b/app/views/database/changeNameModal.html
@@ -0,0 +1,40 @@
+<div class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" ng-click="$hide()" aria-hidden="true">×
+                </button>
+                <h4 class="modal-title">Change {{what}} name</h4>
+            </div>
+            <form class="form-horizontal" name="classForm" novalidate>
+                <div class="modal-body edge">
+                    <div class="row-fluid">
+                        <div class="span12">
+
+                            <div class="form-group">
+                                <label class="control-label col-md-3" for="inputName">New Name *</label>
+
+                                <div class="col-md-9">
+                                    <input type="text" id="inputName" class="form-control" required
+                                           ng-model="tmpName"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-default" ng-click="$hide()">Close</button>
+                    <button type="submit" class="btn btn-sm btn-primary"
+                            ng-disabled="classForm.$invalid"
+                            ng-click="rename(tmpName);$hide();">
+                        Rename
+                    </button>
+                </div>
+            </form>
+
+        </div>
+    </div>
+</div>
+
+
+
diff --git a/app/views/database/changeNamePopover.html b/app/views/database/changeNamePopover.html
index 8fc48c82d6b..35f0e526b88 100644
--- a/app/views/database/changeNamePopover.html
+++ b/app/views/database/changeNamePopover.html
@@ -10,7 +10,7 @@ <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>
             </div>
             <div class="form-actions">
                 <button class="btn btn-default btn-sm " ng-click="$hide()">Cancel</button>
-                <button class="btn btn-primary btn-sm" ng-disabled="!tmpName"
+                <button class="btn btn-primary btn-sm" type="submit" ng-disabled="!tmpName"
                         ng-click="rename(tmpName);$hide();tmpName = null;">
                     Rename
                 </button>
diff --git a/app/views/database/editclass.html b/app/views/database/editclass.html
index 6d4028d0410..36557c876fb 100644
--- a/app/views/database/editclass.html
+++ b/app/views/database/editclass.html
@@ -73,7 +73,7 @@ <h4>Properties</h4>
                     <tbody>
                     <tr ng-repeat="result in property |  orderBy:'name'">
                         <td>
-                            {{result['name']}}
+                            {{result['name']}}</a>
                         </td>
                         <td>
                             <select ng-model="result['type']" ng-options="p.toString() for p in listTypes"
@@ -132,11 +132,19 @@ <h4>Properties</h4>
 
                         </td>
                         <td>
-                            <button href="javascript:void(0)" class="btn btn-danger btn-xs"
-                                    ng-click="dropProperty(result,result['name'])"><i
-                                    class="fa fa-trash-o"></i>
-                                Drop
-                            </button>
+                            <div class="btn-group">
+                                <button href="javascript:void(0)" class="btn btn-primary btn-xs"
+                                        ng-click="rename(result)">
+                                    Rename
+                                </button>
+                            </div>
+                            <div class="btn-group">
+                                <button href="javascript:void(0)" class="btn btn-danger btn-xs"
+                                        ng-click="dropProperty(result,result['name'])"><i
+                                        class="fa fa-trash-o"></i>
+                                    Drop
+                                </button>
+                            </div>
                         </td>
                     </tr>
                     </tbody>
diff --git a/app/views/database/importCloud.html b/app/views/database/importCloud.html
index 0cbfe112597..bd76f00cf1c 100644
--- a/app/views/database/importCloud.html
+++ b/app/views/database/importCloud.html
@@ -29,7 +29,7 @@ <h3>Import Public Databases</h3>
                         </div>
                     </fieldset>
                 </form>
-                <table class="table">
+                <table class="table cloud-db">
                     <thead>
                     <th>Name</th>
                     <th>Description</th>
diff --git a/app/views/database/schema.html b/app/views/database/schema.html
index af143a6af49..91b8c91abf6 100644
--- a/app/views/database/schema.html
+++ b/app/views/database/schema.html
@@ -65,9 +65,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="result in listClassesTotal | filter: queryy ">
-                            <td>{{result['name']}} <a href="javascript:void(0)" ng-click="rename(result,$event)"
-                                                      class="pull-right"><i
-                                    class="fa fa-edit"></i></a></td>
+                            <td ng-click="openClass(result)">{{result['name']}}</td>
                             <td ng-click="openClass(result)">{{result['superClass']}}</td>
                             <td ng-click="openClass(result)">{{result['alias']}}</td>
                             <td ng-click="openClass(result)">
@@ -84,6 +82,10 @@
                             </td>
                             <td ng-click="openClass(result)">{{result['records']}}</td>
                             <td>
+                                <button href="javascript:void(0)" class="btn btn-primary btn-xs"
+                                        ng-click="rename(result)">
+                                    Rename
+                                </button>
                                 <button href="javascript:void(0)" class="btn btn-default btn-xs"
                                         ng-click="queryAll(result['name'])">
                                     <i