diff --git a/device-types/HPE/ProCurve-2626.yaml b/device-types/HPE/ProCurve-2626-J4900A.yaml
similarity index 65%
rename from device-types/HPE/ProCurve-2626.yaml
rename to device-types/HPE/ProCurve-2626-J4900A.yaml
index 3394313e..2a0106b7 100644
--- a/device-types/HPE/ProCurve-2626.yaml
+++ b/device-types/HPE/ProCurve-2626-J4900A.yaml
@@ -1,8 +1,13 @@
 ---
 manufacturer: HPE
-model: ProCurve 2626
-slug: hpe-procurve-2626
+model: ProCurve 2626 - J4900A
+slug: hpe-procurve-2626-j4900a
+part_number: J4900A
 u_height: 1
+weight: 4.12
+weight_unit: kg
+comments: '[HP ProCurve 2600 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01815266)'
+#comments: '[HPE 2600 Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01804526)'
 is_full_depth: false
 console-ports:
   - name: Console
@@ -60,3 +65,12 @@ interfaces:
     type: 100base-tx
   - name: '24'
     type: 100base-tx
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+ # Dual personality ports
+ # - name: '25'
+ #   type: 1000base-x-sfp
+ # - name: '26'
+ #   type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2626-J4900B.yaml b/device-types/HPE/ProCurve-2626-J4900B.yaml
new file mode 100644
index 00000000..8b21691f
--- /dev/null
+++ b/device-types/HPE/ProCurve-2626-J4900B.yaml
@@ -0,0 +1,76 @@
+---
+manufacturer: HPE
+model: ProCurve 2626 - J4900B
+slug: hpe-procurve-2626-j4900b
+part_number: J4900B
+u_height: 1
+weight: 4.12
+weight_unit: kg
+comments: '[HP ProCurve 2600 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01815266)'
+#comments: '[HPE 2600 Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01804526)'
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 100
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+ # Dual personality ports
+ # - name: '25'
+ #   type: 1000base-x-sfp
+ # - name: '26'
+ #   type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2626-J4900C.yaml b/device-types/HPE/ProCurve-2626-J4900C.yaml
new file mode 100644
index 00000000..47b4dec1
--- /dev/null
+++ b/device-types/HPE/ProCurve-2626-J4900C.yaml
@@ -0,0 +1,76 @@
+---
+manufacturer: HPE
+model: ProCurve 2626 - J4900C
+slug: hpe-procurve-2626-j4900c
+part_number: J4900C
+u_height: 1
+weight: 4.12
+weight_unit: kg
+comments: '[HP ProCurve 2600 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01815266)'
+#comments: '[HPE 2600 Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01804526)'
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 100
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+ # Dual personality ports
+ # - name: '25'
+ #   type: 1000base-x-sfp
+ # - name: '26'
+ #   type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2650-J4899A.yaml b/device-types/HPE/ProCurve-2650-J4899A.yaml
new file mode 100644
index 00000000..51ddbbb1
--- /dev/null
+++ b/device-types/HPE/ProCurve-2650-J4899A.yaml
@@ -0,0 +1,124 @@
+---
+manufacturer: HPE
+model: ProCurve 2650 - J4899A
+slug: hpe-procurve-2650-j4899a
+part_number: J4899A
+u_height: 1
+weight: 4.4
+weight_unit: kg
+comments: '[HP ProCurve 2600 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01815266)'
+#comments: '[HPE 2600 Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01804526)'
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 100
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 100base-tx
+  - name: '26'
+    type: 100base-tx
+  - name: '27'
+    type: 100base-tx
+  - name: '28'
+    type: 100base-tx
+  - name: '29'
+    type: 100base-tx
+  - name: '30'
+    type: 100base-tx
+  - name: '31'
+    type: 100base-tx
+  - name: '32'
+    type: 100base-tx
+  - name: '33'
+    type: 100base-tx
+  - name: '34'
+    type: 100base-tx
+  - name: '35'
+    type: 100base-tx
+  - name: '36'
+    type: 100base-tx
+  - name: '37'
+    type: 100base-tx
+  - name: '38'
+    type: 100base-tx
+  - name: '39'
+    type: 100base-tx
+  - name: '40'
+    type: 100base-tx
+  - name: '41'
+    type: 100base-tx
+  - name: '42'
+    type: 100base-tx
+  - name: '43'
+    type: 100base-tx
+  - name: '44'
+    type: 100base-tx
+  - name: '45'
+    type: 100base-tx
+  - name: '46'
+    type: 100base-tx
+  - name: '47'
+    type: 100base-tx
+  - name: '48'
+    type: 100base-tx
+  - name: '49'
+    type: 1000base-t
+  - name: '50'
+    type: 1000base-t
+# Dual personality ports
+# - name: '49'
+#   type: 1000base-x-sfp
+# - name: '50'
+#   type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2650-J4899B.yaml b/device-types/HPE/ProCurve-2650-J4899B.yaml
new file mode 100644
index 00000000..11ea0ada
--- /dev/null
+++ b/device-types/HPE/ProCurve-2650-J4899B.yaml
@@ -0,0 +1,124 @@
+---
+manufacturer: HPE
+model: ProCurve 2650 - J4899B
+slug: hpe-procurve-2650-j4899b
+part_number: J4899B
+u_height: 1
+weight: 4.4
+weight_unit: kg
+comments: '[HP ProCurve 2600 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01815266)'
+#comments: '[HPE 2600 Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01804526)'
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 100
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 100base-tx
+  - name: '26'
+    type: 100base-tx
+  - name: '27'
+    type: 100base-tx
+  - name: '28'
+    type: 100base-tx
+  - name: '29'
+    type: 100base-tx
+  - name: '30'
+    type: 100base-tx
+  - name: '31'
+    type: 100base-tx
+  - name: '32'
+    type: 100base-tx
+  - name: '33'
+    type: 100base-tx
+  - name: '34'
+    type: 100base-tx
+  - name: '35'
+    type: 100base-tx
+  - name: '36'
+    type: 100base-tx
+  - name: '37'
+    type: 100base-tx
+  - name: '38'
+    type: 100base-tx
+  - name: '39'
+    type: 100base-tx
+  - name: '40'
+    type: 100base-tx
+  - name: '41'
+    type: 100base-tx
+  - name: '42'
+    type: 100base-tx
+  - name: '43'
+    type: 100base-tx
+  - name: '44'
+    type: 100base-tx
+  - name: '45'
+    type: 100base-tx
+  - name: '46'
+    type: 100base-tx
+  - name: '47'
+    type: 100base-tx
+  - name: '48'
+    type: 100base-tx
+  - name: '49'
+    type: 1000base-t
+  - name: '50'
+    type: 1000base-t
+# Dual personality ports
+# - name: '49'
+#   type: 1000base-x-sfp
+# - name: '50'
+#   type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2650-J4899C.yaml b/device-types/HPE/ProCurve-2650-J4899C.yaml
new file mode 100644
index 00000000..fa8bd96a
--- /dev/null
+++ b/device-types/HPE/ProCurve-2650-J4899C.yaml
@@ -0,0 +1,124 @@
+---
+manufacturer: HPE
+model: ProCurve 2650 - J4899C
+slug: hpe-procurve-2650-j4899c
+part_number: J4899C
+u_height: 1
+weight: 4.4
+weight_unit: kg
+comments: '[HP ProCurve 2600 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01815266)'
+#comments: '[HPE 2600 Switch Series - Overview](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=c01804526)'
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 100
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+  - name: '14'
+    type: 100base-tx
+  - name: '15'
+    type: 100base-tx
+  - name: '16'
+    type: 100base-tx
+  - name: '17'
+    type: 100base-tx
+  - name: '18'
+    type: 100base-tx
+  - name: '19'
+    type: 100base-tx
+  - name: '20'
+    type: 100base-tx
+  - name: '21'
+    type: 100base-tx
+  - name: '22'
+    type: 100base-tx
+  - name: '23'
+    type: 100base-tx
+  - name: '24'
+    type: 100base-tx
+  - name: '25'
+    type: 100base-tx
+  - name: '26'
+    type: 100base-tx
+  - name: '27'
+    type: 100base-tx
+  - name: '28'
+    type: 100base-tx
+  - name: '29'
+    type: 100base-tx
+  - name: '30'
+    type: 100base-tx
+  - name: '31'
+    type: 100base-tx
+  - name: '32'
+    type: 100base-tx
+  - name: '33'
+    type: 100base-tx
+  - name: '34'
+    type: 100base-tx
+  - name: '35'
+    type: 100base-tx
+  - name: '36'
+    type: 100base-tx
+  - name: '37'
+    type: 100base-tx
+  - name: '38'
+    type: 100base-tx
+  - name: '39'
+    type: 100base-tx
+  - name: '40'
+    type: 100base-tx
+  - name: '41'
+    type: 100base-tx
+  - name: '42'
+    type: 100base-tx
+  - name: '43'
+    type: 100base-tx
+  - name: '44'
+    type: 100base-tx
+  - name: '45'
+    type: 100base-tx
+  - name: '46'
+    type: 100base-tx
+  - name: '47'
+    type: 100base-tx
+  - name: '48'
+    type: 100base-tx
+  - name: '49'
+    type: 1000base-t
+  - name: '50'
+    type: 1000base-t
+# Dual personality ports
+# - name: '49'
+#   type: 1000base-x-sfp
+# - name: '50'
+#   type: 1000base-x-sfp