diff --git a/graphing/pyplot.py b/graphing/pyplot.py
index a4c9691d3..750412a31 100644
--- a/graphing/pyplot.py
+++ b/graphing/pyplot.py
@@ -2,13 +2,14 @@ import csv
 import sys
 from datetime import datetime
 import matplotlib
+import ntpath
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import matplotlib.cbook as cbook
 from pylab import rcParams
 rcParams['figure.figsize'] = 18, 10
 
-services=['nova-scheduler','keystone-all','nova-api','nova-conductor']
+services=['/usr/bin/nova-scheduler','/usr/bin/keystone-all','/usr/bin/nova-api','/usr/bin/nova-conductor']
 color_wheel=['r','g','b','y']
 
 data = {}
@@ -18,19 +19,19 @@ for service in services :
 reader = csv.DictReader(open(sys.argv[1]))
 for row in reader:
     for service in services :
-        if not row['host'] in data[service].keys() :
-            data[service][row['host']] = {}
-            data[service][row['host']]['datetime'] = []
-            data[service][row['host']]['host'] = []
-            data[service][row['host']]['maxconn'] = []
-            data[service][row['host']]['conn'] = []
-            data[service][row['host']]['ckout'] = []
+        if not row['hostname'] in data[service].keys() :
+            data[service][row['hostname']] = {}
+            data[service][row['hostname']]['timestamp'] = []
+            data[service][row['hostname']]['hostname'] = []
+            data[service][row['hostname']]['max_connections'] = []
+            data[service][row['hostname']]['connection_count'] = []
+            data[service][row['hostname']]['checkout_count'] = []
 
         if row['progname'] == service :
-            data[service][row['host']]['datetime'].append(datetime.strptime(row['datetime'],'%Y-%m-%d %H:%M:%S'))
-            data[service][row['host']]['conn'].append(row['conn'])
-            data[service][row['host']]['maxconn'].append(row['maxconn'])
-            data[service][row['host']]['ckout'].append(row['ckout'])
+            data[service][row['hostname']]['timestamp'].append(datetime.strptime(row['timestamp'],'%Y-%m-%d %H:%M:%S'))
+            data[service][row['hostname']]['connection_count'].append(row['connection_count'])
+            data[service][row['hostname']]['max_connections'].append(row['max_connections'])
+            data[service][row['hostname']]['checkout_count'].append(row['checkout_count'])
 
 for service in data :
     pos=0
@@ -38,12 +39,12 @@ for service in data :
         plt.title("Service : %s" % service)
         plt.xlabel("Time")
         plt.ylabel("Max Connections")
-        controller,=plt.plot_date(data[service][host]['datetime'][1::30],data[service][host]['maxconn'][1::30],'c',linewidth=2,label="%s-controller0"%service)
+        controller,=plt.plot_date(data[service][host]['timestamp'][1::30],data[service][host]['connection_count'][1::30],'c',linewidth=2,label="%s-controller0"%service)
         controller.set_color(color_wheel[pos])
         pos=pos+1
 
     plt.legend(["%s-controller0"%service,"%s-controller1"%service,"%s-controller2"%service])
-    plt.savefig("%s_%s-maxconnctions.png"%(sys.argv[1],service), bbox_inches='tight')
+    plt.savefig("%s_%s-connction_count.png"%(sys.argv[1],ntpath.basename(service)), bbox_inches='tight')
     plt.close()
 
     pos=0
@@ -51,12 +52,12 @@ for service in data :
         plt.title("Service : %s" % service)
         plt.xlabel("Time")
         plt.ylabel("Connections")
-        controller,=plt.plot_date(data[service][host]['datetime'][1::30],data[service][host]['conn'][1::30],'c',linewidth=4,label="%s-controller0-conn"%service)
-        controller1,=plt.plot_date(data[service][host]['datetime'][1::30],data[service][host]['ckout'][1::30],'c',linewidth=1,label="%s-controller0-ckout"%service)
+        controller,=plt.plot_date(data[service][host]['timestamp'][1::30],data[service][host]['connection_count'][1::30],'c',linewidth=4,label="%s-controller0-conn"%service)
+        controller1,=plt.plot_date(data[service][host]['timestamp'][1::30],data[service][host]['checkout_count'][1::30],'c',linewidth=1,label="%s-controller0-ckout"%service)
         controller.set_color(color_wheel[pos])
         controller1.set_color(color_wheel[pos])
         pos=pos+1
 
     plt.legend(["%s-controller0-conn"%service,"%s-controller0-ckout"%service,"%s-controller1-conn"%service,"%s-controller1-ckout"%service,"%s-controller2-conn"%service,"%s-controller2-ckout"%service])
-    plt.savefig("%s_%s-connctions.png"%(sys.argv[1],service), bbox_inches='tight')
+    plt.savefig("%s_%s-connctions.png"%(sys.argv[1],ntpath.basename(service)), bbox_inches='tight')
     plt.close()