Index: trunk/tools/czarpoll.pl
===================================================================
--- trunk/tools/czarpoll.pl	(revision 31825)
+++ trunk/tools/czarpoll.pl	(revision 31886)
@@ -252,6 +252,6 @@
 
             chomp($label);
-            $plotter->createLogAndLinearTimeSeries($label,  $stage, $begin, $end);
-            $plotter->createRatePlot($label, $stage, $begin, $end, undef, 1, 1);
+            $plotter->createTimeSeries($label, $stage, $begin, $end, 1, 1, 1);
+            $plotter->createRateHistogram($label, $stage, $begin, $end, undef);
         }
     }
@@ -263,6 +263,6 @@
         my ($label) = @{$row};
 
-        $plotter->createLogAndLinearTimeSeries($label, undef, $begin, $end);
-        $plotter->createRatePlot($label, undef, $begin, $end, undef, 1, 1);
+        $plotter->createTimeSeries($label, undef, $begin, $end, 1, 1, 1);
+        $plotter->createRateHistogram($label, undef, $begin, $end, undef);
         $plotter->createHistogram($label, $begin, $end);
     }
@@ -270,11 +270,11 @@
     $allServerLabels = "all_".$server."_labels";
 
-    $plotter->createLogAndLinearTimeSeries($allServerLabels, undef, $begin, $end);
-    $plotter->createRatePlot($allServerLabels, undef, $begin, $end, undef, 1, 1);
+    $plotter->createTimeSeries($allServerLabels, undef, $begin, $end, 1, 1, 1);
+    $plotter->createRateHistogram($allServerLabels, undef, $begin, $end, undef);
     $plotter->createHistogram($allServerLabels, $begin, $end);
     foreach $stage (@stages) {
 
-        $plotter->createLogAndLinearTimeSeries($allServerLabels, $stage, $begin, $end); # TODO must be a neater way...
-            $plotter->createRatePlot($allServerLabels, $stage, $begin, $end, undef, 1, 1);
+        $plotter->createTimeSeries($allServerLabels, $stage, $begin, $end, 1, 1, 1); # TODO must be a neater way...
+        $plotter->createRateHistogram($allServerLabels, $stage, $begin, $end, undef);
     }
 }