diff --git a/CREDITS.md b/CREDITS.md
index fd9a3d7bde3..32d516e59ad 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -343,34 +343,34 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 
 # 💻 Development
 
-## Server Owner/Administrator
+## Server Developers
 - pancakes aka patapancakes
 
-## Senior Developers
-- Walker
-- NightKev
-- Moka
-- Temp aka Tempo-anon
-- Madmadness65
-
-## Developers
+## Current and former Development Team members
+- bennybroseph
+- Brain Frog
 - CodeTappert
 - flx-sta
-- innerthunder
 - frutescens
+- Greenlamp
+- ImperialSympathizer
+- innerthunder
+- KimJeongSun
+- Madmadness65
+- Moka
+- NightKev
 - Opaquer
 - SN34KZ
 - Swain aka torranx
-
-## Junior Developers
-- KimJeongSun
-- ImperialSympathizer
+- Temp aka Tempo-anon
+- Walker
+- Xavion
 
 ## Bug/Issue Managers
-- Snailman
 - Daleks
 - Lily
 - PigeonBar
+- Snailman
 
 ## Other Code Contributors
 - Admiral-Billy
@@ -378,8 +378,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - arColm
 - Arxalc
 - AsdarDevelops
-- bennybroseph
-- Brain Frog
 - Corrade
 - Dakurei
 - DustinLin
@@ -391,7 +389,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - francktrouillez
 - FredeX
 - geeilhan
-- Greenlamp
 - happinyz
 - hayuna
 - InfernoVulpix