diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 58414344ca..f18ea32b6c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -2284,3 +2284,13 @@ Entries:
   - {message: unbreak pulling prediction, type: Fix}
   id: 407
   time: '2021-10-05T21:51:34.0000000+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fix being able to trap admin ghosts on lockers., type: Fix}
+  id: 408
+  time: '2021-10-06T09:58:02.819938+00:00'
+- author: Zumorica
+  changes:
+  - {message: Fix ghosts having empty names under certain conditions., type: Fix}
+  id: 409
+  time: '2021-10-06T09:58:02.820744+00:00'
diff --git a/Resources/Changelog/Parts/aghost.yml b/Resources/Changelog/Parts/aghost.yml
deleted file mode 100644
index dd42c6509f..0000000000
--- a/Resources/Changelog/Parts/aghost.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zumorica
-changes:
-  - type: Fix # One of the following: Add, Remove, Tweak, Fix
-    message: Fix being able to trap admin ghosts on lockers.
diff --git a/Resources/Changelog/Parts/ghost.yml b/Resources/Changelog/Parts/ghost.yml
deleted file mode 100644
index 768cc83c74..0000000000
--- a/Resources/Changelog/Parts/ghost.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Zumorica
-changes:
-  - type: Fix # One of the following: Add, Remove, Tweak, Fix
-    message: Fix ghosts having empty names under certain conditions.