Index: trunk/ippScripts/scripts/ipp_serial_camera.pl
===================================================================
--- trunk/ippScripts/scripts/ipp_serial_camera.pl	(revision 12020)
+++ trunk/ippScripts/scripts/ipp_serial_camera.pl	(revision 12022)
@@ -34,8 +34,8 @@
 my $missing_tools;
 my $camtool = can_run('camtool') or (warn "Can't find camtool" and $missing_tools = 1);
-my $camera = can_run('camera_exp.pl') or (warn "Can't find camera_exp.pl" and $missing_tools = 1);
+my $camera_exp = can_run('camera_exp.pl') or (warn "Can't find camera_exp.pl" and $missing_tools = 1);
 die "Can't find required tools.\n" if $missing_tools;
 
-# Phase 3 exposure processing
+# Camera exposure processing
 my $list;
 {
@@ -43,7 +43,7 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
 	run( command => $command, verbose => 1 );
-    die "Unable to get phase 3 exposure list: $error_code\n" if not $success;
+    die "Unable to get camera exposure list: $error_code\n" if not $success;
     $list = parse_md_list( $mdcParser->parse( join( '', @$stdout_buf ) ) ) or
-	die "Unable to parse output from chiptool.\n";
+	die "Unable to parse output from camtool.\n";
 }
 
@@ -52,5 +52,5 @@
     my $camera = $item->{camera};
     
-    my $command = "$camera --exp_tag $exp_tag --camera $camera --dbname $dbname";
+    my $command = "$camera_exp --exp_tag $exp_tag --camera $camera --dbname $dbname";
     $command .= " --no-op" if defined $no_op;
     $command .= " --no-update" if defined $no_update;
@@ -58,5 +58,5 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
 	run( command => $command, verbose => 1 );
-    die "Unable to do phase 3 processing on $exp_tag: $error_code\n" if not $success;
+    die "Unable to do camera processing on $exp_tag: $error_code\n" if not $success;
 }