diff --git a/README b/README
index 9176f68b2..cf06a423f 100644
--- a/README
+++ b/README
@@ -153,10 +153,10 @@ src/              Sources for libspot.
    priv/          Private algorithms, used internally but not exported.
    ta/            TA objects and cousins (TGTA).
    taalgos/       Algorithms on TA/TGTA.
-   tgbaalgos/     Algorithms on TGBA.
+   tgbatest/      Tests for twa/, twaalgos/, ta/ and taalgos/.
+   twa/           TωA objects and cousins (Transition-based ω-Automata).
+   twaalgos/      Algorithms on TωA.
       gtec/       Couvreur's Emptiness-Check.
-   tgbatest/      Tests for twa/, tgbaalgos/, ta/ and taalgos/.
-   twa/           TωA objects and cousins.
    sanity/        Sanity tests for the whole project.
 doc/              Documentation for libspot.
    org/           Source of userdoc/ as org-mode files.
diff --git a/configure.ac b/configure.ac
index ca9744e7b..bc02e8d35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,8 +217,8 @@ AC_CONFIG_FILES([
   src/misc/Makefile
   src/priv/Makefile
   src/sanity/Makefile
-  src/tgbaalgos/gtec/Makefile
-  src/tgbaalgos/Makefile
+  src/twaalgos/gtec/Makefile
+  src/twaalgos/Makefile
   src/twa/Makefile
   src/taalgos/Makefile
   src/ta/Makefile
diff --git a/iface/ltsmin/modelcheck.cc b/iface/ltsmin/modelcheck.cc
index adc8ffecc..a6777f867 100644
--- a/iface/ltsmin/modelcheck.cc
+++ b/iface/ltsmin/modelcheck.cc
@@ -18,14 +18,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltsmin.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/dotty.hh"
 #include "ltlenv/defaultenv.hh"
 #include "ltlast/allnodes.hh"
 #include "ltlparse/public.hh"
-#include "tgbaalgos/translate.hh"
-#include "tgbaalgos/emptiness.hh"
-#include "tgbaalgos/reducerun.hh"
-#include "tgbaalgos/postproc.hh"
+#include "twaalgos/translate.hh"
+#include "twaalgos/emptiness.hh"
+#include "twaalgos/reducerun.hh"
+#include "twaalgos/postproc.hh"
 #include "twa/twaproduct.hh"
 #include "misc/timer.hh"
 #include "misc/memusage.hh"
diff --git a/src/Makefile.am b/src/Makefile.am
index 39ab34165..ccfa8a572 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # end, after building '.' (since the current directory contains
 # libspot.la needed by the tests)
 SUBDIRS = misc priv ltlenv ltlast ltlvisit ltlparse graph twa		\
-          tgbaalgos ta taalgos kripke kripkeparse dstarparse hoaparse	\
+          twaalgos ta taalgos kripke kripkeparse dstarparse hoaparse	\
           . bin ltltest graphtest tgbatest kripketest sanity
 
 lib_LTLIBRARIES = libspot.la
@@ -45,7 +45,7 @@ libspot_la_LIBADD =  \
   priv/libpriv.la \
   taalgos/libtaalgos.la \
   ta/libta.la \
-  tgbaalgos/libtgbaalgos.la \
+  twaalgos/libtwaalgos.la \
   twa/libtwa.la \
   ../lib/libgnu.la
 
diff --git a/src/bin/autfilt.cc b/src/bin/autfilt.cc
index 3a8919b94..e246a3d07 100644
--- a/src/bin/autfilt.cc
+++ b/src/bin/autfilt.cc
@@ -36,23 +36,23 @@
 #include "common_post.hh"
 #include "common_conv.hh"
 
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/isdet.hh"
-#include "tgbaalgos/stutter.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/isdet.hh"
+#include "twaalgos/stutter.hh"
 #include "misc/optionmap.hh"
 #include "misc/timer.hh"
 #include "misc/random.hh"
 #include "hoaparse/public.hh"
 #include "ltlvisit/exclusive.hh"
-#include "tgbaalgos/remprop.hh"
-#include "tgbaalgos/randomize.hh"
-#include "tgbaalgos/are_isomorphic.hh"
-#include "tgbaalgos/canonicalize.hh"
-#include "tgbaalgos/mask.hh"
-#include "tgbaalgos/sbacc.hh"
-#include "tgbaalgos/stripacc.hh"
-#include "tgbaalgos/remfin.hh"
-#include "tgbaalgos/cleanacc.hh"
+#include "twaalgos/remprop.hh"
+#include "twaalgos/randomize.hh"
+#include "twaalgos/are_isomorphic.hh"
+#include "twaalgos/canonicalize.hh"
+#include "twaalgos/mask.hh"
+#include "twaalgos/sbacc.hh"
+#include "twaalgos/stripacc.hh"
+#include "twaalgos/remfin.hh"
+#include "twaalgos/cleanacc.hh"
 
 
 static const char argp_program_doc[] ="\
diff --git a/src/bin/common_aoutput.cc b/src/bin/common_aoutput.cc
index fb51f4486..3582b0310 100644
--- a/src/bin/common_aoutput.cc
+++ b/src/bin/common_aoutput.cc
@@ -27,10 +27,10 @@
 
 #include "twa/bddprint.hh"
 
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/lbtt.hh"
-#include "tgbaalgos/hoa.hh"
-#include "tgbaalgos/neverclaim.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/lbtt.hh"
+#include "twaalgos/hoa.hh"
+#include "twaalgos/neverclaim.hh"
 
 automaton_format_t automaton_format = Dot;
 static const char* opt_dot = nullptr;
diff --git a/src/bin/common_aoutput.hh b/src/bin/common_aoutput.hh
index 648b4283a..4f94bc320 100644
--- a/src/bin/common_aoutput.hh
+++ b/src/bin/common_aoutput.hh
@@ -26,12 +26,12 @@
 
 #include "hoaparse/public.hh"
 
-#include "tgbaalgos/stats.hh"
-#include "tgbaalgos/sccinfo.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/reducerun.hh"
-#include "tgbaalgos/word.hh"
-#include "tgbaalgos/isdet.hh"
+#include "twaalgos/stats.hh"
+#include "twaalgos/sccinfo.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/reducerun.hh"
+#include "twaalgos/word.hh"
+#include "twaalgos/isdet.hh"
 #include "common_file.hh"
 
 
diff --git a/src/bin/common_output.hh b/src/bin/common_output.hh
index 1a2ee334f..c16294fff 100644
--- a/src/bin/common_output.hh
+++ b/src/bin/common_output.hh
@@ -25,7 +25,7 @@
 #include <map>
 #include <memory>
 #include "ltlast/formula.hh"
-#include "tgbaalgos/stats.hh"
+#include "twaalgos/stats.hh"
 #include "common_output.hh"
 #include "common_file.hh"
 
diff --git a/src/bin/common_post.hh b/src/bin/common_post.hh
index a2997e49a..8fecf7a18 100644
--- a/src/bin/common_post.hh
+++ b/src/bin/common_post.hh
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "common_sys.hh"
-#include "tgbaalgos/postproc.hh"
+#include "twaalgos/postproc.hh"
 #include <argp.h>
 
 extern const struct argp post_argp;	     // postprocessing enabled
diff --git a/src/bin/dstar2tgba.cc b/src/bin/dstar2tgba.cc
index 656f2151c..b01236433 100644
--- a/src/bin/dstar2tgba.cc
+++ b/src/bin/dstar2tgba.cc
@@ -32,16 +32,16 @@
 #include "common_post.hh"
 #include "common_file.hh"
 
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/lbtt.hh"
-#include "tgbaalgos/hoa.hh"
-#include "tgbaalgos/neverclaim.hh"
-#include "tgbaalgos/stats.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/lbtt.hh"
+#include "twaalgos/hoa.hh"
+#include "twaalgos/neverclaim.hh"
+#include "twaalgos/stats.hh"
 #include "twa/bddprint.hh"
 #include "misc/optionmap.hh"
 #include "misc/timer.hh"
 #include "dstarparse/public.hh"
-#include "tgbaalgos/sccinfo.hh"
+#include "twaalgos/sccinfo.hh"
 
 static const char argp_program_doc[] ="\
 Convert Rabin and Streett automata into Büchi automata.\n\n\
diff --git a/src/bin/ltl2tgba.cc b/src/bin/ltl2tgba.cc
index 665ea30fd..b03e87e78 100644
--- a/src/bin/ltl2tgba.cc
+++ b/src/bin/ltl2tgba.cc
@@ -35,7 +35,7 @@
 
 #include "ltlast/formula.hh"
 #include "ltlvisit/tostring.hh"
-#include "tgbaalgos/translate.hh"
+#include "twaalgos/translate.hh"
 #include "misc/optionmap.hh"
 #include "misc/timer.hh"
 
diff --git a/src/bin/ltl2tgta.cc b/src/bin/ltl2tgta.cc
index f3fc52903..fb36cc325 100644
--- a/src/bin/ltl2tgta.cc
+++ b/src/bin/ltl2tgta.cc
@@ -35,9 +35,9 @@
 #include "ltlparse/public.hh"
 #include "ltlvisit/tostring.hh"
 #include "ltlvisit/simplify.hh"
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/translate.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/translate.hh"
 #include "twa/bddprint.hh"
 
 #include "taalgos/tgba2ta.hh"
diff --git a/src/bin/ltlcross.cc b/src/bin/ltlcross.cc
index f367674c9..cfa584fd3 100644
--- a/src/bin/ltlcross.cc
+++ b/src/bin/ltlcross.cc
@@ -45,20 +45,20 @@
 #include "ltlvisit/mutation.hh"
 #include "ltlvisit/relabel.hh"
 #include "ltlvisit/lbt.hh"
-#include "tgbaalgos/lbtt.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/remfin.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/randomgraph.hh"
-#include "tgbaalgos/sccinfo.hh"
-#include "tgbaalgos/isweakscc.hh"
-#include "tgbaalgos/reducerun.hh"
-#include "tgbaalgos/word.hh"
-#include "tgbaalgos/dtgbacomp.hh"
-#include "tgbaalgos/cleanacc.hh"
+#include "twaalgos/lbtt.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/remfin.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/randomgraph.hh"
+#include "twaalgos/sccinfo.hh"
+#include "twaalgos/isweakscc.hh"
+#include "twaalgos/reducerun.hh"
+#include "twaalgos/word.hh"
+#include "twaalgos/dtgbacomp.hh"
+#include "twaalgos/cleanacc.hh"
 #include "misc/formater.hh"
-#include "tgbaalgos/stats.hh"
-#include "tgbaalgos/isdet.hh"
+#include "twaalgos/stats.hh"
+#include "twaalgos/isdet.hh"
 #include "misc/escape.hh"
 #include "misc/hash.hh"
 #include "misc/random.hh"
diff --git a/src/bin/ltldo.cc b/src/bin/ltldo.cc
index 2366bb694..6ea37fc51 100644
--- a/src/bin/ltldo.cc
+++ b/src/bin/ltldo.cc
@@ -39,8 +39,8 @@
 #include "ltlvisit/relabel.hh"
 #include "misc/bareword.hh"
 #include "misc/timer.hh"
-#include "tgbaalgos/lbtt.hh"
-#include "tgbaalgos/relabel.hh"
+#include "twaalgos/lbtt.hh"
+#include "twaalgos/relabel.hh"
 #include "hoaparse/public.hh"
 #include "dstarparse/public.hh"
 
diff --git a/src/bin/ltlfilt.cc b/src/bin/ltlfilt.cc
index 00e976cd9..a74ceeb80 100644
--- a/src/bin/ltlfilt.cc
+++ b/src/bin/ltlfilt.cc
@@ -45,10 +45,10 @@
 #include "ltlvisit/tostring.hh"
 #include "ltlast/unop.hh"
 #include "ltlast/multop.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/minimize.hh"
-#include "tgbaalgos/safety.hh"
-#include "tgbaalgos/stutter.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/minimize.hh"
+#include "twaalgos/safety.hh"
+#include "twaalgos/stutter.hh"
 
 const char argp_program_doc[] ="\
 Read a list of formulas and output them back after some optional processing.\v\
diff --git a/src/bin/randaut.cc b/src/bin/randaut.cc
index a1847c3f7..0035936a0 100644
--- a/src/bin/randaut.cc
+++ b/src/bin/randaut.cc
@@ -39,8 +39,8 @@
 #include "misc/random.hh"
 
 #include "twa/bddprint.hh"
-#include "tgbaalgos/randomgraph.hh"
-#include "tgbaalgos/canonicalize.hh"
+#include "twaalgos/randomgraph.hh"
+#include "twaalgos/canonicalize.hh"
 
 
 const char argp_program_doc[] = "\
diff --git a/src/dstarparse/dra2ba.cc b/src/dstarparse/dra2ba.cc
index 56987f237..7e54007c7 100644
--- a/src/dstarparse/dra2ba.cc
+++ b/src/dstarparse/dra2ba.cc
@@ -19,11 +19,11 @@
 
 #include "public.hh"
 #include "twa/twamask.hh"
-#include "tgbaalgos/scc.hh"
-#include "tgbaalgos/reachiter.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/scc.hh"
+#include "twaalgos/reachiter.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/dotty.hh"
 
 namespace spot
 {
diff --git a/src/dstarparse/nra2nba.cc b/src/dstarparse/nra2nba.cc
index 628a89e69..7e470d41a 100644
--- a/src/dstarparse/nra2nba.cc
+++ b/src/dstarparse/nra2nba.cc
@@ -18,8 +18,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "public.hh"
-#include "tgbaalgos/reachiter.hh"
-#include "tgbaalgos/sccfilter.hh"
+#include "twaalgos/reachiter.hh"
+#include "twaalgos/sccfilter.hh"
 
 namespace spot
 {
diff --git a/src/dstarparse/nsa2tgba.cc b/src/dstarparse/nsa2tgba.cc
index dca78234f..15b70081c 100644
--- a/src/dstarparse/nsa2tgba.cc
+++ b/src/dstarparse/nsa2tgba.cc
@@ -20,7 +20,7 @@
 #include <sstream>
 #include <deque>
 #include "public.hh"
-#include "tgbaalgos/sccfilter.hh"
+#include "twaalgos/sccfilter.hh"
 #include "ltlenv/defaultenv.hh"
 #include "priv/accmap.hh"
 
diff --git a/src/graphtest/twagraph.cc b/src/graphtest/twagraph.cc
index 55cc225e6..1f53f166d 100644
--- a/src/graphtest/twagraph.cc
+++ b/src/graphtest/twagraph.cc
@@ -20,7 +20,7 @@
 
 #include <iostream>
 #include "twa/twagraph.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/dotty.hh"
 #include "ltlenv/defaultenv.hh"
 
 void f1()
diff --git a/src/kripke/kripkeprint.cc b/src/kripke/kripkeprint.cc
index 613ba354d..5243591ab 100644
--- a/src/kripke/kripkeprint.cc
+++ b/src/kripke/kripkeprint.cc
@@ -22,7 +22,7 @@
 #include "kripkeexplicit.hh"
 #include "twa/bddprint.hh"
 #include "misc/escape.hh"
-#include "tgbaalgos/reachiter.hh"
+#include "twaalgos/reachiter.hh"
 #include <iostream>
 #include <sstream>
 
diff --git a/src/ltlvisit/contain.cc b/src/ltlvisit/contain.cc
index 5f63a8cdd..f8ba4e9b4 100644
--- a/src/ltlvisit/contain.cc
+++ b/src/ltlvisit/contain.cc
@@ -27,7 +27,7 @@
 #include "ltlast/binop.hh"
 #include "ltlast/multop.hh"
 #include "ltlast/constant.hh"
-#include "tgbaalgos/product.hh"
+#include "twaalgos/product.hh"
 
 namespace spot
 {
diff --git a/src/ltlvisit/contain.hh b/src/ltlvisit/contain.hh
index 991eb5a49..993771020 100644
--- a/src/ltlvisit/contain.hh
+++ b/src/ltlvisit/contain.hh
@@ -23,7 +23,7 @@
 #pragma once
 
 #include "ltlast/formula.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
 #include "misc/hash.hh"
 #include <map>
 
diff --git a/src/ltlvisit/exclusive.cc b/src/ltlvisit/exclusive.cc
index ba832679a..7e050157e 100644
--- a/src/ltlvisit/exclusive.cc
+++ b/src/ltlvisit/exclusive.cc
@@ -22,7 +22,7 @@
 #include "ltlast/multop.hh"
 #include "ltlast/unop.hh"
 #include "ltlast/constant.hh"
-#include "tgbaalgos/mask.hh"
+#include "twaalgos/mask.hh"
 #include "misc/casts.hh"
 #include "misc/minato.hh"
 #include "apcollect.hh"
diff --git a/src/taalgos/emptinessta.hh b/src/taalgos/emptinessta.hh
index fcae4dd22..db451f1e2 100644
--- a/src/taalgos/emptinessta.hh
+++ b/src/taalgos/emptinessta.hh
@@ -24,7 +24,7 @@
 
 #include "ta/taproduct.hh"
 #include "misc/optionmap.hh"
-#include "tgbaalgos/emptiness_stats.hh"
+#include "twaalgos/emptiness_stats.hh"
 #include <stack>
 #include <queue>
 
diff --git a/src/tgbaalgos/.cvsignore b/src/tgbaalgos/.cvsignore
deleted file mode 100644
index 799fc9785..000000000
--- a/src/tgbaalgos/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-*.lo
-*.la
-Makefile
-Makefile.in
diff --git a/src/tgbaalgos/gtec/.cvsignore b/src/tgbaalgos/gtec/.cvsignore
deleted file mode 100644
index 799fc9785..000000000
--- a/src/tgbaalgos/gtec/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-*.lo
-*.la
-Makefile
-Makefile.in
diff --git a/src/tgbatest/checkpsl.cc b/src/tgbatest/checkpsl.cc
index 417195370..5502a16a6 100644
--- a/src/tgbatest/checkpsl.cc
+++ b/src/tgbatest/checkpsl.cc
@@ -24,11 +24,11 @@
 #include <cstring>
 #include "ltlparse/public.hh"
 #include "ltlast/allnodes.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/ltl2taa.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/ltl2taa.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/dotty.hh"
 
 void
 syntax(char* prog)
diff --git a/src/tgbatest/checkta.cc b/src/tgbatest/checkta.cc
index 4cc2ebc35..511125556 100644
--- a/src/tgbatest/checkta.cc
+++ b/src/tgbatest/checkta.cc
@@ -25,10 +25,10 @@
 #include <cstring>
 #include "ltlparse/public.hh"
 #include "ltlast/allnodes.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/degen.hh"
-#include "tgbaalgos/stats.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/degen.hh"
+#include "twaalgos/stats.hh"
 #include "taalgos/minimize.hh"
 #include "taalgos/tgba2ta.hh"
 #include "taalgos/dotty.hh"
diff --git a/src/tgbatest/complementation.cc b/src/tgbatest/complementation.cc
index c84539a0a..e7da51a8d 100644
--- a/src/tgbatest/complementation.cc
+++ b/src/tgbatest/complementation.cc
@@ -19,19 +19,19 @@
 
 #include <iomanip>
 #include <iostream>
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/hoa.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/hoa.hh"
 #include "hoaparse/public.hh"
 #include "twa/twaproduct.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
 #include "ltlparse/public.hh"
-#include "tgbaalgos/stats.hh"
-#include "tgbaalgos/emptiness.hh"
+#include "twaalgos/stats.hh"
+#include "twaalgos/emptiness.hh"
 #include "ltlast/unop.hh"
-#include "tgbaalgos/stats.hh"
-#include "tgbaalgos/emptiness_stats.hh"
-#include "tgbaalgos/degen.hh"
+#include "twaalgos/stats.hh"
+#include "twaalgos/emptiness_stats.hh"
+#include "twaalgos/degen.hh"
 
 #include "twa/twasafracomplement.hh"
 
diff --git a/src/tgbatest/emptchk.cc b/src/tgbatest/emptchk.cc
index d058ac1f9..f704f2f45 100644
--- a/src/tgbatest/emptchk.cc
+++ b/src/tgbatest/emptchk.cc
@@ -24,14 +24,14 @@
 #include <cstring>
 #include "ltlparse/public.hh"
 #include "ltlast/allnodes.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/ltl2taa.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/degen.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/ltl2taa.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/degen.hh"
 #include "twa/twaproduct.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/emptiness.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/emptiness.hh"
 
 void
 syntax(char* prog)
diff --git a/src/tgbatest/ltl2tgba.cc b/src/tgbatest/ltl2tgba.cc
index 8d7a0cd2d..7f5b2fdaa 100644
--- a/src/tgbatest/ltl2tgba.cc
+++ b/src/tgbatest/ltl2tgba.cc
@@ -30,43 +30,43 @@
 #include "ltlvisit/apcollect.hh"
 #include "ltlast/allnodes.hh"
 #include "ltlparse/public.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/ltl2taa.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/ltl2taa.hh"
 #include "twa/bddprint.hh"
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/lbtt.hh"
-#include "tgbaalgos/hoa.hh"
-#include "tgbaalgos/degen.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/lbtt.hh"
+#include "twaalgos/hoa.hh"
+#include "twaalgos/degen.hh"
 #include "twa/twaproduct.hh"
-#include "tgbaalgos/reducerun.hh"
+#include "twaalgos/reducerun.hh"
 #include "dstarparse/public.hh"
 #include "hoaparse/public.hh"
-#include "tgbaalgos/dupexp.hh"
-#include "tgbaalgos/minimize.hh"
+#include "twaalgos/dupexp.hh"
+#include "twaalgos/minimize.hh"
 #include "taalgos/minimize.hh"
-#include "tgbaalgos/neverclaim.hh"
-#include "tgbaalgos/replayrun.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/safety.hh"
-#include "tgbaalgos/gtec/gtec.hh"
+#include "twaalgos/neverclaim.hh"
+#include "twaalgos/replayrun.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/safety.hh"
+#include "twaalgos/gtec/gtec.hh"
 #include "misc/timer.hh"
-#include "tgbaalgos/stats.hh"
-#include "tgbaalgos/sccinfo.hh"
-#include "tgbaalgos/emptiness_stats.hh"
-#include "tgbaalgos/scc.hh"
-#include "tgbaalgos/sccinfo.hh"
-#include "tgbaalgos/isdet.hh"
-#include "tgbaalgos/cycles.hh"
-#include "tgbaalgos/isweakscc.hh"
+#include "twaalgos/stats.hh"
+#include "twaalgos/sccinfo.hh"
+#include "twaalgos/emptiness_stats.hh"
+#include "twaalgos/scc.hh"
+#include "twaalgos/sccinfo.hh"
+#include "twaalgos/isdet.hh"
+#include "twaalgos/cycles.hh"
+#include "twaalgos/isweakscc.hh"
 #include "kripkeparse/public.hh"
-#include "tgbaalgos/simulation.hh"
-#include "tgbaalgos/compsusp.hh"
-#include "tgbaalgos/powerset.hh"
-#include "tgbaalgos/dtgbacomp.hh"
-#include "tgbaalgos/complete.hh"
-#include "tgbaalgos/dtbasat.hh"
-#include "tgbaalgos/dtgbasat.hh"
-#include "tgbaalgos/stutter.hh"
+#include "twaalgos/simulation.hh"
+#include "twaalgos/compsusp.hh"
+#include "twaalgos/powerset.hh"
+#include "twaalgos/dtgbacomp.hh"
+#include "twaalgos/complete.hh"
+#include "twaalgos/dtbasat.hh"
+#include "twaalgos/dtgbasat.hh"
+#include "twaalgos/stutter.hh"
 
 #include "taalgos/tgba2ta.hh"
 #include "taalgos/dotty.hh"
diff --git a/src/tgbatest/ltlprod.cc b/src/tgbatest/ltlprod.cc
index 08654e633..ffb2c4464 100644
--- a/src/tgbatest/ltlprod.cc
+++ b/src/tgbatest/ltlprod.cc
@@ -25,9 +25,9 @@
 #include <cstdlib>
 #include "ltlast/allnodes.hh"
 #include "ltlparse/public.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/dotty.hh"
 
 void
 syntax(char* prog)
diff --git a/src/tgbatest/randtgba.cc b/src/tgbatest/randtgba.cc
index e94d4f8db..9bd59c56c 100644
--- a/src/tgbatest/randtgba.cc
+++ b/src/tgbatest/randtgba.cc
@@ -36,23 +36,23 @@
 #include "ltlvisit/tostring.hh"
 #include "ltlvisit/length.hh"
 #include "ltlvisit/simplify.hh"
-#include "tgbaalgos/randomgraph.hh"
-#include "tgbaalgos/hoa.hh"
-#include "tgbaalgos/stats.hh"
+#include "twaalgos/randomgraph.hh"
+#include "twaalgos/hoa.hh"
+#include "twaalgos/stats.hh"
 #include "ltlenv/defaultenv.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/dotty.hh"
 #include "misc/random.hh"
 #include "misc/optionmap.hh"
-#include "tgbaalgos/degen.hh"
-#include "tgbaalgos/product.hh"
+#include "twaalgos/degen.hh"
+#include "twaalgos/product.hh"
 #include "misc/timer.hh"
 
-#include "tgbaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
 
-#include "tgbaalgos/emptiness.hh"
-#include "tgbaalgos/emptiness_stats.hh"
-#include "tgbaalgos/reducerun.hh"
-#include "tgbaalgos/replayrun.hh"
+#include "twaalgos/emptiness.hh"
+#include "twaalgos/emptiness_stats.hh"
+#include "twaalgos/reducerun.hh"
+#include "twaalgos/replayrun.hh"
 
 struct ec_algo
 {
diff --git a/src/tgbatest/taatgba.cc b/src/tgbatest/taatgba.cc
index 944805b02..5317131d5 100644
--- a/src/tgbatest/taatgba.cc
+++ b/src/tgbatest/taatgba.cc
@@ -22,7 +22,7 @@
 #include "misc/hash.hh"
 #include "ltlenv/defaultenv.hh"
 #include "ltlast/allnodes.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/dotty.hh"
 #include "twa/taatgba.hh"
 
 int
diff --git a/src/twa/twa.cc b/src/twa/twa.cc
index f680136fc..3718d8efd 100644
--- a/src/twa/twa.cc
+++ b/src/twa/twa.cc
@@ -22,8 +22,8 @@
 
 #include "twa.hh"
 #include "twagraph.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/remfin.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/remfin.hh"
 #include <utility>
 
 namespace spot
diff --git a/src/twa/twagraph.hh b/src/twa/twagraph.hh
index 9bbefb260..51b32f252 100644
--- a/src/twa/twagraph.hh
+++ b/src/twa/twagraph.hh
@@ -24,7 +24,7 @@
 #include "graph/ngraph.hh"
 #include "twa/bdddict.hh"
 #include "twa/twa.hh"
-#include "tgbaalgos/dupexp.hh"
+#include "twaalgos/dupexp.hh"
 #include <sstream>
 
 namespace spot
diff --git a/src/twa/twasafracomplement.cc b/src/twa/twasafracomplement.cc
index d31c0f146..3c28d0f88 100644
--- a/src/twa/twasafracomplement.cc
+++ b/src/twa/twasafracomplement.cc
@@ -32,9 +32,9 @@
 #include "misc/hashfunc.hh"
 #include "ltlast/formula.hh"
 #include "ltlast/constant.hh"
-#include "tgbaalgos/dotty.hh"
+#include "twaalgos/dotty.hh"
 #include "twa/twasafracomplement.hh"
-#include "tgbaalgos/degen.hh"
+#include "twaalgos/degen.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/.gitignore b/src/twaalgos/.gitignore
similarity index 100%
rename from src/tgbaalgos/.gitignore
rename to src/twaalgos/.gitignore
diff --git a/src/tgbaalgos/Makefile.am b/src/twaalgos/Makefile.am
similarity index 94%
rename from src/tgbaalgos/Makefile.am
rename to src/twaalgos/Makefile.am
index 8dd060122..3136a34f1 100644
--- a/src/tgbaalgos/Makefile.am
+++ b/src/twaalgos/Makefile.am
@@ -25,9 +25,9 @@ SUBDIRS = gtec
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-tgbaalgosdir = $(pkgincludedir)/tgbaalgos
+twaalgosdir = $(pkgincludedir)/twaalgos
 
-tgbaalgos_HEADERS = \
+twaalgos_HEADERS = \
   are_isomorphic.hh \
   bfssteps.hh \
   canonicalize.hh \
@@ -82,8 +82,8 @@ tgbaalgos_HEADERS = \
   translate.hh \
   word.hh
 
-noinst_LTLIBRARIES = libtgbaalgos.la
-libtgbaalgos_la_SOURCES = \
+noinst_LTLIBRARIES = libtwaalgos.la
+libtwaalgos_la_SOURCES = \
   are_isomorphic.cc \
   bfssteps.cc \
   canonicalize.cc \
@@ -140,4 +140,4 @@ libtgbaalgos_la_SOURCES = \
   weight.hh \
   word.cc
 
-libtgbaalgos_la_LIBADD = gtec/libgtec.la
+libtwaalgos_la_LIBADD = gtec/libgtec.la
diff --git a/src/tgbaalgos/are_isomorphic.cc b/src/twaalgos/are_isomorphic.cc
similarity index 97%
rename from src/tgbaalgos/are_isomorphic.cc
rename to src/twaalgos/are_isomorphic.cc
index 2caa3265a..a78485803 100644
--- a/src/tgbaalgos/are_isomorphic.cc
+++ b/src/twaalgos/are_isomorphic.cc
@@ -21,9 +21,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "twa/twagraph.hh"
-#include "tgbaalgos/are_isomorphic.hh"
-#include "tgbaalgos/canonicalize.hh"
-#include "tgbaalgos/isdet.hh"
+#include "twaalgos/are_isomorphic.hh"
+#include "twaalgos/canonicalize.hh"
+#include "twaalgos/isdet.hh"
 #include <vector>
 #include <queue>
 
diff --git a/src/tgbaalgos/are_isomorphic.hh b/src/twaalgos/are_isomorphic.hh
similarity index 100%
rename from src/tgbaalgos/are_isomorphic.hh
rename to src/twaalgos/are_isomorphic.hh
diff --git a/src/tgbaalgos/bfssteps.cc b/src/twaalgos/bfssteps.cc
similarity index 100%
rename from src/tgbaalgos/bfssteps.cc
rename to src/twaalgos/bfssteps.cc
diff --git a/src/tgbaalgos/bfssteps.hh b/src/twaalgos/bfssteps.hh
similarity index 100%
rename from src/tgbaalgos/bfssteps.hh
rename to src/twaalgos/bfssteps.hh
diff --git a/src/tgbaalgos/canonicalize.cc b/src/twaalgos/canonicalize.cc
similarity index 100%
rename from src/tgbaalgos/canonicalize.cc
rename to src/twaalgos/canonicalize.cc
diff --git a/src/tgbaalgos/canonicalize.hh b/src/twaalgos/canonicalize.hh
similarity index 100%
rename from src/tgbaalgos/canonicalize.hh
rename to src/twaalgos/canonicalize.hh
diff --git a/src/tgbaalgos/cleanacc.cc b/src/twaalgos/cleanacc.cc
similarity index 98%
rename from src/tgbaalgos/cleanacc.cc
rename to src/twaalgos/cleanacc.cc
index 758afe2c3..c89b72802 100644
--- a/src/tgbaalgos/cleanacc.cc
+++ b/src/twaalgos/cleanacc.cc
@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "tgbaalgos/cleanacc.hh"
+#include "twaalgos/cleanacc.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/cleanacc.hh b/src/twaalgos/cleanacc.hh
similarity index 100%
rename from src/tgbaalgos/cleanacc.hh
rename to src/twaalgos/cleanacc.hh
diff --git a/src/tgbaalgos/complete.cc b/src/twaalgos/complete.cc
similarity index 100%
rename from src/tgbaalgos/complete.cc
rename to src/twaalgos/complete.cc
diff --git a/src/tgbaalgos/complete.hh b/src/twaalgos/complete.hh
similarity index 100%
rename from src/tgbaalgos/complete.hh
rename to src/twaalgos/complete.hh
diff --git a/src/tgbaalgos/compsusp.cc b/src/twaalgos/compsusp.cc
similarity index 100%
rename from src/tgbaalgos/compsusp.cc
rename to src/twaalgos/compsusp.cc
diff --git a/src/tgbaalgos/compsusp.hh b/src/twaalgos/compsusp.hh
similarity index 100%
rename from src/tgbaalgos/compsusp.hh
rename to src/twaalgos/compsusp.hh
diff --git a/src/tgbaalgos/cycles.cc b/src/twaalgos/cycles.cc
similarity index 100%
rename from src/tgbaalgos/cycles.cc
rename to src/twaalgos/cycles.cc
diff --git a/src/tgbaalgos/cycles.hh b/src/twaalgos/cycles.hh
similarity index 100%
rename from src/tgbaalgos/cycles.hh
rename to src/twaalgos/cycles.hh
diff --git a/src/tgbaalgos/degen.cc b/src/twaalgos/degen.cc
similarity index 99%
rename from src/tgbaalgos/degen.cc
rename to src/twaalgos/degen.cc
index b13eeadec..518d82ac2 100644
--- a/src/tgbaalgos/degen.cc
+++ b/src/twaalgos/degen.cc
@@ -26,7 +26,7 @@
 #include <vector>
 #include <algorithm>
 #include <iterator>
-#include "tgbaalgos/sccinfo.hh"
+#include "twaalgos/sccinfo.hh"
 #include "twa/bddprint.hh"
 
 //#define DEGEN_DEBUG
diff --git a/src/tgbaalgos/degen.hh b/src/twaalgos/degen.hh
similarity index 100%
rename from src/tgbaalgos/degen.hh
rename to src/twaalgos/degen.hh
diff --git a/src/tgbaalgos/dotty.cc b/src/twaalgos/dotty.cc
similarity index 99%
rename from src/tgbaalgos/dotty.cc
rename to src/twaalgos/dotty.cc
index 069676540..ee02d9740 100644
--- a/src/tgbaalgos/dotty.cc
+++ b/src/twaalgos/dotty.cc
@@ -29,7 +29,7 @@
 #include "misc/escape.hh"
 #include "twa/twagraph.hh"
 #include "twa/formula2bdd.hh"
-#include "tgbaalgos/sccinfo.hh"
+#include "twaalgos/sccinfo.hh"
 #include <cstdlib>
 #include <cstring>
 #include <ctype.h>
diff --git a/src/tgbaalgos/dotty.hh b/src/twaalgos/dotty.hh
similarity index 100%
rename from src/tgbaalgos/dotty.hh
rename to src/twaalgos/dotty.hh
diff --git a/src/tgbaalgos/dtbasat.cc b/src/twaalgos/dtbasat.cc
similarity index 100%
rename from src/tgbaalgos/dtbasat.cc
rename to src/twaalgos/dtbasat.cc
diff --git a/src/tgbaalgos/dtbasat.hh b/src/twaalgos/dtbasat.hh
similarity index 100%
rename from src/tgbaalgos/dtbasat.hh
rename to src/twaalgos/dtbasat.hh
diff --git a/src/tgbaalgos/dtgbacomp.cc b/src/twaalgos/dtgbacomp.cc
similarity index 100%
rename from src/tgbaalgos/dtgbacomp.cc
rename to src/twaalgos/dtgbacomp.cc
diff --git a/src/tgbaalgos/dtgbacomp.hh b/src/twaalgos/dtgbacomp.hh
similarity index 100%
rename from src/tgbaalgos/dtgbacomp.hh
rename to src/twaalgos/dtgbacomp.hh
diff --git a/src/tgbaalgos/dtgbasat.cc b/src/twaalgos/dtgbasat.cc
similarity index 100%
rename from src/tgbaalgos/dtgbasat.cc
rename to src/twaalgos/dtgbasat.cc
diff --git a/src/tgbaalgos/dtgbasat.hh b/src/twaalgos/dtgbasat.hh
similarity index 100%
rename from src/tgbaalgos/dtgbasat.hh
rename to src/twaalgos/dtgbasat.hh
diff --git a/src/tgbaalgos/dupexp.cc b/src/twaalgos/dupexp.cc
similarity index 100%
rename from src/tgbaalgos/dupexp.cc
rename to src/twaalgos/dupexp.cc
diff --git a/src/tgbaalgos/dupexp.hh b/src/twaalgos/dupexp.hh
similarity index 100%
rename from src/tgbaalgos/dupexp.hh
rename to src/twaalgos/dupexp.hh
diff --git a/src/tgbaalgos/emptiness.cc b/src/twaalgos/emptiness.cc
similarity index 98%
rename from src/tgbaalgos/emptiness.cc
rename to src/twaalgos/emptiness.cc
index 776149b97..0af458d67 100644
--- a/src/tgbaalgos/emptiness.cc
+++ b/src/twaalgos/emptiness.cc
@@ -24,12 +24,12 @@
 #include "emptiness.hh"
 #include "twa/twa.hh"
 #include "twa/bddprint.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/gv04.hh"
-#include "tgbaalgos/magic.hh"
-#include "tgbaalgos/se05.hh"
-#include "tgbaalgos/tau03.hh"
-#include "tgbaalgos/tau03opt.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/gv04.hh"
+#include "twaalgos/magic.hh"
+#include "twaalgos/se05.hh"
+#include "twaalgos/tau03.hh"
+#include "twaalgos/tau03opt.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/emptiness.hh b/src/twaalgos/emptiness.hh
similarity index 100%
rename from src/tgbaalgos/emptiness.hh
rename to src/twaalgos/emptiness.hh
diff --git a/src/tgbaalgos/emptiness_stats.hh b/src/twaalgos/emptiness_stats.hh
similarity index 100%
rename from src/tgbaalgos/emptiness_stats.hh
rename to src/twaalgos/emptiness_stats.hh
diff --git a/src/tgbaalgos/gtec/.gitignore b/src/twaalgos/gtec/.gitignore
similarity index 100%
rename from src/tgbaalgos/gtec/.gitignore
rename to src/twaalgos/gtec/.gitignore
diff --git a/src/tgbaalgos/gtec/Makefile.am b/src/twaalgos/gtec/Makefile.am
similarity index 100%
rename from src/tgbaalgos/gtec/Makefile.am
rename to src/twaalgos/gtec/Makefile.am
diff --git a/src/tgbaalgos/gtec/ce.cc b/src/twaalgos/gtec/ce.cc
similarity index 99%
rename from src/tgbaalgos/gtec/ce.cc
rename to src/twaalgos/gtec/ce.cc
index d72b7fd9e..4bdf3893e 100644
--- a/src/tgbaalgos/gtec/ce.cc
+++ b/src/twaalgos/gtec/ce.cc
@@ -21,7 +21,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ce.hh"
-#include "tgbaalgos/bfssteps.hh"
+#include "twaalgos/bfssteps.hh"
 #include "misc/hash.hh"
 
 namespace spot
diff --git a/src/tgbaalgos/gtec/ce.hh b/src/twaalgos/gtec/ce.hh
similarity index 95%
rename from src/tgbaalgos/gtec/ce.hh
rename to src/twaalgos/gtec/ce.hh
index a2f26518c..71be722f9 100644
--- a/src/tgbaalgos/gtec/ce.hh
+++ b/src/twaalgos/gtec/ce.hh
@@ -23,8 +23,8 @@
 #pragma once
 
 #include "status.hh"
-#include "tgbaalgos/emptiness.hh"
-#include "tgbaalgos/emptiness_stats.hh"
+#include "twaalgos/emptiness.hh"
+#include "twaalgos/emptiness_stats.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/gtec/gtec.cc b/src/twaalgos/gtec/gtec.cc
similarity index 100%
rename from src/tgbaalgos/gtec/gtec.cc
rename to src/twaalgos/gtec/gtec.cc
diff --git a/src/tgbaalgos/gtec/gtec.hh b/src/twaalgos/gtec/gtec.hh
similarity index 99%
rename from src/tgbaalgos/gtec/gtec.hh
rename to src/twaalgos/gtec/gtec.hh
index aac415a90..dfe041c0f 100644
--- a/src/tgbaalgos/gtec/gtec.hh
+++ b/src/twaalgos/gtec/gtec.hh
@@ -24,8 +24,8 @@
 
 #include <stack>
 #include "status.hh"
-#include "tgbaalgos/emptiness.hh"
-#include "tgbaalgos/emptiness_stats.hh"
+#include "twaalgos/emptiness.hh"
+#include "twaalgos/emptiness_stats.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/gtec/sccstack.cc b/src/twaalgos/gtec/sccstack.cc
similarity index 100%
rename from src/tgbaalgos/gtec/sccstack.cc
rename to src/twaalgos/gtec/sccstack.cc
diff --git a/src/tgbaalgos/gtec/sccstack.hh b/src/twaalgos/gtec/sccstack.hh
similarity index 100%
rename from src/tgbaalgos/gtec/sccstack.hh
rename to src/twaalgos/gtec/sccstack.hh
diff --git a/src/tgbaalgos/gtec/status.cc b/src/twaalgos/gtec/status.cc
similarity index 100%
rename from src/tgbaalgos/gtec/status.cc
rename to src/twaalgos/gtec/status.cc
diff --git a/src/tgbaalgos/gtec/status.hh b/src/twaalgos/gtec/status.hh
similarity index 100%
rename from src/tgbaalgos/gtec/status.hh
rename to src/twaalgos/gtec/status.hh
diff --git a/src/tgbaalgos/gv04.cc b/src/twaalgos/gv04.cc
similarity index 100%
rename from src/tgbaalgos/gv04.cc
rename to src/twaalgos/gv04.cc
diff --git a/src/tgbaalgos/gv04.hh b/src/twaalgos/gv04.hh
similarity index 100%
rename from src/tgbaalgos/gv04.hh
rename to src/twaalgos/gv04.hh
diff --git a/src/tgbaalgos/hoa.cc b/src/twaalgos/hoa.cc
similarity index 100%
rename from src/tgbaalgos/hoa.cc
rename to src/twaalgos/hoa.cc
diff --git a/src/tgbaalgos/hoa.hh b/src/twaalgos/hoa.hh
similarity index 100%
rename from src/tgbaalgos/hoa.hh
rename to src/twaalgos/hoa.hh
diff --git a/src/tgbaalgos/isdet.cc b/src/twaalgos/isdet.cc
similarity index 98%
rename from src/tgbaalgos/isdet.cc
rename to src/twaalgos/isdet.cc
index 038de920c..89bfb3788 100644
--- a/src/tgbaalgos/isdet.cc
+++ b/src/twaalgos/isdet.cc
@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "tgbaalgos/isdet.hh"
+#include "twaalgos/isdet.hh"
 #include <set>
 #include <deque>
 
diff --git a/src/tgbaalgos/isdet.hh b/src/twaalgos/isdet.hh
similarity index 100%
rename from src/tgbaalgos/isdet.hh
rename to src/twaalgos/isdet.hh
diff --git a/src/tgbaalgos/isweakscc.cc b/src/twaalgos/isweakscc.cc
similarity index 100%
rename from src/tgbaalgos/isweakscc.cc
rename to src/twaalgos/isweakscc.cc
diff --git a/src/tgbaalgos/isweakscc.hh b/src/twaalgos/isweakscc.hh
similarity index 100%
rename from src/tgbaalgos/isweakscc.hh
rename to src/twaalgos/isweakscc.hh
diff --git a/src/tgbaalgos/lbtt.cc b/src/twaalgos/lbtt.cc
similarity index 100%
rename from src/tgbaalgos/lbtt.cc
rename to src/twaalgos/lbtt.cc
diff --git a/src/tgbaalgos/lbtt.hh b/src/twaalgos/lbtt.hh
similarity index 100%
rename from src/tgbaalgos/lbtt.hh
rename to src/twaalgos/lbtt.hh
diff --git a/src/tgbaalgos/ltl2taa.cc b/src/twaalgos/ltl2taa.cc
similarity index 100%
rename from src/tgbaalgos/ltl2taa.cc
rename to src/twaalgos/ltl2taa.cc
diff --git a/src/tgbaalgos/ltl2taa.hh b/src/twaalgos/ltl2taa.hh
similarity index 100%
rename from src/tgbaalgos/ltl2taa.hh
rename to src/twaalgos/ltl2taa.hh
diff --git a/src/tgbaalgos/ltl2tgba_fm.cc b/src/twaalgos/ltl2tgba_fm.cc
similarity index 99%
rename from src/tgbaalgos/ltl2tgba_fm.cc
rename to src/twaalgos/ltl2tgba_fm.cc
index 1c0a2aed7..c5c0afc0e 100644
--- a/src/tgbaalgos/ltl2tgba_fm.cc
+++ b/src/twaalgos/ltl2tgba_fm.cc
@@ -37,8 +37,8 @@
 #include <algorithm>
 #include "ltl2tgba_fm.hh"
 #include "twa/bddprint.hh"
-#include "tgbaalgos/sccinfo.hh"
-//#include "tgbaalgos/dotty.hh"
+#include "twaalgos/sccinfo.hh"
+//#include "twaalgos/dotty.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/ltl2tgba_fm.hh b/src/twaalgos/ltl2tgba_fm.hh
similarity index 100%
rename from src/tgbaalgos/ltl2tgba_fm.hh
rename to src/twaalgos/ltl2tgba_fm.hh
diff --git a/src/tgbaalgos/magic.cc b/src/twaalgos/magic.cc
similarity index 100%
rename from src/tgbaalgos/magic.cc
rename to src/twaalgos/magic.cc
diff --git a/src/tgbaalgos/magic.hh b/src/twaalgos/magic.hh
similarity index 100%
rename from src/tgbaalgos/magic.hh
rename to src/twaalgos/magic.hh
diff --git a/src/tgbaalgos/mask.cc b/src/twaalgos/mask.cc
similarity index 100%
rename from src/tgbaalgos/mask.cc
rename to src/twaalgos/mask.cc
diff --git a/src/tgbaalgos/mask.hh b/src/twaalgos/mask.hh
similarity index 100%
rename from src/tgbaalgos/mask.hh
rename to src/twaalgos/mask.hh
diff --git a/src/tgbaalgos/minimize.cc b/src/twaalgos/minimize.cc
similarity index 98%
rename from src/tgbaalgos/minimize.cc
rename to src/twaalgos/minimize.cc
index 87316583b..24de80fdf 100644
--- a/src/tgbaalgos/minimize.cc
+++ b/src/twaalgos/minimize.cc
@@ -36,16 +36,16 @@
 #include "ltlast/allnodes.hh"
 #include "misc/hash.hh"
 #include "misc/bddlt.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/powerset.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/safety.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/sccinfo.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/bfssteps.hh"
-#include "tgbaalgos/isdet.hh"
-#include "tgbaalgos/dtgbacomp.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/powerset.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/safety.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/sccinfo.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/bfssteps.hh"
+#include "twaalgos/isdet.hh"
+#include "twaalgos/dtgbacomp.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/minimize.hh b/src/twaalgos/minimize.hh
similarity index 100%
rename from src/tgbaalgos/minimize.hh
rename to src/twaalgos/minimize.hh
diff --git a/src/tgbaalgos/ndfs_result.hxx b/src/twaalgos/ndfs_result.hxx
similarity index 100%
rename from src/tgbaalgos/ndfs_result.hxx
rename to src/twaalgos/ndfs_result.hxx
diff --git a/src/tgbaalgos/neverclaim.cc b/src/twaalgos/neverclaim.cc
similarity index 100%
rename from src/tgbaalgos/neverclaim.cc
rename to src/twaalgos/neverclaim.cc
diff --git a/src/tgbaalgos/neverclaim.hh b/src/twaalgos/neverclaim.hh
similarity index 100%
rename from src/tgbaalgos/neverclaim.hh
rename to src/twaalgos/neverclaim.hh
diff --git a/src/tgbaalgos/postproc.cc b/src/twaalgos/postproc.cc
similarity index 100%
rename from src/tgbaalgos/postproc.cc
rename to src/twaalgos/postproc.cc
diff --git a/src/tgbaalgos/postproc.hh b/src/twaalgos/postproc.hh
similarity index 100%
rename from src/tgbaalgos/postproc.hh
rename to src/twaalgos/postproc.hh
diff --git a/src/tgbaalgos/powerset.cc b/src/twaalgos/powerset.cc
similarity index 97%
rename from src/tgbaalgos/powerset.cc
rename to src/twaalgos/powerset.cc
index 75a55b247..52daabbe6 100644
--- a/src/tgbaalgos/powerset.cc
+++ b/src/twaalgos/powerset.cc
@@ -25,16 +25,16 @@
 #include <vector>
 #include "powerset.hh"
 #include "misc/hash.hh"
-#include "tgbaalgos/powerset.hh"
-#include "tgbaalgos/sccinfo.hh"
-#include "tgbaalgos/cycles.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/product.hh"
+#include "twaalgos/powerset.hh"
+#include "twaalgos/sccinfo.hh"
+#include "twaalgos/cycles.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/product.hh"
 #include "twa/bddprint.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/dtgbacomp.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/dtgbacomp.hh"
 #include "ltlast/unop.hh"
 #include "misc/bitvect.hh"
 #include "misc/bddlt.hh"
diff --git a/src/tgbaalgos/powerset.hh b/src/twaalgos/powerset.hh
similarity index 100%
rename from src/tgbaalgos/powerset.hh
rename to src/twaalgos/powerset.hh
diff --git a/src/tgbaalgos/product.cc b/src/twaalgos/product.cc
similarity index 100%
rename from src/tgbaalgos/product.cc
rename to src/twaalgos/product.cc
diff --git a/src/tgbaalgos/product.hh b/src/twaalgos/product.hh
similarity index 100%
rename from src/tgbaalgos/product.hh
rename to src/twaalgos/product.hh
diff --git a/src/tgbaalgos/projrun.cc b/src/twaalgos/projrun.cc
similarity index 97%
rename from src/tgbaalgos/projrun.cc
rename to src/twaalgos/projrun.cc
index 16b0d69b6..fb665ba25 100644
--- a/src/tgbaalgos/projrun.cc
+++ b/src/twaalgos/projrun.cc
@@ -22,7 +22,7 @@
 
 #include "projrun.hh"
 #include "twa/twa.hh"
-#include "tgbaalgos/emptiness.hh"
+#include "twaalgos/emptiness.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/projrun.hh b/src/twaalgos/projrun.hh
similarity index 97%
rename from src/tgbaalgos/projrun.hh
rename to src/twaalgos/projrun.hh
index 5f2258554..d93305c91 100644
--- a/src/tgbaalgos/projrun.hh
+++ b/src/twaalgos/projrun.hh
@@ -25,7 +25,7 @@
 #include "misc/common.hh"
 #include <iosfwd>
 #include "twa/fwd.hh"
-#include "tgbaalgos/emptiness.hh"
+#include "twaalgos/emptiness.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/randomgraph.cc b/src/twaalgos/randomgraph.cc
similarity index 100%
rename from src/tgbaalgos/randomgraph.cc
rename to src/twaalgos/randomgraph.cc
diff --git a/src/tgbaalgos/randomgraph.hh b/src/twaalgos/randomgraph.hh
similarity index 100%
rename from src/tgbaalgos/randomgraph.hh
rename to src/twaalgos/randomgraph.hh
diff --git a/src/tgbaalgos/randomize.cc b/src/twaalgos/randomize.cc
similarity index 100%
rename from src/tgbaalgos/randomize.cc
rename to src/twaalgos/randomize.cc
diff --git a/src/tgbaalgos/randomize.hh b/src/twaalgos/randomize.hh
similarity index 100%
rename from src/tgbaalgos/randomize.hh
rename to src/twaalgos/randomize.hh
diff --git a/src/tgbaalgos/reachiter.cc b/src/twaalgos/reachiter.cc
similarity index 100%
rename from src/tgbaalgos/reachiter.cc
rename to src/twaalgos/reachiter.cc
diff --git a/src/tgbaalgos/reachiter.hh b/src/twaalgos/reachiter.hh
similarity index 100%
rename from src/tgbaalgos/reachiter.hh
rename to src/twaalgos/reachiter.hh
diff --git a/src/tgbaalgos/reducerun.cc b/src/twaalgos/reducerun.cc
similarity index 100%
rename from src/tgbaalgos/reducerun.cc
rename to src/twaalgos/reducerun.cc
diff --git a/src/tgbaalgos/reducerun.hh b/src/twaalgos/reducerun.hh
similarity index 97%
rename from src/tgbaalgos/reducerun.hh
rename to src/twaalgos/reducerun.hh
index a011f4a96..a9aace3a4 100644
--- a/src/tgbaalgos/reducerun.hh
+++ b/src/twaalgos/reducerun.hh
@@ -24,7 +24,7 @@
 
 #include "misc/common.hh"
 #include "twa/fwd.hh"
-#include "tgbaalgos/emptiness.hh"
+#include "twaalgos/emptiness.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/relabel.cc b/src/twaalgos/relabel.cc
similarity index 100%
rename from src/tgbaalgos/relabel.cc
rename to src/twaalgos/relabel.cc
diff --git a/src/tgbaalgos/relabel.hh b/src/twaalgos/relabel.hh
similarity index 100%
rename from src/tgbaalgos/relabel.hh
rename to src/twaalgos/relabel.hh
diff --git a/src/tgbaalgos/remfin.cc b/src/twaalgos/remfin.cc
similarity index 100%
rename from src/tgbaalgos/remfin.cc
rename to src/twaalgos/remfin.cc
diff --git a/src/tgbaalgos/remfin.hh b/src/twaalgos/remfin.hh
similarity index 100%
rename from src/tgbaalgos/remfin.hh
rename to src/twaalgos/remfin.hh
diff --git a/src/tgbaalgos/remprop.cc b/src/twaalgos/remprop.cc
similarity index 99%
rename from src/tgbaalgos/remprop.cc
rename to src/twaalgos/remprop.cc
index 09bd19f06..cb3ae613d 100644
--- a/src/tgbaalgos/remprop.cc
+++ b/src/twaalgos/remprop.cc
@@ -19,7 +19,7 @@
 
 #include "remprop.hh"
 #include "ltlenv/defaultenv.hh"
-#include "tgbaalgos/mask.hh"
+#include "twaalgos/mask.hh"
 #include "misc/casts.hh"
 #include "ltlvisit/tostring.hh"
 #include <ctype.h>
diff --git a/src/tgbaalgos/remprop.hh b/src/twaalgos/remprop.hh
similarity index 100%
rename from src/tgbaalgos/remprop.hh
rename to src/twaalgos/remprop.hh
diff --git a/src/tgbaalgos/replayrun.cc b/src/twaalgos/replayrun.cc
similarity index 100%
rename from src/tgbaalgos/replayrun.cc
rename to src/twaalgos/replayrun.cc
diff --git a/src/tgbaalgos/replayrun.hh b/src/twaalgos/replayrun.hh
similarity index 98%
rename from src/tgbaalgos/replayrun.hh
rename to src/twaalgos/replayrun.hh
index 995e711be..e9f5607c3 100644
--- a/src/tgbaalgos/replayrun.hh
+++ b/src/twaalgos/replayrun.hh
@@ -25,7 +25,7 @@
 #include "misc/common.hh"
 #include <iosfwd>
 #include "twa/fwd.hh"
-#include "tgbaalgos/emptiness.hh"
+#include "twaalgos/emptiness.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/safety.cc b/src/twaalgos/safety.cc
similarity index 100%
rename from src/tgbaalgos/safety.cc
rename to src/twaalgos/safety.cc
diff --git a/src/tgbaalgos/safety.hh b/src/twaalgos/safety.hh
similarity index 100%
rename from src/tgbaalgos/safety.hh
rename to src/twaalgos/safety.hh
diff --git a/src/tgbaalgos/sbacc.cc b/src/twaalgos/sbacc.cc
similarity index 100%
rename from src/tgbaalgos/sbacc.cc
rename to src/twaalgos/sbacc.cc
diff --git a/src/tgbaalgos/sbacc.hh b/src/twaalgos/sbacc.hh
similarity index 100%
rename from src/tgbaalgos/sbacc.hh
rename to src/twaalgos/sbacc.hh
diff --git a/src/tgbaalgos/scc.cc b/src/twaalgos/scc.cc
similarity index 100%
rename from src/tgbaalgos/scc.cc
rename to src/twaalgos/scc.cc
diff --git a/src/tgbaalgos/scc.hh b/src/twaalgos/scc.hh
similarity index 100%
rename from src/tgbaalgos/scc.hh
rename to src/twaalgos/scc.hh
diff --git a/src/tgbaalgos/sccfilter.cc b/src/twaalgos/sccfilter.cc
similarity index 100%
rename from src/tgbaalgos/sccfilter.cc
rename to src/twaalgos/sccfilter.cc
diff --git a/src/tgbaalgos/sccfilter.hh b/src/twaalgos/sccfilter.hh
similarity index 100%
rename from src/tgbaalgos/sccfilter.hh
rename to src/twaalgos/sccfilter.hh
diff --git a/src/tgbaalgos/sccinfo.cc b/src/twaalgos/sccinfo.cc
similarity index 100%
rename from src/tgbaalgos/sccinfo.cc
rename to src/twaalgos/sccinfo.cc
diff --git a/src/tgbaalgos/sccinfo.hh b/src/twaalgos/sccinfo.hh
similarity index 100%
rename from src/tgbaalgos/sccinfo.hh
rename to src/twaalgos/sccinfo.hh
diff --git a/src/tgbaalgos/se05.cc b/src/twaalgos/se05.cc
similarity index 100%
rename from src/tgbaalgos/se05.cc
rename to src/twaalgos/se05.cc
diff --git a/src/tgbaalgos/se05.hh b/src/twaalgos/se05.hh
similarity index 100%
rename from src/tgbaalgos/se05.hh
rename to src/twaalgos/se05.hh
diff --git a/src/tgbaalgos/simulation.cc b/src/twaalgos/simulation.cc
similarity index 99%
rename from src/tgbaalgos/simulation.cc
rename to src/twaalgos/simulation.cc
index c9ffe41af..fce1440ad 100644
--- a/src/tgbaalgos/simulation.cc
+++ b/src/twaalgos/simulation.cc
@@ -25,9 +25,9 @@
 #include "simulation.hh"
 #include "misc/minato.hh"
 #include "twa/bddprint.hh"
-#include "tgbaalgos/reachiter.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/sccinfo.hh"
+#include "twaalgos/reachiter.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/sccinfo.hh"
 #include "misc/bddlt.hh"
 
 // The way we developed this algorithm is the following: We take an
diff --git a/src/tgbaalgos/simulation.hh b/src/twaalgos/simulation.hh
similarity index 100%
rename from src/tgbaalgos/simulation.hh
rename to src/twaalgos/simulation.hh
diff --git a/src/tgbaalgos/stats.cc b/src/twaalgos/stats.cc
similarity index 98%
rename from src/tgbaalgos/stats.cc
rename to src/twaalgos/stats.cc
index 48fa71a50..aa960c784 100644
--- a/src/tgbaalgos/stats.cc
+++ b/src/twaalgos/stats.cc
@@ -26,8 +26,8 @@
 #include "stats.hh"
 #include "reachiter.hh"
 #include "ltlvisit/tostring.hh"
-#include "tgbaalgos/isdet.hh"
-#include "tgbaalgos/sccinfo.hh"
+#include "twaalgos/isdet.hh"
+#include "twaalgos/sccinfo.hh"
 
 namespace spot
 {
diff --git a/src/tgbaalgos/stats.hh b/src/twaalgos/stats.hh
similarity index 100%
rename from src/tgbaalgos/stats.hh
rename to src/twaalgos/stats.hh
diff --git a/src/tgbaalgos/stripacc.cc b/src/twaalgos/stripacc.cc
similarity index 100%
rename from src/tgbaalgos/stripacc.cc
rename to src/twaalgos/stripacc.cc
diff --git a/src/tgbaalgos/stripacc.hh b/src/twaalgos/stripacc.hh
similarity index 100%
rename from src/tgbaalgos/stripacc.hh
rename to src/twaalgos/stripacc.hh
diff --git a/src/tgbaalgos/stutter.cc b/src/twaalgos/stutter.cc
similarity index 99%
rename from src/tgbaalgos/stutter.cc
rename to src/twaalgos/stutter.cc
index 2c9ab6ee3..a9cec6ed8 100644
--- a/src/tgbaalgos/stutter.cc
+++ b/src/twaalgos/stutter.cc
@@ -27,8 +27,8 @@
 #include "ltlast/unop.hh"
 #include "ltlast/binop.hh"
 #include "ltlvisit/remove_x.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
 #include "twa/twaproduct.hh"
 #include "twa/bddprint.hh"
 #include <deque>
diff --git a/src/tgbaalgos/stutter.hh b/src/twaalgos/stutter.hh
similarity index 100%
rename from src/tgbaalgos/stutter.hh
rename to src/twaalgos/stutter.hh
diff --git a/src/tgbaalgos/tau03.cc b/src/twaalgos/tau03.cc
similarity index 100%
rename from src/tgbaalgos/tau03.cc
rename to src/twaalgos/tau03.cc
diff --git a/src/tgbaalgos/tau03.hh b/src/twaalgos/tau03.hh
similarity index 100%
rename from src/tgbaalgos/tau03.hh
rename to src/twaalgos/tau03.hh
diff --git a/src/tgbaalgos/tau03opt.cc b/src/twaalgos/tau03opt.cc
similarity index 100%
rename from src/tgbaalgos/tau03opt.cc
rename to src/twaalgos/tau03opt.cc
diff --git a/src/tgbaalgos/tau03opt.hh b/src/twaalgos/tau03opt.hh
similarity index 100%
rename from src/tgbaalgos/tau03opt.hh
rename to src/twaalgos/tau03opt.hh
diff --git a/src/tgbaalgos/totgba.cc b/src/twaalgos/totgba.cc
similarity index 100%
rename from src/tgbaalgos/totgba.cc
rename to src/twaalgos/totgba.cc
diff --git a/src/tgbaalgos/totgba.hh b/src/twaalgos/totgba.hh
similarity index 100%
rename from src/tgbaalgos/totgba.hh
rename to src/twaalgos/totgba.hh
diff --git a/src/tgbaalgos/translate.cc b/src/twaalgos/translate.cc
similarity index 100%
rename from src/tgbaalgos/translate.cc
rename to src/twaalgos/translate.cc
diff --git a/src/tgbaalgos/translate.hh b/src/twaalgos/translate.hh
similarity index 100%
rename from src/tgbaalgos/translate.hh
rename to src/twaalgos/translate.hh
diff --git a/src/tgbaalgos/weight.cc b/src/twaalgos/weight.cc
similarity index 100%
rename from src/tgbaalgos/weight.cc
rename to src/twaalgos/weight.cc
diff --git a/src/tgbaalgos/weight.hh b/src/twaalgos/weight.hh
similarity index 100%
rename from src/tgbaalgos/weight.hh
rename to src/twaalgos/weight.hh
diff --git a/src/tgbaalgos/word.cc b/src/twaalgos/word.cc
similarity index 100%
rename from src/tgbaalgos/word.cc
rename to src/twaalgos/word.cc
diff --git a/src/tgbaalgos/word.hh b/src/twaalgos/word.hh
similarity index 100%
rename from src/tgbaalgos/word.hh
rename to src/twaalgos/word.hh
diff --git a/wrap/python/spot_impl.i b/wrap/python/spot_impl.i
index 7b3606cc6..267e4cf9b 100644
--- a/wrap/python/spot_impl.i
+++ b/wrap/python/spot_impl.i
@@ -116,30 +116,30 @@ namespace std {
 #include "twa/taatgba.hh"
 #include "twa/twaproduct.hh"
 
-#include "tgbaalgos/cleanacc.hh"
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/degen.hh"
-#include "tgbaalgos/dupexp.hh"
-#include "tgbaalgos/emptiness.hh"
-#include "tgbaalgos/gtec/gtec.hh"
-#include "tgbaalgos/lbtt.hh"
-#include "tgbaalgos/ltl2taa.hh"
-#include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/compsusp.hh"
-#include "tgbaalgos/magic.hh"
-#include "tgbaalgos/minimize.hh"
-#include "tgbaalgos/neverclaim.hh"
-#include "tgbaalgos/remfin.hh"
-#include "tgbaalgos/safety.hh"
-#include "tgbaalgos/sccfilter.hh"
-#include "tgbaalgos/stats.hh"
-#include "tgbaalgos/isdet.hh"
-#include "tgbaalgos/simulation.hh"
-#include "tgbaalgos/postproc.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/stutter.hh"
-#include "tgbaalgos/translate.hh"
-#include "tgbaalgos/hoa.hh"
+#include "twaalgos/cleanacc.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/degen.hh"
+#include "twaalgos/dupexp.hh"
+#include "twaalgos/emptiness.hh"
+#include "twaalgos/gtec/gtec.hh"
+#include "twaalgos/lbtt.hh"
+#include "twaalgos/ltl2taa.hh"
+#include "twaalgos/ltl2tgba_fm.hh"
+#include "twaalgos/compsusp.hh"
+#include "twaalgos/magic.hh"
+#include "twaalgos/minimize.hh"
+#include "twaalgos/neverclaim.hh"
+#include "twaalgos/remfin.hh"
+#include "twaalgos/safety.hh"
+#include "twaalgos/sccfilter.hh"
+#include "twaalgos/stats.hh"
+#include "twaalgos/isdet.hh"
+#include "twaalgos/simulation.hh"
+#include "twaalgos/postproc.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/stutter.hh"
+#include "twaalgos/translate.hh"
+#include "twaalgos/hoa.hh"
 
 #include "hoaparse/public.hh"
 
@@ -258,30 +258,30 @@ using namespace spot;
 
 // Should come after the definition of twa_graph
 
-%include "tgbaalgos/cleanacc.hh"
-%include "tgbaalgos/degen.hh"
-%include "tgbaalgos/dotty.hh"
-%include "tgbaalgos/dupexp.hh"
-%include "tgbaalgos/emptiness.hh"
-%include "tgbaalgos/gtec/gtec.hh"
-%include "tgbaalgos/lbtt.hh"
-%include "tgbaalgos/ltl2taa.hh"
-%include "tgbaalgos/ltl2tgba_fm.hh"
-%include "tgbaalgos/compsusp.hh"
-%include "tgbaalgos/magic.hh"
-%include "tgbaalgos/minimize.hh"
-%include "tgbaalgos/neverclaim.hh"
-%include "tgbaalgos/safety.hh"
-%include "tgbaalgos/remfin.hh"
-%include "tgbaalgos/sccfilter.hh"
-%include "tgbaalgos/stats.hh"
-%include "tgbaalgos/isdet.hh"
-%include "tgbaalgos/simulation.hh"
-%include "tgbaalgos/postproc.hh"
-%include "tgbaalgos/product.hh"
-%include "tgbaalgos/stutter.hh"
-%include "tgbaalgos/translate.hh"
-%include "tgbaalgos/hoa.hh"
+%include "twaalgos/cleanacc.hh"
+%include "twaalgos/degen.hh"
+%include "twaalgos/dotty.hh"
+%include "twaalgos/dupexp.hh"
+%include "twaalgos/emptiness.hh"
+%include "twaalgos/gtec/gtec.hh"
+%include "twaalgos/lbtt.hh"
+%include "twaalgos/ltl2taa.hh"
+%include "twaalgos/ltl2tgba_fm.hh"
+%include "twaalgos/compsusp.hh"
+%include "twaalgos/magic.hh"
+%include "twaalgos/minimize.hh"
+%include "twaalgos/neverclaim.hh"
+%include "twaalgos/safety.hh"
+%include "twaalgos/remfin.hh"
+%include "twaalgos/sccfilter.hh"
+%include "twaalgos/stats.hh"
+%include "twaalgos/isdet.hh"
+%include "twaalgos/simulation.hh"
+%include "twaalgos/postproc.hh"
+%include "twaalgos/product.hh"
+%include "twaalgos/stutter.hh"
+%include "twaalgos/translate.hh"
+%include "twaalgos/hoa.hh"
 
 %include "hoaparse/public.hh"