import Foundation

struct MVitaDevice
{
    let ipAddress:String
    let identifier:String
    let port:UInt16
}

import Foundation

struct MVitaDevice
{
    let identifier:String
    let ipAddress:String
    let dataPort:UInt16
}

--- 
+++ 
@@ -2,7 +2,7 @@
 
 struct MVitaDevice
 {
+    let ipAddress:String
     let identifier:String
-    let ipAddress:String
-    let dataPort:UInt16
+    let port:UInt16
 }
Rename data port as port
