diff --git a/app/mashup/UserInfo.scala b/app/mashup/UserInfo.scala
index a3950d971c..8de3fa7f0e 100644
--- a/app/mashup/UserInfo.scala
+++ b/app/mashup/UserInfo.scala
@@ -168,7 +168,7 @@ object UserInfo {
               Granter(_.PublicMod)(user),
               Granter(_.Developer)(user),
               Granter(_.Verified)(user),
-              Granter(_.Creator)(user)
+              Granter(_.ContentTeam)(user)
             ),
             shields = shields,
             revolutions = revols,
diff --git a/bin/mongodb/create-trophy-kinds.js b/bin/mongodb/create-trophy-kinds.js
index b0f74a8550..c86fa30d27 100644
--- a/bin/mongodb/create-trophy-kinds.js
+++ b/bin/mongodb/create-trophy-kinds.js
@@ -91,11 +91,11 @@ db.trophyKind.insert({
   withCustomImage: false,
 });
 db.trophyKind.insert({
-  _id: 'creator',
-  name: 'Lichess content creator',
+  _id: 'contentTeam',
+  name: 'Lichess Content Team',
   icon: '', 
   klass: 'icon3d',
-  order: NumberInt(103), // find number int
+  order: NumberInt(103),
   withCustomImage: false,
 });
 db.trophyKind.insert({
diff --git a/bin/mongodb/update-trophy-kinds.js b/bin/mongodb/update-trophy-kinds.js
index f132a3fc7f..d67b0438e1 100644
--- a/bin/mongodb/update-trophy-kinds.js
+++ b/bin/mongodb/update-trophy-kinds.js
@@ -7,6 +7,6 @@ const newIcons = {
   developer: '',
   moderator: '',
   verified: '',
-  creator: '',
+  contentTeam: '',
 };
 Object.keys(newIcons).forEach(id => db.trophyKind.update({ _id: id }, { $set: { icon: newIcons[id] } }));
diff --git a/modules/security/src/main/Permission.scala b/modules/security/src/main/Permission.scala
index 0f2f48db77..547f7a5433 100644
--- a/modules/security/src/main/Permission.scala
+++ b/modules/security/src/main/Permission.scala
@@ -50,7 +50,7 @@ object Permission {
   case object ChangePermission      extends Permission("CHANGE_PERMISSION", "Change permissions")
   case object PublicMod             extends Permission("PUBLIC_MOD", "Mod badge")
   case object Developer             extends Permission("DEVELOPER", "Developer badge")
-  case object Creator               extends Permission("CREATOR", "Creator badge")
+  case object ContentTeam           extends Permission("CONTENT_TEAM", "Content Team badge")
   case object Coach                 extends Permission("COACH", "Is a coach")
   case object Teacher               extends Permission("TEACHER", "Is a class teacher")
   case object ModNote               extends Permission("MOD_NOTE", "Mod notes")
@@ -248,7 +248,7 @@ object Permission {
       Developer,
       PublicMod,
       Verified,
-      Creator
+      ContentTeam
     ),
     "Package" -> List(
       LichessTeam,
@@ -265,7 +265,7 @@ object Permission {
   }.toSet
 
   lazy val nonModPermissions: Set[Permission] =
-    Set(Beta, Prismic, Coach, Teacher, Developer, Verified, Creator, ApiHog, Relay)
+    Set(Beta, Prismic, Coach, Teacher, Developer, Verified, ContentTeam, ApiHog, Relay)
 
   lazy val modPermissions: Set[Permission] = all diff nonModPermissions
 
diff --git a/modules/user/src/main/Trophy.scala b/modules/user/src/main/Trophy.scala
index 6ee733086b..982b9babc9 100644
--- a/modules/user/src/main/Trophy.scala
+++ b/modules/user/src/main/Trophy.scala
@@ -36,7 +36,7 @@ object TrophyKind {
   val moderator              = "moderator"
   val developer              = "developer"
   val verified               = "verified"
-  val creator                = "creator"
+  val contentTeam            = "contentTeam"
   val zugMiracle             = "zugMiracle"
 
   object Unknown
diff --git a/modules/user/src/main/TrophyApi.scala b/modules/user/src/main/TrophyApi.scala
index 7b1d310ef6..3a091a4ab4 100644
--- a/modules/user/src/main/TrophyApi.scala
+++ b/modules/user/src/main/TrophyApi.scala
@@ -35,7 +35,7 @@ final class TrophyApi(
   def findByUser(user: User, max: Int = 50): Fu[List[Trophy]] =
     coll.list[Trophy]($doc("user" -> user.id), max).map(_.filter(_.kind != TrophyKind.Unknown))
 
-  def roleBasedTrophies(user: User, isPublicMod: Boolean, isDev: Boolean, isVerified: Boolean, isCreator: Boolean): List[Trophy] =
+  def roleBasedTrophies(user: User, isPublicMod: Boolean, isDev: Boolean, isVerified: Boolean, isContentTeam: Boolean): List[Trophy] =
     List(
       isPublicMod option Trophy(
         _id = "",
@@ -58,10 +58,10 @@ final class TrophyApi(
         date = org.joda.time.DateTime.now,
         url = none
       ),
-      isCreator option Trophy(
+      isContentTeam option Trophy(
         _id = "",
         user = user.id,
-        kind = kindCache sync TrophyKind.creator,
+        kind = kindCache sync TrophyKind.contentTeam,
         date = org.joda.time.DateTime.now,
         url = none
       )