-% for my $pre ('', 'ship_') {
-% next if !$pre and $old{onlyship};
-% my $name = $pre eq 'ship_' ? 'service' : 'billing';
+% my @prefixes = ('');
+% if ( $old{same} ) {
+% @prefixes = ('bill_');
+% } elsif ( $old{billship} ) {
+% @prefixes = ('bill_', 'ship_');
+% }
+% for my $pre (@prefixes) {
+% my $name = $pre eq 'bill_' ? 'billing' : 'service';