diff --git a/python/tagserver_MySQL.py b/python/tagserver_MySQL.py
index 49397ca..5791425 100644
--- a/python/tagserver_MySQL.py
+++ b/python/tagserver_MySQL.py
@@ -80,7 +80,7 @@ def main():
 
 
 	for t in tags:
-		tag_store[t[1]] = Tag(t[1], t[3], t[0], t[5], t[6], t[7], mapFn=t[8], plc_type=configProperties['plc_type'], plc_ip_address=configProperties['PLC_IP_ADDRESS'])
+		tag_store[t[1]] = Tag(t[1], t[3], t[0], t[5], t[6], t[7], mapFn=t[8], device_type=configProperties['plc_type'], ip_address=configProperties['PLC_IP_ADDRESS'])
 
 
 	while True:
diff --git a/python/tagserver_SQLite.py b/python/tagserver_SQLite.py
index 01c29ca..48bba26 100644
--- a/python/tagserver_SQLite.py
+++ b/python/tagserver_SQLite.py
@@ -80,7 +80,7 @@ def main():
 	if len(tags) > 0:
 		for t in tags:
 			# (1, u'Pump Intake Pressure', u'5', u'Pump_Intake_Pressure', u'Pressure at the Intake of the Pump', None, 100.0, 3600, u'PSI', 0.0, 3000.0, u'2016-04-13 21:27:01', 0)
-			tag_store[t[1]] = Tag(t[1], t[3], t[0], t[5], t[6], t[7], mapFn=t[8], plc_type=configProperties['plc_type'], plc_ip_address=configProperties['PLC_IP_ADDRESS'])
+			tag_store[t[1]] = Tag(t[1], t[3], t[0], t[5], t[6], t[7], mapFn=t[8], device_type=configProperties['plc_type'], ip_address=configProperties['PLC_IP_ADDRESS'])
 
 
 		while True: