diff --git a/configs/swerv.config b/configs/swerv.config
index 186a171..16cfb6e 100755
--- a/configs/swerv.config
+++ b/configs/swerv.config
@@ -91,7 +91,7 @@ This script documents, and generates the {`#} define/include files for verilog/a
 
 User options:
 
-     -target = { default, magellan }
+     -target = { default, generic }
         use default settings for one of the targets
 
      -set=var=value
@@ -246,8 +246,8 @@ my $perlfile = "$build_path/perl_configs.pl";
 
 my $no_secondary_alu=0;
 
-if ($target eq "magellan") {
-    print "$self: Using target \"magellan\"\n";
+if ($target eq "generic") {
+    print "$self: Using target \"generic\"\n";
     if (!defined($ret_stack_size))    { $ret_stack_size=4; } 
     if (!defined($btb_size))          { $btb_size=32; } 
     if (!defined($bht_size))          { $bht_size=128; } 
@@ -297,7 +297,7 @@ elsif ($target eq "default") {
     # default is AXI bus
 }
 else {
-    die "$self: ERROR! Unsupported target \"$target\". Supported targets are: \"default,magellan\"!\n";
+    die "$self: ERROR! Unsupported target \"$target\". Supported targets are: \"default,generic\"!\n";
 }
 
 # general stuff - can't set from command line other than -set
@@ -1254,11 +1254,11 @@ for ($rgn = 15;$rgn >= 0; $rgn--) {
 }
 $config{memmap}{debug_sb_mem} = sprintf("0x%08x", $config{memmap}{debug_sb_mem});
 
-# Boot magellan from ICCM
-if ($target eq "magellan") {
+# Boot generic from ICCM
+if ($target eq "generic") {
     $config{reset_vec} = $config{iccm}{iccm_sadr};
-    $config{testbench}{magellan} = 1;
-    print "$self: Setting reset_vec = ICCM start address for Magellan\n";
+    $config{testbench}{generic} = 1;
+    print "$self: Setting reset_vec = ICCM start address for Generic\n";
 }