diff --git a/scripts/Util.pm b/scripts/Util.pm
index 90db16e..ace7009 100644
--- a/scripts/Util.pm
+++ b/scripts/Util.pm
@@ -260,7 +260,8 @@ sub select_experiment {
       TUI::select_from_list( "Select Experiment", $multi, @exp_with_notes );
     die "No experiment selected" unless @selected_experiments;
 
-    map { s/(.*?)\s+\(.+\)$/$1/ } @selected_experiments;
+    @selected_experiments =
+      map { s/(.*?)\s+\(.+\)$/$1/r } @selected_experiments;
 
     return $multi == 1 ? @selected_experiments : $selected_experiments[0];
 }
diff --git a/scripts/menu.pl b/scripts/menu.pl
index 0e5d775..faa01d7 100644
--- a/scripts/menu.pl
+++ b/scripts/menu.pl
@@ -109,6 +109,7 @@ my %handlers = (
 
         my @existing = Util::find_files($local_ghidra_projects);
 
+        # Determine if an experiment was already imported
         my $is_old = sub {
             my ($name) = @_;
             $name =~ s/:/-/g;
@@ -504,11 +505,26 @@ my %handlers = (
     '99. Drop Databases (Mars)' => sub {
 
         # Drop databases on mars
-        my @db_names = Mars::db_list();
+        my @dbs = Mars::db_list();
+        my @dbs_with_notes;
+        foreach my $db (@dbs) {
+            my $info =
+              Util::read_experiment_info( $db =~ s/smchurla_//r =~ s/:/-/gr );
+
+            push @dbs_with_notes,
+              ( defined $info && length($info) > 0 )
+              ? sprintf( "%-60s (%s)", $db, $info )
+              : $db;
+        }
+
         my @selected_dbs =
           TUI::select_from_list( "Select Databases to Drop from Mars",
-            1, @db_names );
+            1, @dbs_with_notes );
         die "No database selected" unless @selected_dbs;
+
+        @selected_dbs =
+          map { s/(.*?)\s+\(.+\)$/$1/r } @selected_dbs;
+
         Mars::db_drop($_) for @selected_dbs;
     },
 );
diff --git a/targets/wasm-module/sum1_repl_naive_late.cpp b/targets/wasm-module/sum1_repl_late.cpp
similarity index 100%
rename from targets/wasm-module/sum1_repl_naive_late.cpp
rename to targets/wasm-module/sum1_repl_late.cpp
diff --git a/targets/wasm-module/sum3_repl_naive_early.cpp b/targets/wasm-module/sum3_repl_early.cpp
similarity index 100%
rename from targets/wasm-module/sum3_repl_naive_early.cpp
rename to targets/wasm-module/sum3_repl_early.cpp