diff --git a/app/src/main/java/info/nightscout/android/model/medtronicNg/Pump.java b/app/src/main/java/info/nightscout/android/model/medtronicNg/PumpInfo.java
similarity index 66%
rename from app/src/main/java/info/nightscout/android/model/medtronicNg/Pump.java
rename to app/src/main/java/info/nightscout/android/model/medtronicNg/PumpInfo.java
index 3d34bef3dceece251d193f1f9b60b6fb4c022d3b..9724cb64e55bc363fb41e5244e3df75244e3598b 100644
--- a/app/src/main/java/info/nightscout/android/model/medtronicNg/Pump.java
+++ b/app/src/main/java/info/nightscout/android/model/medtronicNg/PumpInfo.java
@@ -8,27 +8,36 @@ import io.realm.annotations.PrimaryKey;
 /**
  * Created by lgoedhart on 4/06/2016.
  */
-public class Pump extends RealmObject {
+public class PumpInfo extends RealmObject {
     @PrimaryKey
-    private String serialNumber;
-    private int lastRadioChannel;
+    private long pumpMac;
+    private String deviceName;
+    private byte lastRadioChannel;
     private RealmList<ContourNextLinkInfo> associatedCnls;
     private RealmList<CgmStatusEvent> cgmHistory;
     private RealmList<PumpStatusEvent> pumpHistory;
 
-    public String getSerialNumber() {
-        return serialNumber;
+    public long getPumpMac() {
+        return pumpMac;
     }
 
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
+    public void setPumpMac(long pumpMac) {
+        this.pumpMac = pumpMac;
     }
 
-    public int getLastRadioChannel() {
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public byte getLastRadioChannel() {
         return lastRadioChannel;
     }
 
-    public void setLastRadioChannel(int lastRadioChannel) {
+    public void setLastRadioChannel(byte lastRadioChannel) {
         this.lastRadioChannel = lastRadioChannel;
     }
 
@@ -55,4 +64,8 @@ public class Pump extends RealmObject {
     public void setPumpHistory(RealmList<PumpStatusEvent> pumpHistory) {
         this.pumpHistory = pumpHistory;
     }
+
+    public long getPumpSerial() {
+        return pumpMac & 0xffffff;
+    }
 }