diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
index e2c08d14e3..4e2f19d0e9 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
@@ -65,9 +65,9 @@ define(function(require) {
 
     this.columns = [
       Locale.tr("ID"),
-      Locale.tr("Name"),
       Locale.tr("Owner"),
       Locale.tr("Group"),
+      Locale.tr("Name"),
       Locale.tr("State"),
       Locale.tr("Labels"),
       "search_data"
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js
index e2aa7bbccd..8459d4aa91 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js
@@ -64,9 +64,9 @@ define(function(require) {
 
     this.columns = [
       Locale.tr("ID"),
-      Locale.tr("Name"),
       Locale.tr("Owner"),
       Locale.tr("Group"),
+      Locale.tr("Name"),
       Locale.tr("Labels"),
       "search_data"
     ];
@@ -100,24 +100,21 @@ define(function(require) {
     var element = element_json[XML_ROOT];
 
     var search = {
-      NAME:  element.NAME,
       UNAME: element.UNAME,
-      GNAME: element.GNAME
+      GNAME: element.GNAME,
+      NAME:  element.NAME
     }
 
     var color_html = Status.state_lock_to_color("SERVICE_TEMPLATE",false, element_json[XML_ROOT]["LOCK"]);
 
     return [
-      '<input class="check_item" type="checkbox" '+
-                          'style="vertical-align: inherit;" id="'+this.resource.toLowerCase()+'_' +
-                           element.ID + '" name="selected_items" value="' +
-                           element.ID + '"/>'+color_html,
-        element.ID,
-        element.NAME,
-        element.UNAME,
-        element.GNAME,
-        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
-        btoa(unescape(encodeURIComponent(JSON.stringify(search))))
+      '<input class="check_item" type="checkbox" style="vertical-align: inherit;" id="'+this.resource.toLowerCase() + '_' + element.ID + '" name="selected_items" value="' + element.ID + '"/>'+color_html,
+      element.ID,
+      element.UNAME,
+      element.GNAME,
+      element.NAME,
+      (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
+      btoa(unescape(encodeURIComponent(JSON.stringify(search))))
     ];
   }
 });