diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py
index 2acd98801b1..12b0dae18f1 100644
--- a/netbox/dcim/models/devices.py
+++ b/netbox/dcim/models/devices.py
@@ -1298,6 +1298,7 @@ def save(self, *args, **kwargs):
             else:
                 # ModuleBays must be saved individually for MPTT
                 for instance in create_instances:
+                    instance.name = instance.name.replace(MODULE_TOKEN, str(self.module_bay.position))
                     instance.save()
 
             update_fields = ['module']