Index: branches/secondaryzones/DNSDB.pm
===================================================================
--- branches/secondaryzones/DNSDB.pm	(revision 925)
+++ branches/secondaryzones/DNSDB.pm	(revision 926)
@@ -137,5 +137,5 @@
 		domain	=> 'domains',
 		revzone	=> 'revzones',
-		secondaryzone	=> 'secondaryzones',
+		secondaryzone	=> 'secondary_zones',
 		record	=> 'records'
 	);
@@ -3015,5 +3015,5 @@
   $primary =~ s/\s+$//;
 
-  my $sth = $dbh->prepare("SELECT secondary_id FROM secondaryzones WHERE lower(zone) = lower(?) AND default_location = ?");
+  my $sth = $dbh->prepare("SELECT secondary_id FROM secondary_zones WHERE lower(zone) = lower(?) AND default_location = ?");
   my $zone_id;
 
@@ -3037,5 +3037,5 @@
 ##fixme:  add Net::DNS lookup to grab SOA serial when importing records for display as well
     ($zone_id) = $dbh->selectrow_array(
-	"INSERT INTO secondaryzones (zone, primaryserver, group_id, status, default_location, zserial) ".
+	"INSERT INTO secondary_zones (zone, primaryserver, group_id, status, default_location, zserial) ".
 	"VALUES (?,?,?,?,?,?) RETURNING secondary_id",
 	undef,
@@ -3199,5 +3199,5 @@
   my $zoneid = shift;
   my $cidrflag = shift || 'n';
-  my ($zone) = $dbh->selectrow_array("SELECT zone FROM secondaryzones WHERE secondary_id=?", undef, ($zoneid) );
+  my ($zone) = $dbh->selectrow_array("SELECT zone FROM secondary_zones WHERE secondary_id=?", undef, ($zoneid) );
   $errstr = $DBI::errstr if !$zone;
   my $tmp = new NetAddr::IP $zone;
@@ -3327,5 +3327,5 @@
     # Secondary zones have less distinction between forward/reverse.
     # May need to revisit that once viewing records in the zones.
-    $sql = "SELECT count(*) FROM secondaryzones".
+    $sql = "SELECT count(*) FROM secondary_zones".
 	" WHERE group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
 	($args{startwith} ? " AND zone ~* ?" : '').
@@ -3398,8 +3398,8 @@
 		groups.group_name AS group,
 		l.description AS location
-	FROM secondaryzones
-	LEFT JOIN locations l ON secondaryzones.default_location=l.location
-	INNER JOIN groups ON secondaryzones.group_id=groups.group_id ).
-	"WHERE secondaryzones.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
+	FROM secondary_zones
+	LEFT JOIN locations l ON secondary_zones.default_location=l.location
+	INNER JOIN groups ON secondary_zones.group_id=groups.group_id ).
+	"WHERE secondary_zones.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
 	($args{startwith} ? " AND zone ~* ?" : '').
 	($args{filter} ? " AND zone ~* ?" : '');
@@ -4633,5 +4633,5 @@
   my $id = shift;
 
-  my $sql = "SELECT primaryserver, default_location FROM secondaryzones WHERE secondary_id = ?";
+  my $sql = "SELECT primaryserver, default_location FROM secondary_zones WHERE secondary_id = ?";
   my $ret = $dbh->selectrow_hashref($sql, undef, ($id) );
   return if !$ret;
@@ -4741,5 +4741,5 @@
 
   eval {
-    my $sql = "UPDATE secondaryzones SET primaryserver=?, default_location=? WHERE secondary_id=?";
+    my $sql = "UPDATE secondary_zones SET primaryserver=?, default_location=? WHERE secondary_id=?";
     $dbh->do($sql, undef, ($secondary{primary}, $secondary{location}, $secondary{id}));
     $msg = "Updated secondary zone $zone from (primary $oldsecondary->{primaryserver}, location ".