diff --git a/src/bin/ltlcross.cc b/src/bin/ltlcross.cc
index 96a2fddea..0a6b66f1d 100644
--- a/src/bin/ltlcross.cc
+++ b/src/bin/ltlcross.cc
@@ -53,7 +53,7 @@
 #include "tgbaalgos/isweakscc.hh"
 #include "tgbaalgos/reducerun.hh"
 #include "tgbaalgos/word.hh"
-#include "tgbaalgos/dbacomp.hh"
+#include "tgbaalgos/dtgbacomp.hh"
 #include "misc/formater.hh"
 #include "tgbaalgos/stats.hh"
 #include "tgbaalgos/isdet.hh"
@@ -1105,7 +1105,7 @@ namespace
 	  if (!no_complement && pos[n]
 	      && ((want_stats && !(*pstats)[n].nondeterministic)
 		  || (!want_stats && is_deterministic(pos[n]))))
-	    comp_pos[n] = dba_complement(pos[n]);
+	    comp_pos[n] = dtgba_complement(pos[n]);
 	}
 
       // ---------- Negative Formula ----------
@@ -1143,7 +1143,7 @@ namespace
 	      if (!no_complement && neg[n]
 		  && ((want_stats && !(*nstats)[n].nondeterministic)
 		      || (!want_stats && is_deterministic(neg[n]))))
-		comp_neg[n] = dba_complement(neg[n]);
+		comp_neg[n] = dtgba_complement(neg[n]);
 	    }
 	  nf->destroy();
 	}
diff --git a/src/tgbaalgos/Makefile.am b/src/tgbaalgos/Makefile.am
index 1571e6186..cb710ffc3 100644
--- a/src/tgbaalgos/Makefile.am
+++ b/src/tgbaalgos/Makefile.am
@@ -33,7 +33,7 @@ tgbaalgos_HEADERS = \
   compsusp.hh \
   cutscc.hh \
   cycles.hh \
-  dbacomp.hh \
+  dtgbacomp.hh \
   degen.hh \
   dottydec.hh \
   dotty.hh \
@@ -82,7 +82,7 @@ libtgbaalgos_la_SOURCES = \
   compsusp.cc \
   cutscc.cc \
   cycles.cc \
-  dbacomp.cc \
+  dtgbacomp.cc \
   degen.cc \
   dotty.cc \
   dottydec.cc \
diff --git a/src/tgbaalgos/dbacomp.cc b/src/tgbaalgos/dtgbacomp.cc
similarity index 95%
rename from src/tgbaalgos/dbacomp.cc
rename to src/tgbaalgos/dtgbacomp.cc
index c1be952d7..ec7c94762 100644
--- a/src/tgbaalgos/dbacomp.cc
+++ b/src/tgbaalgos/dtgbacomp.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 "dbacomp.hh"
+#include "dtgbacomp.hh"
 #include "ltlast/constant.hh"
 #include "reachiter.hh"
 
@@ -26,7 +26,7 @@ namespace spot
 
   namespace
   {
-    class dbacomp_iter: public tgba_reachable_iterator_depth_first_stack
+    class dtgbacomp_iter: public tgba_reachable_iterator_depth_first_stack
     {
       bdd orig_acc_;
       bdd all_neg_;
@@ -37,7 +37,7 @@ namespace spot
 
       typedef state_explicit_number::transition trans;
     public:
-      dbacomp_iter(const tgba* a)
+      dtgbacomp_iter(const tgba* a)
 	: tgba_reachable_iterator_depth_first_stack(a),
 	  dict_(a->get_dict()),
 	  out_(new tgba_explicit_number(dict_))
@@ -162,9 +162,9 @@ namespace spot
 
   } // anonymous
 
-  tgba_explicit_number* dba_complement(const tgba* aut)
+  tgba_explicit_number* dtgba_complement(const tgba* aut)
   {
-    dbacomp_iter dci(aut);
+    dtgbacomp_iter dci(aut);
     dci.run();
     return dci.result();
   }
diff --git a/src/tgbaalgos/dbacomp.hh b/src/tgbaalgos/dtgbacomp.hh
similarity index 84%
rename from src/tgbaalgos/dbacomp.hh
rename to src/tgbaalgos/dtgbacomp.hh
index 0a7ac6ee0..cccf67f59 100644
--- a/src/tgbaalgos/dbacomp.hh
+++ b/src/tgbaalgos/dtgbacomp.hh
@@ -17,21 +17,21 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef SPOT_TGBAALGOS_DBACOMP_HH
-# define SPOT_TGBAALGOS_DBACOMP_HH
+#ifndef SPOT_TGBAALGOS_DTGBACOMP_HH
+# define SPOT_TGBAALGOS_DTGBACOMP_HH
 
 #include "tgba/tgbaexplicit.hh"
 
 namespace spot
 {
-  /// \brief Complement a deterministic Büchi automaton
+  /// \brief Complement a deterministic TGBA
   ///
   /// The automaton \a aut should be deterministic.  It does no need
   /// to be complete.  Acceptance can be transition-based, or
   /// state-based.  The resulting automaton is very unlikely to be
   /// deterministic.
   SPOT_API tgba_explicit_number*
-  dba_complement(const tgba* aut);
+  dtgba_complement(const tgba* aut);
 }
 
-#endif // SPOT_TGBAALGOS_DBACOMP_HH
+#endif // SPOT_TGBAALGOS_DTGBACOMP_HH
diff --git a/src/tgbaalgos/minimize.cc b/src/tgbaalgos/minimize.cc
index babecda2a..fa4dad307 100644
--- a/src/tgbaalgos/minimize.cc
+++ b/src/tgbaalgos/minimize.cc
@@ -47,7 +47,7 @@
 #include "tgbaalgos/ltl2tgba_fm.hh"
 #include "tgbaalgos/bfssteps.hh"
 #include "tgbaalgos/isdet.hh"
-#include "tgbaalgos/dbacomp.hh"
+#include "tgbaalgos/dtgbacomp.hh"
 #include "priv/countstates.hh"
 
 namespace spot
@@ -672,7 +672,7 @@ namespace spot
 	  {
 	    // If the automaton is deterministic, complementing is
 	    // easy.
-	    to_free = aut_neg_f = dba_complement(aut_f);
+	    to_free = aut_neg_f = dtgba_complement(aut_f);
 	  }
 	else
 	  {
diff --git a/src/tgbaalgos/powerset.cc b/src/tgbaalgos/powerset.cc
index d09631b1c..9f0a6b625 100644
--- a/src/tgbaalgos/powerset.cc
+++ b/src/tgbaalgos/powerset.cc
@@ -36,7 +36,7 @@
 #include "tgbaalgos/gtec/gtec.hh"
 #include "tgbaalgos/sccfilter.hh"
 #include "tgbaalgos/ltl2tgba_fm.hh"
-#include "tgbaalgos/dbacomp.hh"
+#include "tgbaalgos/dtgbacomp.hh"
 #include "ltlast/unop.hh"
 
 namespace spot
@@ -382,7 +382,7 @@ namespace spot
 	delete p;
 
 	// Complement the DBA.
-	tgba* neg_det = dba_complement(det);
+	tgba* neg_det = dtgba_complement(det);
 
 	tgba* p = new tgba_product(aut, neg_det);
 	emptiness_check* ec = couvreur99(p);
diff --git a/src/tgbatest/ltl2tgba.cc b/src/tgbatest/ltl2tgba.cc
index f52b41bb1..7ab4c93a0 100644
--- a/src/tgbatest/ltl2tgba.cc
+++ b/src/tgbatest/ltl2tgba.cc
@@ -70,7 +70,7 @@
 #include "tgbaalgos/simulation.hh"
 #include "tgbaalgos/compsusp.hh"
 #include "tgbaalgos/powerset.hh"
-#include "tgbaalgos/dbacomp.hh"
+#include "tgbaalgos/dtgbacomp.hh"
 #include "tgbaalgos/complete.hh"
 #include "tgbaalgos/dtbasat.hh"
 #include "tgbaalgos/dtgbasat.hh"
@@ -396,7 +396,7 @@ main(int argc, char** argv)
   bool opt_determinize = false;
   unsigned opt_determinize_threshold = 0;
   unsigned opt_o_threshold = 0;
-  bool opt_dbacomp = false;
+  bool opt_dtgbacomp = false;
   bool reject_bigger = false;
   bool opt_bisim_ta = false;
   bool opt_monitor = false;
@@ -487,7 +487,7 @@ main(int argc, char** argv)
 	}
       else if (!strcmp(argv[formula_index], "-DC"))
 	{
-	  opt_dbacomp = true;
+	  opt_dtgbacomp = true;
 	}
       else if (!strncmp(argv[formula_index], "-DS", 3))
 	{
@@ -1543,11 +1543,11 @@ main(int argc, char** argv)
 	}
 
       spot::tgba* complemented = 0;
-      if (opt_dbacomp)
+      if (opt_dtgbacomp)
 	{
-	  tm.start("DBA complement");
-	  a = complemented = dba_complement(a);
-	  tm.stop("DBA complement");
+	  tm.start("DTGBA complement");
+	  a = complemented = dtgba_complement(a);
+	  tm.stop("DTGBA complement");
 	}
 
       if (complemented || satminimized || determinized)