diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
index f24ff8fa512..6fbc1426515 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: PrideDrobeAds
-  advertisements:
+  messages:
   - advertisement-pride-1
   - advertisement-pride-2
-  - advertisement-pride-3
\ No newline at end of file
+  - advertisement-pride-3
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
index ae0df3d17c1..83044c1ad5e 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
@@ -1,5 +1,5 @@
-- type: advertisementsPack
+- type: messagePack
   id: MailDrobeAds
-  advertisements:
+  messages:
     - advertisement-maildrobe-1
-    - advertisement-maildrobe-2
\ No newline at end of file
+    - advertisement-maildrobe-2
diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/bloodculthumanoidmob.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/bloodculthumanoidmob.yml
index a8f71f79ed1..42b283ecabd 100644
--- a/Resources/Prototypes/_NF/Catalog/NPCsChatter/bloodculthumanoidmob.yml
+++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/bloodculthumanoidmob.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: bloodcultisthumanoidchatter
-  advertisements:
+  messages:
     - advertisement-bloodcultisthumanoid-1
     - advertisement-bloodcultisthumanoid-2
     - advertisement-bloodcultisthumanoid-3
@@ -20,4 +20,4 @@
     - advertisement-bloodcultisthumanoid-17
     - advertisement-bloodcultisthumanoid-18
     - advertisement-bloodcultisthumanoid-19
-    - advertisement-bloodcultisthumanoid-20 
+    - advertisement-bloodcultisthumanoid-20
diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml
index 061f882d1b1..dd3e42efeea 100644
--- a/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml
+++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: mimehumanoidchatter
-  advertisements:
+  messages:
     - advertisement-mimehumanoid-1
     - advertisement-mimehumanoid-2
     - advertisement-mimehumanoid-3
@@ -20,4 +20,4 @@
     - advertisement-mimehumanoid-17
     - advertisement-mimehumanoid-18
     - advertisement-mimehumanoid-19
-    - advertisement-mimehumanoid-20 
+    - advertisement-mimehumanoid-20
diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/syndicatehumanoidmob.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/syndicatehumanoidmob.yml
index fc1ac938fc7..7d971a92a55 100644
--- a/Resources/Prototypes/_NF/Catalog/NPCsChatter/syndicatehumanoidmob.yml
+++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/syndicatehumanoidmob.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: syndicatehumanoidchatter
-  advertisements:
+  messages:
     - advertisement-syndicatehumanoid-1
     - advertisement-syndicatehumanoid-2
     - advertisement-syndicatehumanoid-3
@@ -20,4 +20,4 @@
     - advertisement-syndicatehumanoid-17
     - advertisement-syndicatehumanoid-18
     - advertisement-syndicatehumanoid-19
-    - advertisement-syndicatehumanoid-20 
+    - advertisement-syndicatehumanoid-20
diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/wizardhumanoidmob.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/wizardhumanoidmob.yml
index 45963432969..4fb01c68d03 100644
--- a/Resources/Prototypes/_NF/Catalog/NPCsChatter/wizardhumanoidmob.yml
+++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/wizardhumanoidmob.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: wizardhumanoidchatter
-  advertisements:
+  messages:
     - advertisement-wizardhumanoid-1
     - advertisement-wizardhumanoid-2
     - advertisement-wizardhumanoid-3
@@ -20,4 +20,4 @@
     - advertisement-wizardhumanoid-17
     - advertisement-wizardhumanoid-18
     - advertisement-wizardhumanoid-19
-    - advertisement-wizardhumanoid-20 
+    - advertisement-wizardhumanoid-20
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml
index af94fe188ae..d0c44149636 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: ArcadiaDrobeAds
-  advertisements:
+  messages:
     - advertisement-arcadiadrobe-1
     - advertisement-arcadiadrobe-2
     - advertisement-arcadiadrobe-3
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astrovend.yml
index b44f1abd63d..0e7fb3e9d19 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astrovend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astrovend.yml
@@ -1,5 +1,5 @@
-- type: advertisementsPack
+- type: messagePack
   id: AstroVendAds
-  advertisements:
+  messages:
     - advertisement-astrovend-1
-    - advertisement-astrovend-2
\ No newline at end of file
+    - advertisement-astrovend-2
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml
index b74f4cef0ce..b5f284ff4a2 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: CuddlyCritterAds
-  advertisements:
+  messages:
     - advertisement-cuddlycritter-1
     - advertisement-cuddlycritter-2
     - advertisement-cuddlycritter-3
@@ -8,4 +8,4 @@
     - advertisement-cuddlycritter-5
     - advertisement-cuddlycritter-6
     - advertisement-cuddlycritter-7
-    - advertisement-cuddlycritter-8
\ No newline at end of file
+    - advertisement-cuddlycritter-8
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml
index 8ac32fbf921..9a6889f043f 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: LessLethalVendAds
-  advertisements:
+  messages:
     - advertisement-lesslethalvend-1
     - advertisement-lesslethalvend-2
     - advertisement-lesslethalvend-3
@@ -20,4 +20,4 @@
     - advertisement-lesslethalvend-17
     - advertisement-lesslethalvend-18
     - advertisement-lesslethalvend-19
-    - advertisement-lesslethalvend-20 
+    - advertisement-lesslethalvend-20
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml
index b69f8adbe15..4c58363de47 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: NFSDDrobeAds
-  advertisements:
+  messages:
     - advertisement-nfsddrobe-1
     - advertisement-nfsddrobe-2
     - advertisement-nfsddrobe-3