diff --git a/jarvis/cogs/admin/roleping.py b/jarvis/cogs/admin/roleping.py
index f17b54a..283f3eb 100644
--- a/jarvis/cogs/admin/roleping.py
+++ b/jarvis/cogs/admin/roleping.py
@@ -31,7 +31,7 @@ class RolepingCog(CacheCog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _roleping_add(self, ctx: SlashContext, role: Role):
         roleping = Roleping.get(guild=ctx.guild.id, role=role.id)
         if not roleping:
@@ -65,7 +65,7 @@ class RolepingCog(CacheCog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _roleping_remove(self, ctx: SlashContext, role: Role):
         roleping = Roleping.get(guild=ctx.guild.id, role=role.id)
         if not roleping:
@@ -195,7 +195,7 @@ class RolepingCog(CacheCog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _roleping_bypass_user(
         self, ctx: SlashContext, user: Member, rping: Role
     ):
@@ -258,7 +258,7 @@ class RolepingCog(CacheCog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _roleping_bypass_role(
         self, ctx: SlashContext, role: Role, rping: Role
     ):
@@ -307,7 +307,7 @@ class RolepingCog(CacheCog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _roleping_restore_user(
         self, ctx: SlashContext, user: Member, rping: Role
     ):
@@ -350,7 +350,7 @@ class RolepingCog(CacheCog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _roleping_restore_role(
         self, ctx: SlashContext, role: Role, rping: Role
     ):
diff --git a/jarvis/cogs/admin/warning.py b/jarvis/cogs/admin/warning.py
index da37235..cb424eb 100644
--- a/jarvis/cogs/admin/warning.py
+++ b/jarvis/cogs/admin/warning.py
@@ -42,7 +42,7 @@ class WarningCog(CacheCog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _warn(
         self, ctx: SlashContext, user: User, reason: str, duration: int = 24
     ):
@@ -100,7 +100,7 @@ class WarningCog(CacheCog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _warnings(self, ctx: SlashContext, user: User, active: bool = 1):
         active = bool(active)
         exists = self.check_cache(ctx, user_id=user.id, active=active)
diff --git a/jarvis/cogs/autoreact.py b/jarvis/cogs/autoreact.py
index 1291c48..10aa5b9 100644
--- a/jarvis/cogs/autoreact.py
+++ b/jarvis/cogs/autoreact.py
@@ -29,7 +29,7 @@ class AutoReactCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _autoreact_create(self, ctx: SlashContext, channel: TextChannel):
         if not isinstance(channel, TextChannel):
             await ctx.send("Channel must be a text channel", hidden=True)
@@ -63,7 +63,7 @@ class AutoReactCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _autoreact_delete(self, ctx, channel: TextChannel):
         exists = Autoreact.get(guild=ctx.guild.id, channel=channel.id).delete()
         if exists:
@@ -92,7 +92,7 @@ class AutoReactCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _autoreact_add(self, ctx, channel: TextChannel, emote: str):
         await ctx.defer()
         custom_emoji = self.custom_emote.match(emote)
@@ -154,7 +154,7 @@ class AutoReactCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _autoreact_remove(self, ctx, channel: TextChannel, emote: str):
         exists = Autoreact.get(guild=ctx.guild.id, channel=channel.id)
         if not exists:
@@ -187,7 +187,7 @@ class AutoReactCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _autoreact_list(self, ctx, channel: TextChannel):
         exists = Autoreact.get(guild=ctx.guild.id, channel=channel.id)
         if not exists:
diff --git a/jarvis/cogs/rolegiver.py b/jarvis/cogs/rolegiver.py
index 2ddc932..a9b77de 100644
--- a/jarvis/cogs/rolegiver.py
+++ b/jarvis/cogs/rolegiver.py
@@ -26,7 +26,7 @@ class RolegiverCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _rolegiver_add(self, ctx: SlashContext, role: Role):
         setting = Setting.get(guild=ctx.guild.id, setting="rolegiver")
         if setting and role.id in setting.value:
@@ -83,7 +83,7 @@ class RolegiverCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _rolegiver_remove(self, ctx: SlashContext, role: Role):
         setting = Setting.get(guild=ctx.guild.id, setting="rolegiver")
         if not setting or (setting and not setting.value):
diff --git a/jarvis/cogs/settings.py b/jarvis/cogs/settings.py
index 530c15c..814b101 100644
--- a/jarvis/cogs/settings.py
+++ b/jarvis/cogs/settings.py
@@ -30,7 +30,7 @@ class SettingsCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _mute(self, ctx, role: Role):
         await ctx.defer()
         self.update_settings("mute", role.id, ctx.guild.id)
@@ -49,7 +49,7 @@ class SettingsCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _modlog(self, ctx, channel: TextChannel):
         if not isinstance(channel, TextChannel):
             await ctx.send("Channel must be a TextChannel", hidden=True)
@@ -72,7 +72,7 @@ class SettingsCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _userlog(self, ctx, channel: TextChannel):
         if not isinstance(channel, TextChannel):
             await ctx.send("Channel must be a TextChannel", hidden=True)
@@ -95,7 +95,7 @@ class SettingsCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _massmention(self, ctx, amount: int):
         await ctx.defer()
         self.update_settings("massmention", amount, ctx.guild.id)
@@ -114,7 +114,7 @@ class SettingsCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _verified(self, ctx, role: Role):
         await ctx.defer()
         self.update_settings("verified", role.id, ctx.guild.id)
@@ -133,7 +133,7 @@ class SettingsCog(commands.Cog):
             )
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _unverified(self, ctx, role: Role):
         await ctx.defer()
         self.update_settings("unverified", role.id, ctx.guild.id)
diff --git a/jarvis/cogs/starboard.py b/jarvis/cogs/starboard.py
index e7f2604..eba9678 100644
--- a/jarvis/cogs/starboard.py
+++ b/jarvis/cogs/starboard.py
@@ -25,7 +25,7 @@ class StarboardCog(commands.Cog):
         name="list",
         description="Lists all Starboards",
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _list(self, ctx):
         starboards = Starboard.get_many(guild=ctx.guild.id)
         if starboards != []:
@@ -49,7 +49,7 @@ class StarboardCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _create(self, ctx, channel: TextChannel):
         if channel not in ctx.guild.channels:
             await ctx.send(
@@ -89,7 +89,7 @@ class StarboardCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _delete(self, ctx, channel: TextChannel):
         deleted = Starboard.get(
             channel=channel.id, guild=ctx.guild.id
@@ -130,7 +130,7 @@ class StarboardCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _star_add(
         self,
         ctx: SlashContext,
@@ -241,7 +241,7 @@ class StarboardCog(commands.Cog):
             ),
         ],
     )
-    @admin_or_permissions(manage_server=True)
+    @admin_or_permissions(manage_guild=True)
     async def _star_delete(
         self,
         ctx: SlashContext,