diff --git a/device-types/Commscope/MFPS-KHD-P-SIL1-048.yaml b/device-types/Commscope/MFPS-KHD-P-SIL1-048.yaml
index 28cec32b1..96b82cc4a 100644
--- a/device-types/Commscope/MFPS-KHD-P-SIL1-048.yaml
+++ b/device-types/Commscope/MFPS-KHD-P-SIL1-048.yaml
@@ -10,220 +10,220 @@ airflow: passive
 comments: '[Commscope MFPS-KHD-P-SIL1-048](https://www.commscope.com/globalassets/digizuite/149234-p360-eh6592-000-external.pdf)'
 is_powered: false
 front-ports:
-  - name: '1-2'
+  - name: 1-2
     type: lc-apc
-    label: '001-002'
+    label: 001-002
     color: 70d975
-    rear_port: '1-2'
+    rear_port: 1-2
     rear_port_position: 1
-  - name: '3-4'
+  - name: 3-4
     type: lc-apc
-    label: '003-004'
+    label: 003-004
     color: 70d975
-    rear_port: '3-4'
+    rear_port: 3-4
     rear_port_position: 1
-  - name: '5-6'
+  - name: 5-6
     type: lc-apc
-    label: '005-006'
+    label: 005-006
     color: 70d975
-    rear_port: '5-6'
+    rear_port: 5-6
     rear_port_position: 1
-  - name: '7-8'
+  - name: 7-8
     type: lc-apc
-    label: '007-008'
+    label: 007-008
     color: 70d975
-    rear_port: '7-8'
+    rear_port: 7-8
     rear_port_position: 1
-  - name: '9-10'
+  - name: 9-10
     type: lc-apc
-    label: '009-010'
+    label: 009-010
     color: 70d975
-    rear_port: '9-10'
+    rear_port: 9-10
     rear_port_position: 1
-  - name: '11-12'
+  - name: 11-12
     type: lc-apc
-    label: '011-012'
+    label: 011-012
     color: 70d975
-    rear_port: '11-12'
+    rear_port: 11-12
     rear_port_position: 1
-  - name: '13-14'
+  - name: 13-14
     type: lc-apc
-    label: '013-014'
+    label: 013-014
     color: 70d975
-    rear_port: '13-14'
+    rear_port: 13-14
     rear_port_position: 1
-  - name: '15-16'
+  - name: 15-16
     type: lc-apc
-    label: '015-016'
+    label: 015-016
     color: 70d975
-    rear_port: '15-16'
+    rear_port: 15-16
     rear_port_position: 1
-  - name: '17-18'
+  - name: 17-18
     type: lc-apc
-    label: '017-018'
+    label: 017-018
     color: 70d975
-    rear_port: '17-18'
+    rear_port: 17-18
     rear_port_position: 1
-  - name: '19-20'
+  - name: 19-20
     type: lc-apc
-    label: '019-020'
+    label: 019-020
     color: 70d975
-    rear_port: '19-20'
+    rear_port: 19-20
     rear_port_position: 1
-  - name: '21-22'
+  - name: 21-22
     type: lc-apc
-    label: '021-022'
+    label: 021-022
     color: 70d975
-    rear_port: '21-22'
+    rear_port: 21-22
     rear_port_position: 1
-  - name: '23-24'
+  - name: 23-24
     type: lc-apc
-    label: '023-024'
+    label: 023-024
     color: 70d975
-    rear_port: '23-24'
+    rear_port: 23-24
     rear_port_position: 1
-  - name: '25-26'
+  - name: 25-26
     type: lc-apc
-    label: '025-026'
+    label: 025-026
     color: 70d975
-    rear_port: '25-26'
+    rear_port: 25-26
     rear_port_position: 1
-  - name: '27-28'
+  - name: 27-28
     type: lc-apc
-    label: '027-028'
+    label: 027-028
     color: 70d975
-    rear_port: '27-28'
+    rear_port: 27-28
     rear_port_position: 1
-  - name: '29-30'
+  - name: 29-30
     type: lc-apc
-    label: '029-030'
+    label: 029-030
     color: 70d975
-    rear_port: '29-30'
+    rear_port: 29-30
     rear_port_position: 1
-  - name: '31-32'
+  - name: 31-32
     type: lc-apc
-    label: '031-032'
+    label: 031-032
     color: 70d975
-    rear_port: '31-32'
+    rear_port: 31-32
     rear_port_position: 1
-  - name: '33-34'
+  - name: 33-34
     type: lc-apc
-    label: '033-034'
+    label: 033-034
     color: 70d975
-    rear_port: '33-34'
+    rear_port: 33-34
     rear_port_position: 1
-  - name: '35-36'
+  - name: 35-36
     type: lc-apc
-    label: '035-036'
+    label: 035-036
     color: 70d975
-    rear_port: '35-36'
+    rear_port: 35-36
     rear_port_position: 1
-  - name: '37-38'
+  - name: 37-38
     type: lc-apc
-    label: '037-038'
+    label: 037-038
     color: 70d975
-    rear_port: '37-38'
+    rear_port: 37-38
     rear_port_position: 1
-  - name: '39-40'
+  - name: 39-40
     type: lc-apc
-    label: '039-040'
+    label: 039-040
     color: 70d975
-    rear_port: '39-40'
+    rear_port: 39-40
     rear_port_position: 1
-  - name: '41-42'
+  - name: 41-42
     type: lc-apc
-    label: '041-042'
+    label: 041-042
     color: 70d975
-    rear_port: '41-42'
+    rear_port: 41-42
     rear_port_position: 1
-  - name: '43-44'
+  - name: 43-44
     type: lc-apc
-    label: '043-044'
+    label: 043-044
     color: 70d975
-    rear_port: '43-44'
+    rear_port: 43-44
     rear_port_position: 1
-  - name: '45-46'
+  - name: 45-46
     type: lc-apc
-    label: '045-046'
+    label: 045-046
     color: 70d975
-    rear_port: '45-46'
+    rear_port: 45-46
     rear_port_position: 1
-  - name: '47-48'
+  - name: 47-48
     type: lc-apc
-    label: '047-048'
+    label: 047-048
     color: 70d975
-    rear_port: '47-48'
+    rear_port: 47-48
     rear_port_position: 1
 rear-ports:
-  - name: '1-2'
+  - name: 1-2
     type: splice
     positions: 1
-  - name: '3-4'
+  - name: 3-4
     type: splice
     positions: 1
-  - name: '5-6'
+  - name: 5-6
     type: splice
     positions: 1
-  - name: '7-8'
+  - name: 7-8
     type: splice
     positions: 1
-  - name: '9-10'
+  - name: 9-10
     type: splice
     positions: 1
-  - name: '11-12'
+  - name: 11-12
     type: splice
     positions: 1
-  - name: '13-14'
+  - name: 13-14
     type: splice
     positions: 1
-  - name: '15-16'
+  - name: 15-16
     type: splice
     positions: 1
-  - name: '17-18'
+  - name: 17-18
     type: splice
     positions: 1
-  - name: '19-20'
+  - name: 19-20
     type: splice
     positions: 1
-  - name: '21-22'
+  - name: 21-22
     type: splice
     positions: 1
-  - name: '23-24'
+  - name: 23-24
     type: splice
     positions: 1
-  - name: '25-26'
+  - name: 25-26
     type: splice
     positions: 1
-  - name: '27-28'
+  - name: 27-28
     type: splice
     positions: 1
-  - name: '29-30'
+  - name: 29-30
     type: splice
     positions: 1
-  - name: '31-32'
+  - name: 31-32
     type: splice
     positions: 1
-  - name: '33-34'
+  - name: 33-34
     type: splice
     positions: 1
-  - name: '35-36'
+  - name: 35-36
     type: splice
     positions: 1
-  - name: '37-38'
+  - name: 37-38
     type: splice
     positions: 1
-  - name: '39-40'
+  - name: 39-40
     type: splice
     positions: 1
-  - name: '41-42'
+  - name: 41-42
     type: splice
     positions: 1
-  - name: '43-44'
+  - name: 43-44
     type: splice
     positions: 1
-  - name: '45-46'
+  - name: 45-46
     type: splice
     positions: 1
-  - name: '47-48'
+  - name: 47-48
     type: splice
-    positions: 1
\ No newline at end of file
+    positions: 1
diff --git a/device-types/Commscope/MFPS-KHD-P-SIL2-048.yaml b/device-types/Commscope/MFPS-KHD-P-SIL2-048.yaml
index 4b065ef9a..10138a44a 100644
--- a/device-types/Commscope/MFPS-KHD-P-SIL2-048.yaml
+++ b/device-types/Commscope/MFPS-KHD-P-SIL2-048.yaml
@@ -10,220 +10,220 @@ airflow: passive
 comments: '[Commscope MFPS-KHD-P-SIL2-048](https://www.commscope.com/globalassets/digizuite/149232-p360-eh6588-000-external.pdf)'
 is_powered: false
 front-ports:
-  - name: '1-2'
+  - name: 1-2
     type: lc-apc
-    label: '001-002'
+    label: 001-002
     color: 70d975
-    rear_port: '1-2'
+    rear_port: 1-2
     rear_port_position: 1
-  - name: '3-4'
+  - name: 3-4
     type: lc-apc
-    label: '003-004'
+    label: 003-004
     color: 70d975
-    rear_port: '3-4'
+    rear_port: 3-4
     rear_port_position: 1
-  - name: '5-6'
+  - name: 5-6
     type: lc-apc
-    label: '005-006'
+    label: 005-006
     color: 70d975
-    rear_port: '5-6'
+    rear_port: 5-6
     rear_port_position: 1
-  - name: '7-8'
+  - name: 7-8
     type: lc-apc
-    label: '007-008'
+    label: 007-008
     color: 70d975
-    rear_port: '7-8'
+    rear_port: 7-8
     rear_port_position: 1
-  - name: '9-10'
+  - name: 9-10
     type: lc-apc
-    label: '009-010'
+    label: 009-010
     color: 70d975
-    rear_port: '9-10'
+    rear_port: 9-10
     rear_port_position: 1
-  - name: '11-12'
+  - name: 11-12
     type: lc-apc
-    label: '011-012'
+    label: 011-012
     color: 70d975
-    rear_port: '11-12'
+    rear_port: 11-12
     rear_port_position: 1
-  - name: '13-14'
+  - name: 13-14
     type: lc-apc
-    label: '013-014'
+    label: 013-014
     color: 70d975
-    rear_port: '13-14'
+    rear_port: 13-14
     rear_port_position: 1
-  - name: '15-16'
+  - name: 15-16
     type: lc-apc
-    label: '015-016'
+    label: 015-016
     color: 70d975
-    rear_port: '15-16'
+    rear_port: 15-16
     rear_port_position: 1
-  - name: '17-18'
+  - name: 17-18
     type: lc-apc
-    label: '017-018'
+    label: 017-018
     color: 70d975
-    rear_port: '17-18'
+    rear_port: 17-18
     rear_port_position: 1
-  - name: '19-20'
+  - name: 19-20
     type: lc-apc
-    label: '019-020'
+    label: 019-020
     color: 70d975
-    rear_port: '19-20'
+    rear_port: 19-20
     rear_port_position: 1
-  - name: '21-22'
+  - name: 21-22
     type: lc-apc
-    label: '021-022'
+    label: 021-022
     color: 70d975
-    rear_port: '21-22'
+    rear_port: 21-22
     rear_port_position: 1
-  - name: '23-24'
+  - name: 23-24
     type: lc-apc
-    label: '023-024'
+    label: 023-024
     color: 70d975
-    rear_port: '23-24'
+    rear_port: 23-24
     rear_port_position: 1
-  - name: '25-26'
+  - name: 25-26
     type: lc-apc
-    label: '025-026'
+    label: 025-026
     color: 70d975
-    rear_port: '25-26'
+    rear_port: 25-26
     rear_port_position: 1
-  - name: '27-28'
+  - name: 27-28
     type: lc-apc
-    label: '027-028'
+    label: 027-028
     color: 70d975
-    rear_port: '27-28'
+    rear_port: 27-28
     rear_port_position: 1
-  - name: '29-30'
+  - name: 29-30
     type: lc-apc
-    label: '029-030'
+    label: 029-030
     color: 70d975
-    rear_port: '29-30'
+    rear_port: 29-30
     rear_port_position: 1
-  - name: '31-32'
+  - name: 31-32
     type: lc-apc
-    label: '031-032'
+    label: 031-032
     color: 70d975
-    rear_port: '31-32'
+    rear_port: 31-32
     rear_port_position: 1
-  - name: '33-34'
+  - name: 33-34
     type: lc-apc
-    label: '033-034'
+    label: 033-034
     color: 70d975
-    rear_port: '33-34'
+    rear_port: 33-34
     rear_port_position: 1
-  - name: '35-36'
+  - name: 35-36
     type: lc-apc
-    label: '035-036'
+    label: 035-036
     color: 70d975
-    rear_port: '35-36'
+    rear_port: 35-36
     rear_port_position: 1
-  - name: '37-38'
+  - name: 37-38
     type: lc-apc
-    label: '037-038'
+    label: 037-038
     color: 70d975
-    rear_port: '37-38'
+    rear_port: 37-38
     rear_port_position: 1
-  - name: '39-40'
+  - name: 39-40
     type: lc-apc
-    label: '039-040'
+    label: 039-040
     color: 70d975
-    rear_port: '39-40'
+    rear_port: 39-40
     rear_port_position: 1
-  - name: '41-42'
+  - name: 41-42
     type: lc-apc
-    label: '041-042'
+    label: 041-042
     color: 70d975
-    rear_port: '41-42'
+    rear_port: 41-42
     rear_port_position: 1
-  - name: '43-44'
+  - name: 43-44
     type: lc-apc
-    label: '043-044'
+    label: 043-044
     color: 70d975
-    rear_port: '43-44'
+    rear_port: 43-44
     rear_port_position: 1
-  - name: '45-46'
+  - name: 45-46
     type: lc-apc
-    label: '045-046'
+    label: 045-046
     color: 70d975
-    rear_port: '45-46'
+    rear_port: 45-46
     rear_port_position: 1
-  - name: '47-48'
+  - name: 47-48
     type: lc-apc
-    label: '047-048'
+    label: 047-048
     color: 70d975
-    rear_port: '47-48'
+    rear_port: 47-48
     rear_port_position: 1
 rear-ports:
-  - name: '1-2'
+  - name: 1-2
     type: splice
     positions: 1
-  - name: '3-4'
+  - name: 3-4
     type: splice
     positions: 1
-  - name: '5-6'
+  - name: 5-6
     type: splice
     positions: 1
-  - name: '7-8'
+  - name: 7-8
     type: splice
     positions: 1
-  - name: '9-10'
+  - name: 9-10
     type: splice
     positions: 1
-  - name: '11-12'
+  - name: 11-12
     type: splice
     positions: 1
-  - name: '13-14'
+  - name: 13-14
     type: splice
     positions: 1
-  - name: '15-16'
+  - name: 15-16
     type: splice
     positions: 1
-  - name: '17-18'
+  - name: 17-18
     type: splice
     positions: 1
-  - name: '19-20'
+  - name: 19-20
     type: splice
     positions: 1
-  - name: '21-22'
+  - name: 21-22
     type: splice
     positions: 1
-  - name: '23-24'
+  - name: 23-24
     type: splice
     positions: 1
-  - name: '25-26'
+  - name: 25-26
     type: splice
     positions: 1
-  - name: '27-28'
+  - name: 27-28
     type: splice
     positions: 1
-  - name: '29-30'
+  - name: 29-30
     type: splice
     positions: 1
-  - name: '31-32'
+  - name: 31-32
     type: splice
     positions: 1
-  - name: '33-34'
+  - name: 33-34
     type: splice
     positions: 1
-  - name: '35-36'
+  - name: 35-36
     type: splice
     positions: 1
-  - name: '37-38'
+  - name: 37-38
     type: splice
     positions: 1
-  - name: '39-40'
+  - name: 39-40
     type: splice
     positions: 1
-  - name: '41-42'
+  - name: 41-42
     type: splice
     positions: 1
-  - name: '43-44'
+  - name: 43-44
     type: splice
     positions: 1
-  - name: '45-46'
+  - name: 45-46
     type: splice
     positions: 1
-  - name: '47-48'
+  - name: 47-48
     type: splice
-    positions: 1
\ No newline at end of file
+    positions: 1