diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py
index 328b09a6cf7..edff95d9ab8 100644
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -1163,14 +1163,14 @@ class InterfaceTypeChoices(ChoiceSet):
             (
                 (TYPE_1GE_BX10_D, '1000BASE-BX10-D (1GE BiDi Down)'),
                 (TYPE_1GE_BX10_U, '1000BASE-BX10-U (1GE BiDi Up)'),
-                (TYPE_1GE_CX, '1000BASE-CX (1GE DAC)'),
                 (TYPE_1GE_CWDM, '1000BASE-CWDM (1GE)'),
+                (TYPE_1GE_CX, '1000BASE-CX (1GE DAC)'),
                 (TYPE_1GE_DWDM, '1000BASE-DWDM (1GE)'),
                 (TYPE_1GE_EX, '1000BASE-EX (1GE)'),
-                (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'),
                 (TYPE_1GE_LSX, '1000BASE-LSX (1GE)'),
                 (TYPE_1GE_LX_FIXED, '1000BASE-LX (1GE)'),
                 (TYPE_1GE_LX10, '1000BASE-LX10/LH (1GE)'),
+                (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'),
                 (TYPE_1GE_FIXED, '1000BASE-T (1GE)'),
                 (TYPE_1GE_TX_FIXED, '1000BASE-TX (1GE)'),
                 (TYPE_1GE_ZX, '1000BASE-ZX (1GE)'),
@@ -1186,8 +1186,8 @@ class InterfaceTypeChoices(ChoiceSet):
         (
             _('10 Gbps Ethernet'),
             (
-                (TYPE_10GE_BR_D, '10GBASE-DR-D (10GE BiDi Down)'),
-                (TYPE_10GE_BR_U, '10GBASE-DR-U (10GE BiDi Up)'),
+                (TYPE_10GE_BR_D, '10GBASE-BR-D (10GE BiDi Down)'),
+                (TYPE_10GE_BR_U, '10GBASE-BR-U (10GE BiDi Up)'),
                 (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'),
                 (TYPE_10GE_ER, '10GBASE-ER (10GE)'),
                 (TYPE_10GE_LR, '10GBASE-LR (10GE)'),
@@ -1235,6 +1235,7 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_100GE_CR2, '100GBASE-CR2 (100GE DAC)'),
                 (TYPE_100GE_CR4, '100GBASE-CR4 (100GE DAC)'),
                 (TYPE_100GE_CR10, '100GBASE-CR10 (100GE DAC)'),
+                (TYPE_100GE_CWDM4, '100GBASE-CWDM4 (100GE)'),
                 (TYPE_100GE_DR, '100GBASE-DR (100GE)'),
                 (TYPE_100GE_ER4, '100GBASE-ER4 (100GE)'),
                 (TYPE_100GE_FR1, '100GBASE-FR1 (100GE)'),
@@ -1253,12 +1254,12 @@ class InterfaceTypeChoices(ChoiceSet):
             (
                 (TYPE_200GE_CR2, '200GBASE-CR2 (200GE)'),
                 (TYPE_200GE_CR4, '200GBASE-CR4 (200GE)'),
-                (TYPE_200GE_SR2, '200GBASE-SR2 (200GE)'),
-                (TYPE_200GE_SR4, '200GBASE-SR4 (200GE)'),
                 (TYPE_200GE_DR4, '200GBASE-DR4 (200GE)'),
                 (TYPE_200GE_ER4, '200GBASE-ER4 (200GE)'),
                 (TYPE_200GE_FR4, '200GBASE-FR4 (200GE)'),
                 (TYPE_200GE_LR4, '200GBASE-LR4 (200GE)'),
+                (TYPE_200GE_SR2, '200GBASE-SR2 (200GE)'),
+                (TYPE_200GE_SR4, '200GBASE-SR4 (200GE)'),
                 (TYPE_200GE_VR2, '200GBASE-VR2 (200GE)'),
             )
         ),
@@ -1296,34 +1297,34 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_1GE_GBIC, 'GBIC (1GE)'),
                 (TYPE_1GE_SFP, 'SFP (1GE)'),
                 (TYPE_10GE_SFP_PLUS, 'SFP+ (10GE)'),
-                (TYPE_10GE_XFP, 'XFP (10GE)'),
                 (TYPE_10GE_XENPAK, 'XENPAK (10GE)'),
+                (TYPE_10GE_XFP, 'XFP (10GE)'),
                 (TYPE_10GE_X2, 'X2 (10GE)'),
                 (TYPE_25GE_SFP28, 'SFP28 (25GE)'),
-                (TYPE_50GE_SFP56, 'SFP56 (50GE)'),
                 (TYPE_40GE_QSFP_PLUS, 'QSFP+ (40GE)'),
                 (TYPE_50GE_QSFP28, 'QSFP28 (50GE)'),
+                (TYPE_50GE_SFP56, 'SFP56 (50GE)'),
                 (TYPE_100GE_CFP, 'CFP (100GE)'),
                 (TYPE_100GE_CFP2, 'CFP2 (100GE)'),
-                (TYPE_200GE_CFP2, 'CFP2 (200GE)'),
-                (TYPE_400GE_CFP2, 'CFP2 (400GE)'),
                 (TYPE_100GE_CFP4, 'CFP4 (100GE)'),
                 (TYPE_100GE_CXP, 'CXP (100GE)'),
                 (TYPE_100GE_CPAK, 'Cisco CPAK (100GE)'),
                 (TYPE_100GE_DSFP, 'DSFP (100GE)'),
-                (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'),
                 (TYPE_100GE_QSFP28, 'QSFP28 (100GE)'),
                 (TYPE_100GE_QSFP_DD, 'QSFP-DD (100GE)'),
+                (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'),
+                (TYPE_200GE_CFP2, 'CFP2 (200GE)'),
                 (TYPE_200GE_QSFP56, 'QSFP56 (200GE)'),
                 (TYPE_200GE_QSFP_DD, 'QSFP-DD (200GE)'),
                 (TYPE_400GE_QSFP112, 'QSFP112 (400GE)'),
                 (TYPE_400GE_QSFP_DD, 'QSFP-DD (400GE)'),
-                (TYPE_400GE_OSFP, 'OSFP (400GE)'),
-                (TYPE_400GE_OSFP_RHS, 'OSFP-RHS (400GE)'),
                 (TYPE_400GE_CDFP, 'CDFP (400GE)'),
+                (TYPE_400GE_CFP2, 'CFP2 (400GE)'),
                 (TYPE_400GE_CFP8, 'CPF8 (400GE)'),
-                (TYPE_800GE_QSFP_DD, 'QSFP-DD (800GE)'),
+                (TYPE_400GE_OSFP, 'OSFP (400GE)'),
+                (TYPE_400GE_OSFP_RHS, 'OSFP-RHS (400GE)'),
                 (TYPE_800GE_OSFP, 'OSFP (800GE)'),
+                (TYPE_800GE_QSFP_DD, 'QSFP-DD (800GE)'),
             )
         ),
         (