diff --git a/test/ftermcapquirks-test.cpp b/test/ftermcapquirks-test.cpp
index 090b7a84..5913c9b9 100644
--- a/test/ftermcapquirks-test.cpp
+++ b/test/ftermcapquirks-test.cpp
@@ -239,7 +239,7 @@ void FTermcapQuirksTest::generalTest()
   finalcut::FTermcap::can_change_color_palette = false;
   finalcut::FTermcapQuirks quirks;
   finalcut::FTermDetection detect;
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -306,7 +306,7 @@ void FTermcapQuirksTest::xtermTest()
   finalcut::FTermcap::can_change_color_palette = false;
   detect.setXTerminal (true);
   data.setTermType ("xterm");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -339,7 +339,7 @@ void FTermcapQuirksTest::freebsdTest()
   finalcut::FTermDetection detect;
   detect.setFreeBSDTerm (true);
   data.setTermType ("xterm-16color");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -378,7 +378,7 @@ void FTermcapQuirksTest::cygwinTest()
   finalcut::FTermDetection detect;
   detect.setCygwinTerminal (true);
   data.setTermType ("cygwin");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -406,7 +406,7 @@ void FTermcapQuirksTest::linuxTest()
   finalcut::FTermDetection detect;
   detect.setLinuxTerm (true);
   data.setTermType ("linux");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -478,7 +478,7 @@ void FTermcapQuirksTest::rxvtTest()
   finalcut::FTermDetection detect;
   detect.setRxvtTerminal (true);
   data.setTermType ("rxvt");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -522,7 +522,7 @@ void FTermcapQuirksTest::vteTest()
   finalcut::FTermDetection detect;
   detect.setGnomeTerminal (true);
   data.setTermType ("gnome-256color");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -551,7 +551,7 @@ void FTermcapQuirksTest::puttyTest()
   finalcut::FTermDetection detect;
   detect.setPuttyTerminal (true);
   data.setTermType ("putty");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -640,7 +640,7 @@ void FTermcapQuirksTest::teratermTest()
   finalcut::FTermDetection detect;
   detect.setTeraTerm (true);
   data.setTermType ("teraterm");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -666,7 +666,7 @@ void FTermcapQuirksTest::sunTest()
   finalcut::FTermDetection detect;
   detect.setSunTerminal (true);
   data.setTermType ("sun-color");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
@@ -690,7 +690,7 @@ void FTermcapQuirksTest::screenTest()
   finalcut::FTermcap::can_change_color_palette = false;
   detect.setScreenTerm (true);
   data.setTermType ("screen-256color");
-  quirks.setTermData(&data);
+  quirks.setFTermData(&data);
   quirks.setFTermDetection (&detect);
   quirks.terminalFixup();
 
diff --git a/test/ftermdetection-test.cpp b/test/ftermdetection-test.cpp
index b5edec56..bf78ca1a 100644
--- a/test/ftermdetection-test.cpp
+++ b/test/ftermdetection-test.cpp
@@ -482,7 +482,7 @@ void FTermDetectionTest::ansiTest()
   finalcut::FTermDetection detect;
   setenv ("TERM", "ansi", 1);
   data.setTermFileName(C_STR("ansi"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
 
   pid_t pid = forkProcess();
 
@@ -551,7 +551,7 @@ void FTermDetectionTest::xtermTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -613,7 +613,7 @@ void FTermDetectionTest::rxvtTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("rxvt-cygwin-native"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -676,7 +676,7 @@ void FTermDetectionTest::urxvtTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("rxvt-unicode-256color"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -739,7 +739,7 @@ void FTermDetectionTest::mltermTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("mlterm"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -809,7 +809,7 @@ void FTermDetectionTest::puttyTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -872,7 +872,7 @@ void FTermDetectionTest::kdeKonsoleTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm-256color"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -934,7 +934,7 @@ void FTermDetectionTest::gnomeTerminalTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm-256color"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -997,7 +997,7 @@ void FTermDetectionTest::newerVteTerminalTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm-256color"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1060,7 +1060,7 @@ void FTermDetectionTest::ktermTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("kterm"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1130,7 +1130,7 @@ void FTermDetectionTest::teraTermTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1193,7 +1193,7 @@ void FTermDetectionTest::cygwinTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("cygwin"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1256,7 +1256,7 @@ void FTermDetectionTest::minttyTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm-256color"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1319,7 +1319,7 @@ void FTermDetectionTest::linuxTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("linux"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1389,7 +1389,7 @@ void FTermDetectionTest::freebsdTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("xterm"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1462,7 +1462,7 @@ void FTermDetectionTest::netbsdTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("wsvt25"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1533,7 +1533,7 @@ void FTermDetectionTest::openbsdTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("vt220"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1604,7 +1604,7 @@ void FTermDetectionTest::sunTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("sun-color"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
 
   pid_t pid = forkProcess();
 
@@ -1673,7 +1673,7 @@ void FTermDetectionTest::screenTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("screen"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1742,7 +1742,7 @@ void FTermDetectionTest::tmuxTest()
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
   data.setTermFileName(C_STR("screen"));
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
 
   pid_t pid = forkProcess();
@@ -1846,7 +1846,7 @@ void FTermDetectionTest::ttytypeTest()
 
   finalcut::FTermData data;
   finalcut::FTermDetection detect;
-  detect.setTermData(&data);
+  detect.setFTermData(&data);
   detect.setTerminalDetection(true);
   detect.setTtyTypeFileName(C_STR("new-root-dir/etc/ttytype"));