diff --git a/app/policies/activity_policy.rb b/app/policies/activity_policy.rb
index bdb94fe88f7f4dfd1425050ad26c15881995b46e..989fa88190feee8bf8dea166a17ff1d1dd864358 100644
--- a/app/policies/activity_policy.rb
+++ b/app/policies/activity_policy.rb
@@ -9,7 +9,7 @@ class ActivityPolicy < ApplicationPolicy
     end
 
     def resolve
-      if user_can_moderate?
+      if user_can_edit?
         scope.includes(:owner,:recipient).order('created_at DESC').all
       else
         scope.includes(:owner,:recipient).where("privacy = 'public'").where(key: activities_filter).order('created_at DESC').all
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index d33251570ec0db82ca4109a3b286f2f2ace5e0e7..0f3514857c8564be46b78e0a9952d97a271d5850 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -40,7 +40,7 @@ class ApplicationPolicy
 
   def owns?
     return false if user.nil?
-    return true if user_can_moderate?
+    return true if user_can_edit?
 
     return owner.users.include?(user) if owner.is_a?(Institution)
 
@@ -55,12 +55,12 @@ class ApplicationPolicy
     raise 'You must implement this method!'
   end
 
-  def user_can_moderate?
-    user.is_admin? || user.is_moderator?
+  def user_can_edit?
+    user.is_admin? || user.is_editor?
   end
 
-  def user_can_curate?
-    user.is_curator?
+  def user_can_moderate?
+    user.is_moderator?
   end
 
   class Scope < ApplicationPolicy
diff --git a/app/policies/bookmark_policy.rb b/app/policies/bookmark_policy.rb
index 9e88edd4e4faf8c85857c5e1251cdbdd53a3fda8..7f7e8483386033b54296f2ff3910d36516e181c3 100644
--- a/app/policies/bookmark_policy.rb
+++ b/app/policies/bookmark_policy.rb
@@ -17,7 +17,7 @@ class BookmarkPolicy < ApplicationPolicy
   end
 
   def user_own?
-    record.user == user || user_can_moderate?
+    record.user == user || user_can_edit?
   end
 
 end
diff --git a/app/policies/collection_policy.rb b/app/policies/collection_policy.rb
index 9721408518245252b7fb8482729dd1a5005be1c3..0278fd8d0e775d0d491702244255efa7c05663cb 100644
--- a/app/policies/collection_policy.rb
+++ b/app/policies/collection_policy.rb
@@ -8,7 +8,7 @@ class CollectionPolicy < ApplicationPolicy
   class Scope < Scope
     def resolve
       if user_exists?
-        if user_can_moderate?
+        if user_can_edit?
           scope.all
         else
           scope.includes(:collection_items).where.not(:collection_items => {:collection_id => nil}).where("privacy = ? OR owner_id = ?", 'public', user.id)
diff --git a/app/policies/institution_policy.rb b/app/policies/institution_policy.rb
index 185b3eff64311035233e7e87ac34d5a5118f7726..652d2fb98d8788ee80dcd364a228b3bc2e758424 100644
--- a/app/policies/institution_policy.rb
+++ b/app/policies/institution_policy.rb
@@ -1,21 +1,21 @@
 class InstitutionPolicy < ApplicationPolicy
   def create?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def update?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def index?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def destroy?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def users?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 end
diff --git a/app/policies/language_policy.rb b/app/policies/language_policy.rb
index cae7a10e077c056d7bdc33099c8563f7c665ae38..916e5ccf3bb492f7cb2dd99826481666ddfeba8a 100644
--- a/app/policies/language_policy.rb
+++ b/app/policies/language_policy.rb
@@ -8,14 +8,14 @@ class LanguagePolicy < ApplicationPolicy
   end
 
   def create?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def update?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def destroy?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 end
diff --git a/app/policies/learning_object_policy.rb b/app/policies/learning_object_policy.rb
index 70dd4d64f957066660dcbf48f3ad5c766f49c2f1..43aaf53e5d6071c87a1d2cebc8b4582ac96197b8 100644
--- a/app/policies/learning_object_policy.rb
+++ b/app/policies/learning_object_policy.rb
@@ -10,7 +10,7 @@ class LearningObjectPolicy < ApplicationPolicy
     def resolve
       if user.nil?
         scope.where(state: 'published')
-      elsif user_can_moderate?
+      elsif user_can_edit?
         scope.all
       else
         scope.where(state: 'published')
@@ -27,7 +27,7 @@ class LearningObjectPolicy < ApplicationPolicy
   end
 
   def publish?
-    record if user_can_curate? && record.submitted?
+    record if user_can_moderate? && record.submitted?
   end
 
   def destroy?
@@ -43,7 +43,7 @@ class LearningObjectPolicy < ApplicationPolicy
   end
 
   def show?
-    return record if record.published? || ( !user.nil? && user_can_moderate? )
+    return record if record.published? || ( !user.nil? && user_can_edit? )
     return record if user == record.publisher
     ## TODO: falta verificar se o +record.publisher+ é uma instituição e +user+ faz parte
     # => return owner.users.include?(user) if owner.is_a?(Institution)  (???)
diff --git a/app/policies/license_policy.rb b/app/policies/license_policy.rb
index de80c911f15fa5ef6c9bac992de8c6ce64dfb9a1..809cd94da40b980385f6ab247259aa2131b1537d 100644
--- a/app/policies/license_policy.rb
+++ b/app/policies/license_policy.rb
@@ -8,14 +8,14 @@ class LicensePolicy < ApplicationPolicy
   end
 
   def create?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def update?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def destroy?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 end
diff --git a/app/policies/mime_type_policy.rb b/app/policies/mime_type_policy.rb
index 1ae25251480b629b8f32ab74fde50b6fa3487fd8..275e8ea1a72c1f79368e30fd1e6297b57c06b99c 100644
--- a/app/policies/mime_type_policy.rb
+++ b/app/policies/mime_type_policy.rb
@@ -8,14 +8,14 @@ class MimeTypePolicy < ApplicationPolicy
   end
 
   def create?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def update?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def destroy?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 end
diff --git a/app/policies/object_type_policy.rb b/app/policies/object_type_policy.rb
index 22633e5495565d96d8e5eecbe6ab746ca09e7c61..979ade3de0f073c28f00319b6e79cc63c582adf9 100644
--- a/app/policies/object_type_policy.rb
+++ b/app/policies/object_type_policy.rb
@@ -8,14 +8,14 @@ class ObjectTypePolicy < ApplicationPolicy
   end
 
   def create?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def update?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def destroy?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 end
diff --git a/app/policies/publisher_policy.rb b/app/policies/publisher_policy.rb
index 24158d58757c5c4930f38ebcb678faa1d0b18fb4..be5c084a0bdfc3883eddb735e873298cf3dac51b 100644
--- a/app/policies/publisher_policy.rb
+++ b/app/policies/publisher_policy.rb
@@ -12,7 +12,7 @@ module PublisherPolicy
     def resolve
       if user.nil?
         scope.where(privacy: 'public')
-      elsif user_can_moderate? || record == user
+      elsif user_can_edit? || record == user
         scope.all
       else
         scope.where(privacy: 'public')
@@ -21,15 +21,15 @@ module PublisherPolicy
   end
 
   def show_all_drafts?
-    record if same_user? || user_can_moderate?
+    record if same_user? || user_can_edit?
   end
 
   def show_liked_learning_objects?
-    record if same_user? || user_can_moderate?
+    record if same_user? || user_can_edit?
   end
 
   def show_liked_collections?
-    record if same_user? || user_can_moderate?
+    record if same_user? || user_can_edit?
   end
 
   def same_user?
diff --git a/app/policies/rating_policy.rb b/app/policies/rating_policy.rb
index bd3c49072adb60883c86d765be2e8926d5f7800e..6a4cce8f4f30ef5de9b5158a0b6a5c77f3f6e813 100644
--- a/app/policies/rating_policy.rb
+++ b/app/policies/rating_policy.rb
@@ -9,14 +9,14 @@ class RatingPolicy < ApplicationPolicy
   end
 
   def create?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def update?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 
   def destroy?
-    record if user_can_moderate?
+    record if user_can_edit?
   end
 end
diff --git a/app/policies/search_policy.rb b/app/policies/search_policy.rb
index 7a3d5808659afaf64f687ceb144b8a5a52782225..6e3df72e4654cf6378e56e4f4aa21a8f5d97cf5e 100644
--- a/app/policies/search_policy.rb
+++ b/app/policies/search_policy.rb
@@ -3,7 +3,7 @@ class SearchPolicy < ApplicationPolicy
     def resolve
       if user.nil?
         scope.where(state: 'published')
-      elsif user_can_moderate?
+      elsif user_can_edit?
         scope.all
       else
         scope.where(state: 'published')
diff --git a/app/policies/submission_policy.rb b/app/policies/submission_policy.rb
index f3c1ced3e0c503282aaf38468d4551d4152f7e79..baaa62c673576ddcd7a7a5117ac2a6c84cfbe570 100644
--- a/app/policies/submission_policy.rb
+++ b/app/policies/submission_policy.rb
@@ -6,7 +6,7 @@ module SubmissionPolicy
 
   def submissions?
     return false if user.nil?
-    record if user_can_curate?
+    record if user_can_moderate?
   end
 
 end
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index 1deecdaa6cceb05152e697ad2d39b25499c86dda..cb263c1dccf49e95da9f6dea57d1d9912a03de32 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -21,21 +21,21 @@ class UserPolicy < ApplicationPolicy
   end
 
   def own_reviews?
-    record if same_user? || user_can_moderate?
+    record if same_user? || user_can_edit?
   end
 
   def received_reviews?
-    record if same_user? || user_can_moderate?
+    record if same_user? || user_can_edit?
   end
 
   def authorized_user?
     return false if ( record.is_admin? && !user.is_admin? )
-    if ( record.is_moderator? )
+    if ( record.is_editor? )
       if !( same_user? || user.is_admin? )
         return false
       end
     end
-    user_can_moderate?
+    user_can_edit?
   end
 
   def same_user?
diff --git a/app/policies/welcome_policy.rb b/app/policies/welcome_policy.rb
index 5062601c3ce3c61f9f2c9c409dd275d8965f7b95..7f9d76bcab73d09dc5f4ca23809f30b2dcc33ac7 100644
--- a/app/policies/welcome_policy.rb
+++ b/app/policies/welcome_policy.rb
@@ -1,7 +1,7 @@
 class WelcomePolicy < ApplicationPolicy
   class Scope < Scope
     def resolve
-      if user_can_moderate?
+      if user_can_edit?
         scope.all
       else
         scope.where(state: 'published')
diff --git a/app/serializers/collection_item_serializer.rb b/app/serializers/collection_item_serializer.rb
index 5bb19b6e93ff72cc1afd1059f2fa57c4f2197c3f..4f843f78748f53adbdc4226186d463291d2b59c0 100644
--- a/app/serializers/collection_item_serializer.rb
+++ b/app/serializers/collection_item_serializer.rb
@@ -4,7 +4,7 @@ class CollectionItemSerializer < ActiveModel::Serializer
   def collectionable
     if ( object.collectionable_type == "LearningObject" )
     	serializer = ::LearningObjectSerializer
-    elsif ( object.public? || (current_user && ( object.owner?(current_user) || current_user.can_moderate? )) )
+    elsif ( object.public? || (current_user && ( object.owner?(current_user) || current_user.can_edit? )) )
     	serializer = ::CollectionMinSerializer
     end