diff --git a/netbox/dcim/migrations/0189_devicebay_module_devicebaytemplate_module_type_and_more.py b/netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py
similarity index 87%
rename from netbox/dcim/migrations/0189_devicebay_module_devicebaytemplate_module_type_and_more.py
rename to netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py
index 6cd8001d2..9958eebd1 100644
--- a/netbox/dcim/migrations/0189_devicebay_module_devicebaytemplate_module_type_and_more.py
+++ b/netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.7 on 2024-07-23 10:07
+# Generated by Django 5.0.7 on 2024-07-23 10:12
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AddField(
-            model_name='devicebay',
+            model_name='modulebay',
             name='module',
             field=models.ForeignKey(
                 blank=True,
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.AddField(
-            model_name='devicebaytemplate',
+            model_name='modulebaytemplate',
             name='module_type',
             field=models.ForeignKey(
                 blank=True,
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.AlterField(
-            model_name='devicebaytemplate',
+            model_name='modulebaytemplate',
             name='device_type',
             field=models.ForeignKey(
                 blank=True,
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 46cb2bbe2..bad9ee09b 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -628,7 +628,7 @@ class RearPortTemplate(ModularComponentTemplateModel):
         }
 
 
-class ModuleBayTemplate(ComponentTemplateModel):
+class ModuleBayTemplate(ModularComponentTemplateModel):
     """
     A template for a ModuleBay to be created for a new parent Device.
     """
@@ -663,7 +663,7 @@ class ModuleBayTemplate(ComponentTemplateModel):
         }
 
 
-class DeviceBayTemplate(ModularComponentTemplateModel):
+class DeviceBayTemplate(ComponentTemplateModel):
     """
     A template for a DeviceBay to be created for a new parent Device.
     """
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 80533eeae..a34b7706e 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -1087,7 +1087,7 @@ class RearPort(ModularComponentModel, CabledObjectModel, TrackingModelMixin):
 # Bays
 #
 
-class ModuleBay(ComponentModel, TrackingModelMixin):
+class ModuleBay(ModularComponentModel, TrackingModelMixin):
     """
     An empty space within a Device which can house a child device
     """
@@ -1108,7 +1108,7 @@ class ModuleBay(ComponentModel, TrackingModelMixin):
         return reverse('dcim:modulebay', kwargs={'pk': self.pk})
 
 
-class DeviceBay(ModularComponentModel, TrackingModelMixin):
+class DeviceBay(ComponentModel, TrackingModelMixin):
     """
     An empty space within a Device which can house a child device
     """