diff --git a/device-types/WTI/DSM-24NM-DP-US.yaml b/device-types/WTI/DSM-24NM-DP.yaml
similarity index 89%
rename from device-types/WTI/DSM-24NM-DP-US.yaml
rename to device-types/WTI/DSM-24NM-DP.yaml
index 34d400cb..6a556ca7 100644
--- a/device-types/WTI/DSM-24NM-DP-US.yaml
+++ b/device-types/WTI/DSM-24NM-DP.yaml
@@ -1,11 +1,11 @@
 manufacturer: WTI
-model: DSM-24NM-DP-US
-slug: dsm-24nm-dp-us
+model: DSM-24NM-DP
+slug: dsm-24nm-dp
 part_number: DSM-24NM-DP
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-24NM-E-US.yaml b/device-types/WTI/DSM-24NM-E.yaml
similarity index 89%
rename from device-types/WTI/DSM-24NM-E-US.yaml
rename to device-types/WTI/DSM-24NM-E.yaml
index 471c92b6..1b551a0f 100644
--- a/device-types/WTI/DSM-24NM-E-US.yaml
+++ b/device-types/WTI/DSM-24NM-E.yaml
@@ -1,13 +1,13 @@
 manufacturer: WTI
-model: DSM-24NM-E-US
-slug: dsm-24nm-e-us
+model: DSM-24NM-E
+slug: dsm-24nm-e
 part_number: DSM-24NM-E
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
-  - name: wan
+  - name: ETH1
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-24NM-US.yaml b/device-types/WTI/DSM-24NM.yaml
similarity index 90%
rename from device-types/WTI/DSM-24NM-US.yaml
rename to device-types/WTI/DSM-24NM.yaml
index 324c9025..e7a16d45 100644
--- a/device-types/WTI/DSM-24NM-US.yaml
+++ b/device-types/WTI/DSM-24NM.yaml
@@ -1,11 +1,11 @@
 manufacturer: WTI
-model: DSM-24NM-US
-slug: dsm-24nm-us
+model: DSM-24NM
+slug: dsm-24nm
 part_number: DSM-24NM
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-40NM-DP-US.yaml b/device-types/WTI/DSM-40NM-DP.yaml
similarity index 91%
rename from device-types/WTI/DSM-40NM-DP-US.yaml
rename to device-types/WTI/DSM-40NM-DP.yaml
index 66cd80b2..c25b5b19 100644
--- a/device-types/WTI/DSM-40NM-DP-US.yaml
+++ b/device-types/WTI/DSM-40NM-DP.yaml
@@ -1,11 +1,11 @@
 manufacturer: WTI
-model: DSM-40NM-DP-US
-slug: dsm-40nm-dp-us
+model: DSM-40NM-DP
+slug: dsm-40nm-dp
 part_number: DSM-40NM-DP
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-40NM-E-US.yaml b/device-types/WTI/DSM-40NM-E.yaml
similarity index 90%
rename from device-types/WTI/DSM-40NM-E-US.yaml
rename to device-types/WTI/DSM-40NM-E.yaml
index afbb9001..8a2a51d5 100644
--- a/device-types/WTI/DSM-40NM-E-US.yaml
+++ b/device-types/WTI/DSM-40NM-E.yaml
@@ -1,13 +1,13 @@
 manufacturer: WTI
-model: DSM-40NM-E-US
-slug: dsm-40nm-e-us
+model: DSM-40NM-E
+slug: dsm-40nm-e
 part_number: DSM-40NM-E
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
-  - name: wan
+  - name: ETH1
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-40NM-US.yaml b/device-types/WTI/DSM-40NM.yaml
similarity index 91%
rename from device-types/WTI/DSM-40NM-US.yaml
rename to device-types/WTI/DSM-40NM.yaml
index 143d9963..4a1adf50 100644
--- a/device-types/WTI/DSM-40NM-US.yaml
+++ b/device-types/WTI/DSM-40NM.yaml
@@ -1,11 +1,11 @@
 manufacturer: WTI
-model: DSM-40NM-US
-slug: dsm-40nm-us
+model: DSM-40NM
+slug: dsm-40nm
 part_number: DSM-40NM
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-8NM-DP-US.yaml b/device-types/WTI/DSM-8NM-DP.yaml
similarity index 86%
rename from device-types/WTI/DSM-8NM-DP-US.yaml
rename to device-types/WTI/DSM-8NM-DP.yaml
index f7568935..01cebfc2 100644
--- a/device-types/WTI/DSM-8NM-DP-US.yaml
+++ b/device-types/WTI/DSM-8NM-DP.yaml
@@ -1,11 +1,11 @@
 manufacturer: WTI
-model: DSM-8NM-DP-US
-slug: dsm-8nm-dp-us
+model: DSM-8NM-DP
+slug: dsm-8nm-dp
 part_number: DSM-8NM-DP
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-8NM-E-US.yaml b/device-types/WTI/DSM-8NM-E.yaml
similarity index 85%
rename from device-types/WTI/DSM-8NM-E-US.yaml
rename to device-types/WTI/DSM-8NM-E.yaml
index eeb81f1f..e0c5be5d 100644
--- a/device-types/WTI/DSM-8NM-E-US.yaml
+++ b/device-types/WTI/DSM-8NM-E.yaml
@@ -1,13 +1,13 @@
 manufacturer: WTI
-model: DSM-8NM-E-US
-slug: dsm-8nm-e-us
+model: DSM-8NM-E
+slug: dsm-8nm-e
 part_number: DSM-8NM-E
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
-  - name: wan
+  - name: ETH1
     type: 1000base-t
 console-ports:
   - name: Console
diff --git a/device-types/WTI/DSM-8NM-US .yaml b/device-types/WTI/DSM-8NM.yaml
similarity index 86%
rename from device-types/WTI/DSM-8NM-US .yaml
rename to device-types/WTI/DSM-8NM.yaml
index 9809ed11..c82d80eb 100644
--- a/device-types/WTI/DSM-8NM-US .yaml	
+++ b/device-types/WTI/DSM-8NM.yaml
@@ -1,11 +1,11 @@
 manufacturer: WTI
-model: DSM-8NM-US
-slug: dsm-8nm-us
+model: DSM-8NM
+slug: dsm-8nm
 part_number: DSM-8NM
 is_full_depth: false
 u_height: 1
 interfaces:
-  - name: lan
+  - name: ETH0
     type: 1000base-t
 console-ports:
   - name: Console