diff --git a/COPYING b/COPYING
index 81dbdfe..7f447e1 100644
--- a/COPYING
+++ b/COPYING
@@ -65,7 +65,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -102,7 +102,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
+    whole or in part tqcontains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/COPYING.LIB b/COPYING.LIB
index f7b749a..677f540 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -99,7 +99,7 @@ will lead to faster development of free libraries.
   The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
+former tqcontains code derived from the library, while the latter only
 works together with the library.
 
   Note that it is possible for a library to be covered by the ordinary
@@ -109,7 +109,7 @@ General Public License rather than by this special one.
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
+tqcontains a notice placed by the copyright holder or other authorized
 party saying it may be distributed under the terms of this Library
 General Public License (also called "this License").  Each licensee is
 addressed as "you".
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
+all the source code for all modules it tqcontains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
@@ -230,7 +230,7 @@ source code from the same place satisfies the requirement to
 distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
-  5. A program that contains no derivative of any portion of the
+  5. A program that tqcontains no derivative of any portion of the
 Library, but is designed to work with the Library by being compiled or
 linked with it, is called a "work that uses the Library".  Such a
 work, in isolation, is not a derivative work of the Library, and
@@ -238,7 +238,7 @@ therefore falls outside the scope of this License.
 
   However, linking a "work that uses the Library" with the Library
 creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
+tqcontains portions of the Library), rather than a "work that uses the
 library".  The executable is therefore covered by this License.
 Section 6 states terms for distribution of such executables.
 
@@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
+structure tqlayouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
diff --git a/INSTALL b/INSTALL
index f8bad0c..a58f041 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,7 +17,7 @@ reconfiguring, and a file `config.log' containing compiler output
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+tqcontains results you don't want to keep, you may remove or edit it.
 
    The file `configure.in' is used to create `configure' by a program
 called `autoconf'.  You only need `configure.in' if you want to change
diff --git a/artsc/artsc.h b/artsc/artsc.h
index fd7de91..00c536e 100644
--- a/artsc/artsc.h
+++ b/artsc/artsc.h
@@ -35,7 +35,7 @@ extern "C" {
  * The aRts plain C API aims at easily writing/porting plain C apps to the
  * arts sound server. What is provided is streaming functionality, in a
  * blocking way. So for most apps, you simply remove the few system calls
- * that deal with your audio device, and replace them with the appropriate
+ * that deal with your audio device, and tqreplace them with the appropriate
  * arts calls.
  */
 
diff --git a/artsc/artsdsp.c b/artsc/artsdsp.c
index be49ab5..a528f8c 100644
--- a/artsc/artsdsp.c
+++ b/artsc/artsdsp.c
@@ -58,10 +58,10 @@
  * which points to /dev/null, to ensure compatibility with more weird
  * operations on streams
  *
- * settings contains what has already been set (speed, bits, channels), and
+ * settings tqcontains what has already been set (speed, bits, channels), and
  * is 7 when all of these are true
  *
- * stream contains an aRts stream or 0
+ * stream tqcontains an aRts stream or 0
  */
 static int sndfd = -1;
 static int settings;
diff --git a/configure.in.in b/configure.in.in
index 2cb7d6f..0c68646 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -820,10 +820,10 @@ dnl AC_MSG_CHECKING(if building standalone aRts snapshot without KDE)
 dnl if test "$DCOPIDL" = ""; then
 dnl	AC_MSG_RESULT(yes)
 dnl	ARTS_BUILD_KDE=""
-dnl	MOC="true"
+dnl	TQMOC="true"
 dnl	DCOPIDL="true"
 dnl	DCOPIDL2CPP="true"
-dnl	AC_SUBST(MOC)
+dnl	AC_SUBST(TQMOC)
 dnl	AC_SUBST(DCOPIDL)
 dnl	AC_SUBST(DCOPIDL2CPP)
 dnl else
diff --git a/doc/TODO b/doc/TODO
index 37f856e..2b4b656 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -4,7 +4,7 @@
      dynamically loaded modules
 - get rid of all error handling done by assert ; thus, one by one review
   each assert if it can happen under any circumstances if yes, it needs
-  to be replaced by some other mechanism
+  to be tqreplaced by some other mechanism
 - report errors properly if some component could not be loaded ; right
   now, it fails within assert(skel) in generated code, which doesn't
   help users much to debug the problem
@@ -128,7 +128,7 @@
   can be restored on next login (or per song or something like that)
 - edit .arts-map files visually
 
-## Optimization (this section contains various optimization ideas)
+## Optimization (this section tqcontains various optimization ideas)
 
 - use no floats for adressing the fractional part in resampling but integers
   (that will be MUCH faster)
diff --git a/examples/testdhandle.cc b/examples/testdhandle.cc
index 564687d..eb97e6c 100644
--- a/examples/testdhandle.cc
+++ b/examples/testdhandle.cc
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
 			" (" << gsl_strerror(info.error()) << ") while loading info.\n";
 		exit(1);
 	}
-	cout << "file contains " << info.waveCount() << " waves:\n";
+	cout << "file tqcontains " << info.waveCount() << " waves:\n";
 	for(int i=0; i<info.waveCount(); i++)
 	{
 		GSL::WaveDescription desc= info.waveDescription(i);
diff --git a/flow/asyncschedule.h b/flow/asyncschedule.h
index d4264d0..fe800be 100644
--- a/flow/asyncschedule.h
+++ b/flow/asyncschedule.h
@@ -30,7 +30,7 @@
 #include <queue>
 
 /*
- * BC - Status (2002-03-08): ASyncNetSend, ASyncNetReceive, ASyncPort.
+ * BC - tqStatus (2002-03-08): ASyncNetSend, ASyncNetReceive, ASyncPort.
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. These are part of the implementation of libartsflow's
diff --git a/flow/audioio.h b/flow/audioio.h
index 7cab165..e3182af 100644
--- a/flow/audioio.h
+++ b/flow/audioio.h
@@ -27,7 +27,7 @@
 #include <string>
 #include "arts_export.h"
 /*
- * BC - Status (2002-03-08): AudioIO, AudioIOFactory
+ * BC - tqStatus (2002-03-08): AudioIO, AudioIOFactory
  *
  * Right now, these classes are considered an implementation detail. No binary
  * compatibility guaranteed, its safe to add virtual methods when required.
diff --git a/flow/audioioaix.cc b/flow/audioioaix.cc
index b5c288b..2e77685 100644
--- a/flow/audioioaix.cc
+++ b/flow/audioioaix.cc
@@ -116,9 +116,9 @@ AudioIOAIX::AudioIOAIX()
 	int fd = openDevice();
 	if( fd >= 0 )
 	{
-		audio_status audioStatus;
-		memset( &audioStatus, 0, sizeof(audio_status) );
-		ioctl(fd, AUDIO_STATUS, &audioStatus);
+		audio_status audiotqStatus;
+		memset( &audiotqStatus, 0, sizeof(audio_status) );
+		ioctl(fd, AUDIO_STATUS, &audiotqStatus);
 
 		audio_buffer audioBuffer;
 		memset( &audioBuffer, 0, sizeof(audio_buffer) );
@@ -129,14 +129,14 @@ AudioIOAIX::AudioIOAIX()
 		/*
 		 * default parameters
 		 */
-		param(samplingRate)  = audioStatus.srate;
-		param(fragmentSize)  = audioStatus.bsize;
-		param(fragmentCount) = audioBuffer.write_buf_cap / audioStatus.bsize;
-		param(channels)      = audioStatus.channels;
+		param(samplingRate)  = audiotqStatus.srate;
+		param(fragmentSize)  = audiotqStatus.bsize;
+		param(fragmentCount) = audioBuffer.write_buf_cap / audiotqStatus.bsize;
+		param(channels)      = audiotqStatus.channels;
 		param(direction)     = 2;
 
-		param(format)        = ( audioStatus.bits_per_sample==8 ) ? 8
-			: ( ( audioStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
+		param(format)        = ( audiotqStatus.bits_per_sample==8 ) ? 8
+			: ( ( audiotqStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
 	}
 }
 
diff --git a/flow/audioiocsl.cc b/flow/audioiocsl.cc
index 7f3d5dd..e5532a2 100644
--- a/flow/audioiocsl.cc
+++ b/flow/audioiocsl.cc
@@ -470,7 +470,7 @@ void AudioIOCSL::setParam(AudioParam p, int& value)
 int AudioIOCSL::getParam(AudioParam p)
 {
     CslErrorType error;
-	CslPcmStatus status;
+	CslPcmtqStatus status;
 
 	switch(p)
 	{
diff --git a/flow/audiomanager_impl.cc b/flow/audiomanager_impl.cc
index 7a6d83b..872889b 100644
--- a/flow/audiomanager_impl.cc
+++ b/flow/audiomanager_impl.cc
@@ -45,7 +45,7 @@ public:
    a typedef in between, which makes it magically work.
    We could also use an explicit instantiation, but this is not allowed
    on all C++ compilers in this scope.  Note also, that we don't need
-   to replace _all_ occurrences of list<xxx*> below, only the two in the
+   to tqreplace _all_ occurrences of list<xxx*> below, only the two in the
    member declaration.  What a mess.  */
 typedef list<AudioManagerClient_impl *> L_AMC;
 typedef list<AudioManagerAssignable *> L_AMA;
diff --git a/flow/audiosubsys.h b/flow/audiosubsys.h
index 6db85c9..55c51e1 100644
--- a/flow/audiosubsys.h
+++ b/flow/audiosubsys.h
@@ -29,7 +29,7 @@
 #include "startupmanager.h"
 
 /*
- * BC - Status (2002-03-08): AudioSubSystem, ASProducer, ASConsumer.
+ * BC - tqStatus (2002-03-08): AudioSubSystem, ASProducer, ASConsumer.
  *
  * These classes are kept binary compatible. You can rely on them.
  * AudioSubSystem has a private data pointer to do so. Even if ports to
diff --git a/flow/bufferqueue.h b/flow/bufferqueue.h
index 5344c4a..be332c3 100644
--- a/flow/bufferqueue.h
+++ b/flow/bufferqueue.h
@@ -1,5 +1,5 @@
 /*
- * BC - Status (2002-03-08): ByteBuffer, BufferQueue
+ * BC - tqStatus (2002-03-08): ByteBuffer, BufferQueue
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. These are part of the implementation of libartsflow's
diff --git a/flow/bus.h b/flow/bus.h
index 93efcc3..9c40ddb 100644
--- a/flow/bus.h
+++ b/flow/bus.h
@@ -27,7 +27,7 @@
 #include "artsflow.h"
 
 /*
- * BC - Status (2002-03-08): BusClient, BusManager
+ * BC - tqStatus (2002-03-08): BusClient, BusManager
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. These are part of the implementation of libartsflow's
diff --git a/flow/cache.h b/flow/cache.h
index 63c2fba..44c0d05 100644
--- a/flow/cache.h
+++ b/flow/cache.h
@@ -30,7 +30,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): Cache, CachedObject
+ * BC - tqStatus (2002-03-08): Cache, CachedObject
  *
  * At the current point in time, there are NO GUARANTEES, so only use this
  * in apps part of official KDE releases (such as kdemultimedia apps), which
diff --git a/flow/cachedwav.h b/flow/cachedwav.h
index 284e8b7..d5ad697 100644
--- a/flow/cachedwav.h
+++ b/flow/cachedwav.h
@@ -31,7 +31,7 @@
 #include <unistd.h>
 
 /*
- * BC - Status (2002-03-08): CachedWav.
+ * BC - tqStatus (2002-03-08): CachedWav.
  *
  * At the current point in time, there are NO GUARANTEES, so only use this
  * in apps part of official KDE releases (such as kdemultimedia apps), which
diff --git a/flow/convert.h b/flow/convert.h
index d174fd3..ef3e900 100644
--- a/flow/convert.h
+++ b/flow/convert.h
@@ -26,7 +26,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): conversion functions
+ * BC - tqStatus (2002-03-08): conversion functions
  *
  * None of them will be removed or changed, so it is safe to use them in
  * your apps. It is *recommended* (though not necessary) to use the new
@@ -48,7 +48,7 @@ namespace Arts {
  *  float for float data between -1 and 1
  *
  * and may be prefixed by 2 to indicate that stereo is done with two seperate
- * buffers or i to indicate interleaved stereo (one buffer which contains
+ * buffers or i to indicate interleaved stereo (one buffer which tqcontains
  * one sample left, one sample right, one sample left etc.)
  *
  * The parameter speed (for interpolations) is *not* the samplingrate, but
diff --git a/flow/cpuinfo.h b/flow/cpuinfo.h
index c3fab96..d19cc7a 100644
--- a/flow/cpuinfo.h
+++ b/flow/cpuinfo.h
@@ -24,7 +24,7 @@
 
 #include "arts_export.h"
 /*
- * BC - Status (2002-03-08): CpuInfo
+ * BC - tqStatus (2002-03-08): CpuInfo
  *
  * This class will be kept binary compatible - it just exports the static
  * CpuInfo::flags() function as only functionality.
diff --git a/flow/fft.h b/flow/fft.h
index 009f764..7694745 100644
--- a/flow/fft.h
+++ b/flow/fft.h
@@ -2,7 +2,7 @@
 #define ARTS_FFT_H
 
 /*
- * BC - Status (2002-03-08): arts_fft_float
+ * BC - tqStatus (2002-03-08): arts_fft_float
  *
  * This fft interface should be obsoleted in the future in favour of one
  * exploiting the capabilities of gsl fully. However, it will be kept binary
diff --git a/flow/gsl/gbsearcharray.h b/flow/gsl/gbsearcharray.h
index df06231..8eebbb1 100644
--- a/flow/gsl/gbsearcharray.h
+++ b/flow/gsl/gbsearcharray.h
@@ -56,9 +56,9 @@ typedef union
 {
   guint    n_nodes;
   /*< private >*/
-  gpointer alignment_dummy1;
-  glong    alignment_dummy2;
-  gdouble  alignment_dummy3;
+  gpointer tqalignment_dummy1;
+  glong    tqalignment_dummy2;
+  gdouble  tqalignment_dummy3;
 } GBSearchArray;
 
 
@@ -78,7 +78,7 @@ static inline GBSearchArray*	g_bsearch_array_remove	  (GBSearchArray	*barray,
 static inline GBSearchArray*	g_bsearch_array_grow	  (GBSearchArray	*barray,
 							   const GBSearchConfig	*bconfig,
 							   guint		 index);
-/* insert key_node into array, or if it exists, replace
+/* insert key_node into array, or if it exists, tqreplace
  * the existing node's contents with key_node
  */
 static inline GBSearchArray*	g_bsearch_array_insert	  (GBSearchArray	*barray,
@@ -241,7 +241,7 @@ g_bsearch_array_insert (GBSearchArray        *barray,
 	  barray = g_bsearch_array_grow (barray, bconfig, index);
 	  node = G_BSEARCH_ARRAY_NODES (barray) + index * bconfig->sizeof_node;
 	}
-      else /* replace (relookup is ok, replace is comparatively cheap anyways) */
+      else /* tqreplace (relookup is ok, tqreplace is comparatively cheap anyways) */
 	node = g_bsearch_array_lookup (barray, bconfig, key_node);
     }
   memcpy (node, key_node, bconfig->sizeof_node);
diff --git a/flow/gsl/gsl.3 b/flow/gsl/gsl.3
index 2f7bb31..fe8324e 100644
--- a/flow/gsl/gsl.3
+++ b/flow/gsl/gsl.3
@@ -54,7 +54,7 @@ GSL-Functions \- GSL Function Reference
 .br
 \fBgsl_transact\fP (\fIjob\fP, \fI...\fP);
 .br
-\fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_mask\fP);
+\fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_tqmask\fP);
 .br
 \fBgsl_engine_wait_on_trans\fP ();
 .br
@@ -131,7 +131,7 @@ Wake up a currently sleeping thread. In practice, this function simply causes th
 thread to abort
 .PD 1
 .PP
-Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
+Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
 .PD
 .SS \fBgsl_thread_queue_abort\fP (\fIthread\fP);
 .PD 0
@@ -139,7 +139,7 @@ Abort a currently running thread. This function does not return until the thread
 thread to abort
 .PD 1
 .PP
-Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
+Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
 .PD
 .SS \fBgsl_thread_aborted\fP ();
 .PD 0
@@ -403,7 +403,7 @@ First job
 .PP
 Convenience function which openes up a new transaction, collects the \fINULL\fP terminated job list passed to the function, and commits the transaction.  
 .PD
-.SS \fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_mask\fP);
+.SS \fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_tqmask\fP);
 .PD 0
 .IP \fIgboolean\ \ run_threaded\fP 27
 
@@ -411,7 +411,7 @@ Convenience function which openes up a new transaction, collects the \fINULL\fP
 number of values to process block wise
 .IP \fIguint\ \ \ \ \ sample_freq\fP 27
 
-.IP \fIguint\ \ \ \ \ sub_sample_mask\fP 27
+.IP \fIguint\ \ \ \ \ sub_sample_tqmask\fP 27
 
 .PD 1
 .PP
@@ -457,7 +457,7 @@ Real sample values [0..n_values-1]
 Complex frequency values [0..n_values-1]
 .PD 1
 .PP
-Real valued variant of \fBgsl_power2_fftac()\fP, the input array contains real valued equidistant sampled data [0..n_values-1], and the output array contains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.  
+Real valued variant of \fBgsl_power2_fftac()\fP, the input array tqcontains real valued equidistant sampled data [0..n_values-1], and the output array tqcontains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.  
 .PD
 .SS \fBgsl_power2_fftsr\fP (\fIn_values\fP, \fIri_values_in\fP, \fIr_values_out\fP);
 .PD 0
diff --git a/flow/gsl/gslcommon.c b/flow/gsl/gslcommon.c
index 6c8a692..d7892f2 100644
--- a/flow/gsl/gslcommon.c
+++ b/flow/gsl/gslcommon.c
@@ -684,7 +684,7 @@ gsl_thread_wakeup (GslThread *thread)
  * @thread: thread to abort
  * Abort a currently running thread. This function does not
  * return until the thread in question terminated execution.
- * Note that the thread handle gets invalidated with invocation
+ * Note that the thread handle gets tqinvalidated with invocation
  * of gsl_thread_abort() or gsl_thread_queue_abort().
  */
 void
@@ -715,7 +715,7 @@ gsl_thread_abort (GslThread *thread)
  * @thread: thread to abort
  * Same as gsl_thread_abort(), but returns as soon as possible,
  * even if thread hasn't stopped execution yet.
- * Note that the thread handle gets invalidated with invocation
+ * Note that the thread handle gets tqinvalidated with invocation
  * of gsl_thread_abort() or gsl_thread_queue_abort().
  */
 void
@@ -1315,7 +1315,7 @@ gsl_message_send (GslDebugFlags reporter,
   msg->error = error;
   msg->error_str = error ? gsl_strerror (msg->error) : NULL;
 
-  /* vsnprintf() replacement */
+  /* vsnprintf() tqreplacement */
   va_start (args, messagef);
   string = g_strdup_vprintf (messagef, args);
   va_end (args);
@@ -1476,17 +1476,17 @@ GslErrorType
 gsl_check_file (const gchar *file_name,
 		const gchar *mode)
 {
-  guint access_mask = 0;
+  guint access_tqmask = 0;
   guint check_file, check_dir, check_link;
   
   if (strchr (mode, 'r'))	/* readable */
-    access_mask |= R_OK;
+    access_tqmask |= R_OK;
   if (strchr (mode, 'w'))	/* writable */
-    access_mask |= W_OK;
+    access_tqmask |= W_OK;
   if (strchr (mode, 'x'))	/* executable */
-    access_mask |= X_OK;
+    access_tqmask |= X_OK;
 
-  if (access_mask && access (file_name, access_mask) < 0)
+  if (access_tqmask && access (file_name, access_tqmask) < 0)
     goto have_errno;
   
   check_file = strchr (mode, 'f') != NULL;	/* open as file */
diff --git a/flow/gsl/gsldatacache.c b/flow/gsl/gsldatacache.c
index b00f6ef..b925e83 100644
--- a/flow/gsl/gsldatacache.c
+++ b/flow/gsl/gsldatacache.c
@@ -333,7 +333,7 @@ data_cache_new_node_L (GslDataCache     *dcache,
   if (!demand_load)
     g_message (G_STRLOC ":FIXME: lazy data loading not yet supported");
 
-  /* if we have a left node, and it contains data that we need, copy it */
+  /* if we have a left node, and it tqcontains data that we need, copy it */
   left_node = pos ? dcache->nodes[pos - 1] : NULL;
   if (left_node)
     {
diff --git a/flow/gsl/gsldatahandle-mad.c b/flow/gsl/gsldatahandle-mad.c
index 201d352..522efa5 100644
--- a/flow/gsl/gsldatahandle-mad.c
+++ b/flow/gsl/gsldatahandle-mad.c
@@ -318,14 +318,14 @@ dh_mad_open (GslDataHandle      *dhandle,
   MadHandle *handle = (MadHandle*) dhandle;
   GslHFile *hfile;
   GslLong n;
-  gboolean seek_invalidated = FALSE;
+  gboolean seek_tqinvalidated = FALSE;
 
   hfile = gsl_hfile_open (handle->dhandle.name);
   if (!hfile)
     return gsl_error_from_errno (errno, GSL_ERROR_OPEN_FAILED);
   handle->hfile = hfile;
 
-  seek_invalidated |= handle->seek_mtime != hfile->mtime;
+  seek_tqinvalidated |= handle->seek_mtime != hfile->mtime;
   handle->bfill = 0;
   handle->eof = FALSE;
   handle->pcm_pos = 0;
@@ -345,7 +345,7 @@ dh_mad_open (GslDataHandle      *dhandle,
   setup->bit_depth = 24;
   setup->n_channels = MAD_NCHANNELS (&handle->frame.header);
   n = MAD_NSBSAMPLES (&handle->frame.header) * 32;
-  seek_invalidated |= n != handle->frame_size;
+  seek_tqinvalidated |= n != handle->frame_size;
   handle->frame_size = n;
   handle->sample_rate = handle->frame.header.samplerate;
   if (setup->n_channels < 1 ||
@@ -355,7 +355,7 @@ dh_mad_open (GslDataHandle      *dhandle,
     goto OPEN_FAILED;
   
   /* seek through the stream to collect frame positions */
-  if (seek_invalidated || !handle->n_seeks)
+  if (seek_tqinvalidated || !handle->n_seeks)
     {
       handle->seek_mtime = hfile->mtime;
       handle->n_seeks = 0;
diff --git a/flow/gsl/gslengine.c b/flow/gsl/gslengine.c
index d85ebfb..32835de 100644
--- a/flow/gsl/gslengine.c
+++ b/flow/gsl/gslengine.c
@@ -635,7 +635,7 @@ static gboolean   gsl_engine_threaded = FALSE;
 static GslThread *master_thread = NULL;
 guint		gsl_externvar_bsize = 0;
 guint		gsl_externvar_sample_freq = 0;
-guint		gsl_externvar_sub_sample_mask = 0;
+guint		gsl_externvar_sub_sample_tqmask = 0;
 guint		gsl_externvar_sub_sample_steps = 0;
 
 /**
@@ -652,20 +652,20 @@ void
 gsl_engine_init (gboolean run_threaded,
 		 guint	  block_size,
 		 guint	  sample_freq,
-		 guint    sub_sample_mask)
+		 guint    sub_sample_tqmask)
 {
   g_return_if_fail (gsl_engine_initialized == FALSE);
   g_return_if_fail (block_size > 0 && block_size <= GSL_STREAM_MAX_VALUES);
   g_return_if_fail (sample_freq > 0);
-  g_return_if_fail (sub_sample_mask < block_size);
-  g_return_if_fail ((sub_sample_mask & (sub_sample_mask + 1)) == 0);	/* power of 2 */
+  g_return_if_fail (sub_sample_tqmask < block_size);
+  g_return_if_fail ((sub_sample_tqmask & (sub_sample_tqmask + 1)) == 0);	/* power of 2 */
 
   gsl_engine_initialized = TRUE;
   gsl_engine_threaded = run_threaded;
   gsl_externvar_bsize = block_size;
   gsl_externvar_sample_freq = sample_freq;
-  gsl_externvar_sub_sample_mask = sub_sample_mask << 2;	/* shift out sizeof (float) alignment */
-  gsl_externvar_sub_sample_steps = sub_sample_mask + 1;
+  gsl_externvar_sub_sample_tqmask = sub_sample_tqmask << 2;	/* shift out sizeof (float) tqalignment */
+  gsl_externvar_sub_sample_steps = sub_sample_tqmask + 1;
   _gsl_tick_stamp_set_leap (block_size);
 
   ENG_DEBUG ("initialization: threaded=%s", gsl_engine_threaded ? "TRUE" : "FALSE");
diff --git a/flow/gsl/gslengine.h b/flow/gsl/gslengine.h
index 1d121a9..d5a0411 100644
--- a/flow/gsl/gslengine.h
+++ b/flow/gsl/gslengine.h
@@ -168,7 +168,7 @@ gfloat*		gsl_engine_const_values	(gfloat		 value);
 void	        gsl_engine_init		(gboolean	 threaded,
 					 guint		 block_size,
 					 guint		 sample_freq,
-					 guint		 sub_sample_mask);
+					 guint		 sub_sample_tqmask);
 typedef struct
 {
   glong		timeout;
@@ -187,16 +187,16 @@ void	      gsl_engine_garbage_collect	(void);
 void	      gsl_engine_wait_on_trans		(void);
 #define	      gsl_engine_block_size()		((const guint)	gsl_externvar_bsize + 0)
 #define	      gsl_engine_sample_freq()		((const guint)	gsl_externvar_sample_freq + 0)
-#define	      gsl_engine_sub_sample_mask()	((const guint)	gsl_externvar_sub_sample_mask + 0)
+#define	      gsl_engine_sub_sample_tqmask()	((const guint)	gsl_externvar_sub_sample_tqmask + 0)
 #define	      gsl_engine_sub_sample_steps()	((const guint)	gsl_externvar_sub_sample_steps + 0)
-#define	      gsl_engine_sub_sample_test(ptr)	(((guint) (ptr)) & gsl_engine_sub_sample_mask ())
+#define	      gsl_engine_sub_sample_test(ptr)	(((guint) (ptr)) & gsl_engine_sub_sample_tqmask ())
 #define	      GSL_SUB_SAMPLE_MATCH(ptr,sspatrn)	(gsl_engine_sub_sample_test (ptr) == (sspatrn))
 
 
 /*< private >*/
 extern guint	gsl_externvar_bsize;
 extern guint	gsl_externvar_sample_freq;
-extern guint	gsl_externvar_sub_sample_mask;
+extern guint	gsl_externvar_sub_sample_tqmask;
 extern guint	gsl_externvar_sub_sample_steps;
 
 #ifdef __cplusplus
diff --git a/flow/gsl/gslfft.h b/flow/gsl/gslfft.h
index ecfa320..51b9a8f 100644
--- a/flow/gsl/gslfft.h
+++ b/flow/gsl/gslfft.h
@@ -72,9 +72,9 @@ void	gsl_power2_fftsc (const unsigned int n_values,
  * @n_values:      Number of complex values
  * @r_values_in:   Real sample values [0..n_values-1]
  * @ri_values_out: Complex frequency values [0..n_values-1]
- * Real valued variant of gsl_power2_fftac(), the input array contains
+ * Real valued variant of gsl_power2_fftac(), the input array tqcontains
  * real valued equidistant sampled data [0..n_values-1], and the output
- * array contains the positive frequency half of the complex valued
+ * array tqcontains the positive frequency half of the complex valued
  * fourier transform. Note, that the complex valued fourier transform H
  * of a purely real valued set of data, satisfies H(-f) = Conj(H(f)),
  * where Conj() denotes the complex conjugate, so that just the positive
diff --git a/flow/gsl/gslglib.h b/flow/gsl/gslglib.h
index 1831985..3da5447 100644
--- a/flow/gsl/gslglib.h
+++ b/flow/gsl/gslglib.h
@@ -586,7 +586,7 @@ typedef void            (*GDestroyNotify)       (gpointer       data);
 #define g_hash_table_new_full          	gsl_g_hash_table_new_full
 #define g_hash_table_destroy           	gsl_g_hash_table_destroy
 #define g_hash_table_insert            	gsl_g_hash_table_insert
-#define g_hash_table_replace           	gsl_g_hash_table_replace
+#define g_hash_table_tqreplace           	gsl_g_hash_table_tqreplace
 #define g_hash_table_remove            	gsl_g_hash_table_remove
 #define g_hash_table_steal             	gsl_g_hash_table_steal
 #define g_hash_table_lookup            	gsl_g_hash_table_lookup
@@ -605,7 +605,7 @@ void        g_hash_table_destroy           (GHashTable     *hash_table);
 void        g_hash_table_insert            (GHashTable     *hash_table,
 					    gpointer        key,
 					    gpointer        value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
+void        g_hash_table_tqreplace           (GHashTable     *hash_table,
 					    gpointer        key,
 					    gpointer        value);
 gboolean    g_hash_table_remove            (GHashTable     *hash_table,
diff --git a/flow/gsl/gslieee754.h b/flow/gsl/gslieee754.h
index 211b06c..6250842 100644
--- a/flow/gsl/gslieee754.h
+++ b/flow/gsl/gslieee754.h
@@ -26,14 +26,14 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-/* IEEE 754 single precision floating point layout:
+/* IEEE 754 single precision floating point tqlayout:
  *        31 30           23 22            0
  * +--------+---------------+---------------+
  * | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
  * +--------+---------------+---------------+
  * B0------------------->B1------->B2-->B3-->
  *
- * IEEE 754 double precision floating point layout:
+ * IEEE 754 double precision floating point tqlayout:
  *        63 62            52 51            32   31            0
  * +--------+----------------+----------------+ +---------------+
  * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |
diff --git a/flow/gsl/gslloader-wav.c b/flow/gsl/gslloader-wav.c
index 6cb8831..85e4cc3 100644
--- a/flow/gsl/gslloader-wav.c
+++ b/flow/gsl/gslloader-wav.c
@@ -201,7 +201,7 @@ typedef struct
 static GslErrorType
 wav_read_data_header (gint        fd,
 		      DataHeader *header,
-		      guint       byte_alignment)
+		      guint       byte_tqalignment)
 {
   guint n_bytes;
 
@@ -241,12 +241,12 @@ wav_read_data_header (gint        fd,
 	  WAV_DEBUG ("failed to seek while skipping sub-chunk");
 	  return GSL_ERROR_IO;
 	}
-      return wav_read_data_header (fd, header, byte_alignment);
+      return wav_read_data_header (fd, header, byte_tqalignment);
     }
-  if (header->data_length < 1 || header->data_length % byte_alignment != 0)
+  if (header->data_length < 1 || header->data_length % byte_tqalignment != 0)
     {
-      WAV_DEBUG ("invalid data length (%u) or alignment (%u)",
-		 header->data_length, header->data_length % byte_alignment);
+      WAV_DEBUG ("invalid data length (%u) or tqalignment (%u)",
+		 header->data_length, header->data_length % byte_tqalignment);
       return GSL_ERROR_FORMAT_INVALID;
     }
 
diff --git a/flow/gsl/gslmagic.c b/flow/gsl/gslmagic.c
index 7887965..2ac4083 100644
--- a/flow/gsl/gslmagic.c
+++ b/flow/gsl/gslmagic.c
@@ -187,7 +187,7 @@ struct _Magic
   gulong         offset;
   guint          data_size;
   MagicCheckType magic_check;
-  guint32        data_mask;
+  guint32        data_tqmask;
   MagicData	 value;
   guint          read_string : 1;
   guint          read_size : 1;
@@ -364,16 +364,16 @@ magic_parse_type (Magic       *magic,
     {
       string += 1;
       if (string[0] == '0')
-	magic->data_mask = strtol (string, &f, string[1] == 'x' ? 16 : 8);
+	magic->data_tqmask = strtol (string, &f, string[1] == 'x' ? 16 : 8);
       else
-	magic->data_mask = strtol (string, &f, 10);
+	magic->data_tqmask = strtol (string, &f, 10);
       if (f && *f != 0)
 	return FALSE;
       while (*string)
 	string++;
     }
   else
-    magic->data_mask = 0xffffffff;
+    magic->data_tqmask = 0xffffffff;
 
   return *string == 0;
 }
@@ -464,31 +464,31 @@ magic_check_data (Magic     *magic,
       cmp = 1;
       break;
     case MAGIC_CHECK_INT_EQUAL:
-      data->v_int32 &= magic->data_mask;
+      data->v_int32 &= magic->data_tqmask;
       cmp = data->v_int32 == magic->value.v_int32;
       break;
     case MAGIC_CHECK_INT_GREATER:
-      data->v_int32 &= magic->data_mask;
+      data->v_int32 &= magic->data_tqmask;
       cmp = data->v_int32 > magic->value.v_int32;
       break;
     case MAGIC_CHECK_INT_SMALLER:
-      data->v_int32 &= magic->data_mask;
+      data->v_int32 &= magic->data_tqmask;
       cmp = data->v_int32 < magic->value.v_int32;
       break;
     case MAGIC_CHECK_UINT_GREATER:
-      data->v_uint32 &= magic->data_mask;
+      data->v_uint32 &= magic->data_tqmask;
       cmp = data->v_uint32 > magic->value.v_uint32;
       break;
     case MAGIC_CHECK_UINT_SMALLER:
-      data->v_uint32 &= magic->data_mask;
+      data->v_uint32 &= magic->data_tqmask;
       cmp = data->v_uint32 < magic->value.v_uint32;
       break;
     case MAGIC_CHECK_UINT_ZEROS:
-      data->v_uint32 &= magic->data_mask;
+      data->v_uint32 &= magic->data_tqmask;
       cmp = (data->v_int32 & magic->value.v_int32) == 0;
       break;
     case MAGIC_CHECK_UINT_ONES:
-      data->v_uint32 &= magic->data_mask;
+      data->v_uint32 &= magic->data_tqmask;
       cmp = (data->v_int32 & magic->value.v_int32) == magic->value.v_int32;
       break;
     case MAGIC_CHECK_STRING_EQUAL:
diff --git a/flow/gsl/gslmath.c b/flow/gsl/gslmath.c
index 008b5ec..66f5b5b 100644
--- a/flow/gsl/gslmath.c
+++ b/flow/gsl/gslmath.c
@@ -602,7 +602,7 @@ hqr (double **a, int n, double wr[], double wi[])
 #define RADIX 2.0
 static void
 balanc (double **a, int n)
-     /* Given a matrix a[1..n][1..n], this routine replaces it by a balanced matrix with identical
+     /* Given a matrix a[1..n][1..n], this routine tqreplaces it by a balanced matrix with identical
 	eigenvalues. A symmetric matrix is already balanced and is unaffected by this procedure. The
 	parameter RADIX should be the machine's floating-point radix. */
 {
diff --git a/flow/gsl/gslopschedule.c b/flow/gsl/gslopschedule.c
index a72f52b..8e797a3 100644
--- a/flow/gsl/gslopschedule.c
+++ b/flow/gsl/gslopschedule.c
@@ -158,7 +158,7 @@ static void
 _engine_schedule_grow (EngineSchedule *sched,
 		       guint           leaf_level)
 {
-  guint ll = 1 << g_bit_storage (leaf_level);	/* power2 growth alignment, ll >= leaf_level+1 */
+  guint ll = 1 << g_bit_storage (leaf_level);	/* power2 growth tqalignment, ll >= leaf_level+1 */
   
   if (sched->leaf_levels < ll)
     {
diff --git a/flow/gsl/gsloscillator-aux.c b/flow/gsl/gsloscillator-aux.c
index 01831fb..43c4b1f 100644
--- a/flow/gsl/gsloscillator-aux.c
+++ b/flow/gsl/gsloscillator-aux.c
@@ -161,7 +161,7 @@ GSL_INCLUDER_FUNC (GslOscData   *osc,
 	guint32 tpos, ifrac;
 	gfloat ffrac, w;
 	tpos = cur_pos >> wave->n_frac_bits;
-	ifrac = cur_pos & wave->frac_bitmask;
+	ifrac = cur_pos & wave->frac_bittqmask;
 	ffrac = ifrac * wave->ifrac_to_float;
 	v = wave->values[tpos];
 	w = wave->values[tpos + 1];
diff --git a/flow/gsl/gsloscillator.c b/flow/gsl/gsloscillator.c
index 2ae2868..e988efe 100644
--- a/flow/gsl/gsloscillator.c
+++ b/flow/gsl/gsloscillator.c
@@ -131,9 +131,9 @@ osc_process (GslOscData   *osc,
   
   if_reject (mode != osc->last_mode)
     {
-      guint change_mask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode;
+      guint change_tqmask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode;
       
-      if (change_mask & OSC_FLAG_FREQ)
+      if (change_tqmask & OSC_FLAG_FREQ)
 	{
 	  gdouble fcpos, flpos;
 
diff --git a/flow/gsl/gslosctable.c b/flow/gsl/gslosctable.c
index 018633d..ea43e89 100644
--- a/flow/gsl/gslosctable.c
+++ b/flow/gsl/gslosctable.c
@@ -272,7 +272,7 @@ cache_table_ref_entry (GslOscWaveForm wave_form,
       gfloat *values, *fft, step, min, max;
 
       /* size:
-       * - OscTableEntry already contains the first float values
+       * - OscTableEntry already tqcontains the first float values
        * - we need n_values+1 adressable floats to provide values[0] == values[n_values]
        */
       e = g_malloc (sizeof (OscTableEntry) + sizeof (gfloat) * size);
@@ -395,7 +395,7 @@ gsl_osc_table_lookup (const GslOscTable	*table,
       wave->n_frac_bits = g_bit_storage (wave->n_values - 1);
       wave->n_frac_bits = 32 - wave->n_frac_bits;
       int_one = 1 << wave->n_frac_bits;
-      wave->frac_bitmask = int_one - 1;
+      wave->frac_bittqmask = int_one - 1;
       float_one = int_one;
       wave->freq_to_step = float_one * wave->n_values / table->mix_freq;
       wave->phase_to_pos = wave->n_values * float_one;
diff --git a/flow/gsl/gslosctable.h b/flow/gsl/gslosctable.h
index d61f531..f65dc04 100644
--- a/flow/gsl/gslosctable.h
+++ b/flow/gsl/gslosctable.h
@@ -53,10 +53,10 @@ typedef struct
   gfloat        min_freq;
   gfloat        max_freq;
   guint         n_values;
-  const gfloat *values;	/* contains n_values+1 values with values[0]==values[n_values] */
+  const gfloat *values;	/* tqcontains n_values+1 values with values[0]==values[n_values] */
   /* integer stepping (block size dependant) */
   guint32	n_frac_bits;
-  guint32	frac_bitmask;
+  guint32	frac_bittqmask;
   gfloat	freq_to_step;		/* freq -> int.frac */
   gfloat	phase_to_pos;		/* 0..1 -> int.frac */
   gfloat	ifrac_to_float;		/* frac -> 0..1 float */
diff --git a/flow/gsl/gslwaveosc.c b/flow/gsl/gslwaveosc.c
index 7398904..2a7112c 100644
--- a/flow/gsl/gslwaveosc.c
+++ b/flow/gsl/gslwaveosc.c
@@ -134,18 +134,18 @@ gsl_wave_osc_process (GslWaveOscData *wosc,
 
   if_reject (mode != wosc->last_mode)
     {
-      guint mask = wosc->last_mode ^ mode;
+      guint tqmask = wosc->last_mode ^ mode;
 
-      if (mask & WOSC_MIX_WITH_SYNC)
+      if (tqmask & WOSC_MIX_WITH_SYNC)
 	wosc->last_sync_level = 0;
-      if (mask & WOSC_MIX_WITH_FREQ)
+      if (tqmask & WOSC_MIX_WITH_FREQ)
 	{
 	  if (freq_in)
 	    wosc->last_freq_level = SIGNAL_LEVEL_INVAL;
 	  else
 	    gsl_wave_osc_set_filter (wosc, wosc->config.cfreq, FALSE);
 	}
-      if (mask & WOSC_MIX_WITH_MOD)
+      if (tqmask & WOSC_MIX_WITH_MOD)
 	{
 	  if (mod_in)
 	    wosc->last_mod_level = 0;
diff --git a/flow/gslpp/datahandle.h b/flow/gslpp/datahandle.h
index 26d8c33..1c106ed 100644
--- a/flow/gslpp/datahandle.h
+++ b/flow/gslpp/datahandle.h
@@ -93,7 +93,7 @@ namespace GSL
 							 GslLong cutValueCount);
 
 		/**
-		 * Create a new data handle which contains the same values as
+		 * Create a new data handle which tqcontains the same values as
 		 * this one but in reversed order.
 		 */
 		DataHandle createReversed();
diff --git a/flow/gslschedule.cc b/flow/gslschedule.cc
index b8bef86..fe02e2f 100644
--- a/flow/gslschedule.cc
+++ b/flow/gslschedule.cc
@@ -858,7 +858,7 @@ StdFlowSystem::StdFlowSystem()
 		 * - the 44100 because of the obvious reason, that not every artsd
 		 *   is running at that rate
 		 */
-		gsl_engine_init(false, 512, 44100, /* subsamplemask */ 63);
+		gsl_engine_init(false, 512, 44100, /* subsampletqmask */ 63);
 		if(gslGlobalMutexTable)
 			arts_debug("gsl: using Unix98 pthreads directly for mutexes and conditions");
 		/*gsl_engine_debug_enable(GslEngineDebugLevel(GSL_ENGINE_DEBUG_JOBS | GSL_ENGINE_DEBUG_SCHED));*/
diff --git a/flow/gslschedule.h b/flow/gslschedule.h
index 762539c..1c8300a 100644
--- a/flow/gslschedule.h
+++ b/flow/gslschedule.h
@@ -30,7 +30,7 @@
 #include <list>
 
 /*
- * BC - Status (2002-03-08): Port, AudioPort, MultiPort, StdFlowSystem,
+ * BC - tqStatus (2002-03-08): Port, AudioPort, MultiPort, StdFlowSystem,
  *                           StdScheduleNode
  *
  * None of these classes is considered part of the public API. Do NOT use it
diff --git a/flow/pipebuffer.cc b/flow/pipebuffer.cc
index 5fb81fb..532e58f 100644
--- a/flow/pipebuffer.cc
+++ b/flow/pipebuffer.cc
@@ -97,7 +97,7 @@ void PipeBuffer::skip(long size)
 	{
 		PipeSegment *first = *segments.begin();
 
-		// if we have less data to skip than the first segment contains
+		// if we have less data to skip than the first segment tqcontains
 		if(size < first->remaining())
 		{
 			// skip the data inside the segment
diff --git a/flow/pipebuffer.h b/flow/pipebuffer.h
index 0c464bd..0dae574 100644
--- a/flow/pipebuffer.h
+++ b/flow/pipebuffer.h
@@ -24,7 +24,7 @@
 #define __PIPEBUFFER_H__
 
 /*
- * BC - Status (2002-03-08): PipeSegment, PipeBuffer
+ * BC - tqStatus (2002-03-08): PipeSegment, PipeBuffer
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. These are part of the implementation of libartsflow's
diff --git a/flow/resample.h b/flow/resample.h
index d1aea9d..f5b79fd 100644
--- a/flow/resample.h
+++ b/flow/resample.h
@@ -27,7 +27,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): Resampler / Refiller.
+ * BC - tqStatus (2002-03-08): Resampler / Refiller.
  *
  * These classes will be kept binary compatible. Resampler has a private
  * data pointer for this purpose.
diff --git a/flow/stdsynthmodule.h b/flow/stdsynthmodule.h
index f3541b8..d8efa45 100644
--- a/flow/stdsynthmodule.h
+++ b/flow/stdsynthmodule.h
@@ -27,7 +27,7 @@
 #include "artsflow.h"
 
 /*
- * BC - Status (2002-03-08): StdSynthModule
+ * BC - tqStatus (2002-03-08): StdSynthModule
  *
  * This class is intended for public use (inheritance) as it supplies a base
  * for all objects using streams. It will be kept binary compatible.
diff --git a/flow/synth_play_wav_impl.cc b/flow/synth_play_wav_impl.cc
index dec68f0..d6eebba 100644
--- a/flow/synth_play_wav_impl.cc
+++ b/flow/synth_play_wav_impl.cc
@@ -38,7 +38,7 @@ extern "C" {
  * so you you may need that extra one.
  *
  * Other versions of libaudiofile seem to have two closing "}" in aupvlist.h,
- * so if you can't compile, this, check that /usr/include/aupvlist.h contains
+ * so if you can't compile, this, check that /usr/include/aupvlist.h tqcontains
  * something like that
  *
  * #ifdef __cplusplus
diff --git a/flow/virtualports.cc b/flow/virtualports.cc
index b733256..0e74606 100644
--- a/flow/virtualports.cc
+++ b/flow/virtualports.cc
@@ -82,7 +82,7 @@ to delegate the services of a port to another module onto another port.
 The implementation:
 
 Virtualization is implemented here, inside the flow system, using a fairly
-complex forwarding strategy, which will have a graph which contains
+complex forwarding strategy, which will have a graph which tqcontains
 
 - "user-made" connections (made with connect())
 - "virtualize-made" connections, which can be either forwarding
@@ -105,7 +105,7 @@ real connections will be removed, but only these that could possibly be
 affected by this change, and then not all real connections are created new,
 but only those that could possibly be created by this virtual connection.
 
-Every VPort contains a pointer to the "real" port, to let the flow system
+Every VPort tqcontains a pointer to the "real" port, to let the flow system
 know where the "real" connections where real data will flow must be made.
 
 */
diff --git a/flow/virtualports.h b/flow/virtualports.h
index eb4f1fc..8c4144c 100644
--- a/flow/virtualports.h
+++ b/flow/virtualports.h
@@ -28,7 +28,7 @@
 #include <list>
 
 /*
- * BC - Status (2002-03-08): VPortConnection, VPort.
+ * BC - tqStatus (2002-03-08): VPortConnection, VPort.
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. These are part of the implementation of libartsflow's
diff --git a/gmcop/giomanager.h b/gmcop/giomanager.h
index 53ac084..00e5e70 100644
--- a/gmcop/giomanager.h
+++ b/gmcop/giomanager.h
@@ -30,7 +30,7 @@
 #include <map>
 #include "arts_export.h"
 /*
- * BC - Status (2002-03-08): GIOManager
+ * BC - tqStatus (2002-03-08): GIOManager
  *
  * This class will be kept binary compatible (d ptr for extensions).
  */
diff --git a/mcop/anyref.h b/mcop/anyref.h
index 60e1836..332c5c7 100644
--- a/mcop/anyref.h
+++ b/mcop/anyref.h
@@ -27,7 +27,7 @@
 #include <string>
 #include "arts_export.h"
 /*
- * BC - Status (2002-03-08): AnyRefBase, AnyRef, AnyConstRef
+ * BC - tqStatus (2002-03-08): AnyRefBase, AnyRef, AnyConstRef
  *
  * These classes will be kept binary compatibile. To change it, adding a new
  * representation is necessary. No private d pointer for this reason.
diff --git a/mcop/asyncstream.h b/mcop/asyncstream.h
index acd27c4..6b31ef9 100644
--- a/mcop/asyncstream.h
+++ b/mcop/asyncstream.h
@@ -28,7 +28,7 @@
 #include "datapacket.h"
 
 /*
- * BC - Status (2002-03-08): GenericAsyncStream, AsyncStream,
+ * BC - tqStatus (2002-03-08): GenericAsyncStream, AsyncStream,
  *   FloatAsyncStream/ByteAsyncStream
  *
  * These classes are to be treated with extreme care, as they are used in
diff --git a/mcop/buffer.h b/mcop/buffer.h
index c1cc1b0..7cfef58 100644
--- a/mcop/buffer.h
+++ b/mcop/buffer.h
@@ -27,7 +27,7 @@
 #include <vector>
 #include "arts_export.h"
 /*
- * BC - Status (2002-03-08): Buffer.
+ * BC - tqStatus (2002-03-08): Buffer.
  *
  * Has to be kept binary compatible. As buffer is speed relevant, currently
  * there are no private d ptrs, and the idea is to keep this as possible.
diff --git a/mcop/common.h b/mcop/common.h
index 2dbde70..22783c2 100644
--- a/mcop/common.h
+++ b/mcop/common.h
@@ -36,7 +36,7 @@
 #include "connect.h"
 
 /*
- * BC - Status (2002-03-08): Read/WriteObject(Seq)
+ * BC - tqStatus (2002-03-08): Read/WriteObject(Seq)
  *
  * Will be kept binary compatible by NOT TOUCHING AT ALL. Do not change this.
  * (Interaction with generated code).
diff --git a/mcop/connect.h b/mcop/connect.h
index aa9065b..721b143 100644
--- a/mcop/connect.h
+++ b/mcop/connect.h
@@ -22,7 +22,7 @@
 #define MCOP_CONNECT_H
 
 /*
- * BC - Status (2002-03-08): connect / setValue functions
+ * BC - tqStatus (2002-03-08): connect / setValue functions
  *
  * Will be kept as they are (binary compatible).
  */
diff --git a/mcop/connection.h b/mcop/connection.h
index c68f80d..34cc08b 100644
--- a/mcop/connection.h
+++ b/mcop/connection.h
@@ -27,7 +27,7 @@
 #include "buffer.h"
 
 /*
- * BC - Status (2002-03-08): Connection.
+ * BC - tqStatus (2002-03-08): Connection.
  *
  * None of these classes is considered part of the public API. However, they
  * NEED to be kept binary compatible as the DO interact with generated code.
diff --git a/mcop/core.idl b/mcop/core.idl
index 156632a..ea1062b 100644
--- a/mcop/core.idl
+++ b/mcop/core.idl
@@ -211,7 +211,7 @@ struct AttributeDef {
  * defines what methods/attributes a particular interface supports: these
  * do not contain the methods/attributes of inherited interfaces.
  *
- * inheritedInterfaces only contains the names of Interfaces that this one
+ * inheritedInterfaces only tqcontains the names of Interfaces that this one
  * inherits in exactly one step. So to see if interface XYZ is inherited
  * from ABC, you need to check the "inheritedInterfaces" of XYZ, and their
  * "inheritedInterfaces" and their "inheritedInterfaces" and so on.
@@ -530,7 +530,7 @@ interface TmpGlobalComm : GlobalComm {
  */
 
 /**
- * TraderOffer - this contains an offer of an object (which is usually returned
+ * TraderOffer - this tqcontains an offer of an object (which is usually returned
  * as result of a query.
  */
 interface TraderOffer {
diff --git a/mcop/datapacket.h b/mcop/datapacket.h
index e7a08e0..b68e8de 100644
--- a/mcop/datapacket.h
+++ b/mcop/datapacket.h
@@ -27,7 +27,7 @@
 #include "buffer.h"
 
 /*
- * BC - Status (2002-03-08): GenericDataChannel, DataPacket types
+ * BC - tqStatus (2002-03-08): GenericDataChannel, DataPacket types
  *
  * These classes must be kept binary compatible, as the do interact with
  * generated code. So you MUST KNOW WHAT YOU ARE DOING, once you start
@@ -201,7 +201,7 @@ protected:
 };
 
 /**
- * FloatDataPacket finally is one concrete DataPacket (which contains the
+ * FloatDataPacket finally is one concrete DataPacket (which tqcontains the
  * information how to marshal a datapacket of type float)
  */
 class ARTS_EXPORT FloatDataPacket : public RawDataPacket<float> {
diff --git a/mcop/debug.h b/mcop/debug.h
index 6ef83e5..0999b7b 100644
--- a/mcop/debug.h
+++ b/mcop/debug.h
@@ -31,7 +31,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): Debug.
+ * BC - tqStatus (2002-03-08): Debug.
  *
  * Collection class, no instance, no members. Thus binary compatible (will
  * be kept).
diff --git a/mcop/delayedreturn.h b/mcop/delayedreturn.h
index 290cfc4..84373c0 100644
--- a/mcop/delayedreturn.h
+++ b/mcop/delayedreturn.h
@@ -26,7 +26,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): DelayedReturn
+ * BC - tqStatus (2002-03-08): DelayedReturn
  *
  * This class will be kept binary compatible. It has a private d-pointer for
  * further extensions.
diff --git a/mcop/dispatcher.h b/mcop/dispatcher.h
index 6a2be82..683cba1 100644
--- a/mcop/dispatcher.h
+++ b/mcop/dispatcher.h
@@ -38,7 +38,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): Dispatcher
+ * BC - tqStatus (2002-03-08): Dispatcher
  *
  * This is part of the public API (and interacts with generated code) and
  * has to be kept binary compatible.
diff --git a/mcop/dynamicrequest.h b/mcop/dynamicrequest.h
index b1316b0..ff98b95 100644
--- a/mcop/dynamicrequest.h
+++ b/mcop/dynamicrequest.h
@@ -31,7 +31,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): DynamicRequest
+ * BC - tqStatus (2002-03-08): DynamicRequest
  *
  * Has to be kept binary compatible (use d ptr).
  */
diff --git a/mcop/dynamicskeleton.h b/mcop/dynamicskeleton.h
index 94fc8c5..d68ced7 100644
--- a/mcop/dynamicskeleton.h
+++ b/mcop/dynamicskeleton.h
@@ -28,7 +28,7 @@
 #include "object.h"
 
 /*
- * BC - Status (2002-03-08): DynamicSkeletonBase, DynamicSkeleton
+ * BC - tqStatus (2002-03-08): DynamicSkeletonBase, DynamicSkeleton
  *
  * Will be kept binary compatible (using d ptr).
  */
@@ -60,11 +60,11 @@ public:
 	 * process is called whenever you get a request that you need to implement
 	 * dynamically
 	 *
-	 * @param methodID contains the ID of the method that you need to
+	 * @param methodID tqcontains the ID of the method that you need to
 	 *                 implement - you can get the full signature by calling
 	 *                 getMethodDef
 	 *
-	 * @param request  contains the marshalled parameters
+	 * @param request  tqcontains the marshalled parameters
 	 *
 	 * @param result   is for the return code - if your method returns a
 	 *                 value, you need to write the it in the result Buffer
diff --git a/mcop/extensionloader.h b/mcop/extensionloader.h
index 034ecf4..825b17f 100644
--- a/mcop/extensionloader.h
+++ b/mcop/extensionloader.h
@@ -30,7 +30,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): ExtensionLoader
+ * BC - tqStatus (2002-03-08): ExtensionLoader
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. No binary compatibility guaranteed. (Interactions:
diff --git a/mcop/factory.h b/mcop/factory.h
index 6adab89..47ea466 100644
--- a/mcop/factory.h
+++ b/mcop/factory.h
@@ -31,7 +31,7 @@
 #include "startupmanager.h"
 
 /*
- * BC - Status (2002-03-08): Factory
+ * BC - tqStatus (2002-03-08): Factory
  *
  * Will need to remain binary compatible (REGISTER_IMPLEMENTATION), d ptr
  * provided for convenience, watch out for interactions with generated
diff --git a/mcop/flowsystem.h b/mcop/flowsystem.h
index 532f1de..57be7e1 100644
--- a/mcop/flowsystem.h
+++ b/mcop/flowsystem.h
@@ -28,7 +28,7 @@
 #include "common.h"
 
 /*
- * BC - Status (2002-03-08): ScheduleNode, FlowSystem, FlowSystem_impl,
+ * BC - tqStatus (2002-03-08): ScheduleNode, FlowSystem, FlowSystem_impl,
  *   RemoteScheduleNode
  *
  * Heavy interactions with generated and hand-written code, flowsystem binding
diff --git a/mcop/idlfilereg.h b/mcop/idlfilereg.h
index 77b5fa6..61c255a 100644
--- a/mcop/idlfilereg.h
+++ b/mcop/idlfilereg.h
@@ -29,7 +29,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): IDLFileReg
+ * BC - tqStatus (2002-03-08): IDLFileReg
  *
  * Will be kept binary compatible by NOT TOUCHING AT ALL. Do not change this.
  * (Interaction with generated code). Add a new class if you need something
diff --git a/mcop/ifacerepo_impl.h b/mcop/ifacerepo_impl.h
index ca22516..1379ec4 100644
--- a/mcop/ifacerepo_impl.h
+++ b/mcop/ifacerepo_impl.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): InterfaceRepo_impl
+ * BC - tqStatus (2002-03-08): InterfaceRepo_impl
  *
  * This is an implementation class, and not kept binary compatible. It's
  * only here since the REGISTER_IMPLEMENTATION bootstrapping may not yet
diff --git a/mcop/iomanager.h b/mcop/iomanager.h
index fc88268..f3afaf7 100644
--- a/mcop/iomanager.h
+++ b/mcop/iomanager.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08):
+ * BC - tqStatus (2002-03-08):
  *   BINARY COMPATIBLE: IONotify, TimeNotify, IOManager
  *   NO BC FOR: StdIOManager
  *
diff --git a/mcop/loopback.h b/mcop/loopback.h
index e16d1cd..214c903 100644
--- a/mcop/loopback.h
+++ b/mcop/loopback.h
@@ -28,7 +28,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): LoopbackConnection
+ * BC - tqStatus (2002-03-08): LoopbackConnection
  *
  * Not part of the public API. Do NOT use it in your apps. No binary
  * compatibility guaranteed.
diff --git a/mcop/mcopconfig.h b/mcop/mcopconfig.h
index 8fb1e10..d75adc3 100644
--- a/mcop/mcopconfig.h
+++ b/mcop/mcopconfig.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): MCOPConfig
+ * BC - tqStatus (2002-03-08): MCOPConfig
  *
  * Is guaranteed to stay binary compatible. d ptr provided.
  */
diff --git a/mcop/mcoputils.cc b/mcop/mcoputils.cc
index 57ac856..168f55f 100644
--- a/mcop/mcoputils.cc
+++ b/mcop/mcoputils.cc
@@ -406,7 +406,7 @@ string MCOPUtils::getFullHostname()
 
 	/*
 	 * if gethostname() isn't a FQDN (guess that by checking whether it
-	 * contains a dot), try to look it up to ensure it is
+	 * tqcontains a dot), try to look it up to ensure it is
 	 */
 	if(result.find('.') == string::npos && (hp = gethostbyname(buffer)) != 0)
 		result = hp->h_name;
diff --git a/mcop/mcoputils.h b/mcop/mcoputils.h
index 3645166..c0b8224 100644
--- a/mcop/mcoputils.h
+++ b/mcop/mcoputils.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): MCOPUtils
+ * BC - tqStatus (2002-03-08): MCOPUtils
  *
  * Collection class for all kinds of utility functions. BC, since never
  * instanciated.
diff --git a/mcop/md5.h b/mcop/md5.h
index 6954632..a6fe7dd 100644
--- a/mcop/md5.h
+++ b/mcop/md5.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): arts_md5sum
+ * BC - tqStatus (2002-03-08): arts_md5sum
  *
  * No binary compatibility guaranteed (part of Dispatcher's security model).
  */
diff --git a/mcop/md5auth.h b/mcop/md5auth.h
index e70141f..3c5f94a 100644
--- a/mcop/md5auth.h
+++ b/mcop/md5auth.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): arts_md5_*
+ * BC - tqStatus (2002-03-08): arts_md5_*
  *
  * No guarantees - do not use.
  */
diff --git a/mcop/namedstore.h b/mcop/namedstore.h
index 89a2b2d..0d8c29d 100644
--- a/mcop/namedstore.h
+++ b/mcop/namedstore.h
@@ -29,7 +29,7 @@
 #include "stdio.h"
 
 /*
- * BC - Status (2002-03-08): NamedStore
+ * BC - tqStatus (2002-03-08): NamedStore
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. These are part of the implementation of object.cc and not
diff --git a/mcop/notification.h b/mcop/notification.h
index 8b3e4b0..6c306e5 100644
--- a/mcop/notification.h
+++ b/mcop/notification.h
@@ -29,7 +29,7 @@
 namespace Arts {
 
 /*
- * BC - Status (2002-03-08): Notification, NotificationClient,
+ * BC - tqStatus (2002-03-08): Notification, NotificationClient,
  *   NotificationManager
  *
  * All need to be kept BC, NotificationManager with usual d ptr.
diff --git a/mcop/object.cc b/mcop/object.cc
index c501081..de6342e 100644
--- a/mcop/object.cc
+++ b/mcop/object.cc
@@ -1127,7 +1127,7 @@ Object_stub::Object_stub(Connection *connection, long objectID)
 Object_stub::~Object_stub()
 {
 	/*
-	 * invalidate method lookup cache entries of this object, as it might
+	 * tqinvalidate method lookup cache entries of this object, as it might
 	 * happen, that another Object_stub is created just at the same position
 	 */
 	if(_lookupMethodCache)
diff --git a/mcop/object.h b/mcop/object.h
index f67bc67..de46618 100644
--- a/mcop/object.h
+++ b/mcop/object.h
@@ -34,7 +34,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): Object_base, Object_skel, Object_stub
+ * BC - tqStatus (2002-03-08): Object_base, Object_skel, Object_stub
  *
  * All of them have to be kept binary compatible carefully, due to interaction
  * with generated code. There are d ptrs in _skel and _stub, NOT TO BE USED
@@ -70,7 +70,7 @@ private:
 
 protected:
 	/**
-	 * ObjectInternalData contains private data structures for
+	 * ObjectInternalData tqcontains private data structures for
 	 *  - Object_base
 	 *  - Object_stub
 	 *  - Object_skel
diff --git a/mcop/objectmanager.h b/mcop/objectmanager.h
index 53aa65a..33d46c7 100644
--- a/mcop/objectmanager.h
+++ b/mcop/objectmanager.h
@@ -30,7 +30,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): ObjectManager
+ * BC - tqStatus (2002-03-08): ObjectManager
  *
  * Keep binary compatible (since accessible via ::the()), use d ptr when
  * changing it.
diff --git a/mcop/pool.h b/mcop/pool.h
index d3ca05d..45a04ce 100644
--- a/mcop/pool.h
+++ b/mcop/pool.h
@@ -25,7 +25,7 @@
 
 
 /*
- * BC - Status (2002-03-08): Pool<type>
+ * BC - tqStatus (2002-03-08): Pool<type>
  *
  * Needs to be kept binary compatible by NOT TOUCHING. When you want something
  * else, write a fresh one (used as part of Arts::Dispatcher, thus changing
diff --git a/mcop/reference.h b/mcop/reference.h
index a5bea45..ba87ab5 100644
--- a/mcop/reference.h
+++ b/mcop/reference.h
@@ -19,7 +19,7 @@
 */
 
 /*
- * BC - Status (2002-03-08): Reference, SubClass, Object, DynamicCast.
+ * BC - tqStatus (2002-03-08): Reference, SubClass, Object, DynamicCast.
  *
  * Part of the public API. Must be kept binary compatible by NOT TOUCHING
  * AT ALL. Interaction with generated and written code.
diff --git a/mcop/referenceclean.h b/mcop/referenceclean.h
index 2612ffb..53d3780 100644
--- a/mcop/referenceclean.h
+++ b/mcop/referenceclean.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): ReferenceClean
+ * BC - tqStatus (2002-03-08): ReferenceClean
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. Can be changed arbitrarily even non BC.
diff --git a/mcop/socketconnection.h b/mcop/socketconnection.h
index 86c400a..d30927f 100644
--- a/mcop/socketconnection.h
+++ b/mcop/socketconnection.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): SocketConnection
+ * BC - tqStatus (2002-03-08): SocketConnection
  *
  * None of these classes is considered part of the public API. Do NOT use it
  * in your apps. No BC guaranteed.
diff --git a/mcop/startupmanager.h b/mcop/startupmanager.h
index c0644c5..b4089a3 100644
--- a/mcop/startupmanager.h
+++ b/mcop/startupmanager.h
@@ -28,7 +28,7 @@
 #include <list>
 
 /*
- * BC - Status (2002-03-08): StartupClass, StartupManager.
+ * BC - tqStatus (2002-03-08): StartupClass, StartupManager.
  *
  * The class needs to be kept BC, as the startup system bases on inheritance
  * and virtual functions. Do not change.
diff --git a/mcop/tcpconnection.h b/mcop/tcpconnection.h
index 4fadef6..e09474a 100644
--- a/mcop/tcpconnection.h
+++ b/mcop/tcpconnection.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): TCPConnection
+ * BC - tqStatus (2002-03-08): TCPConnection
  *
  * Not part of the public API. Do NOT use it in your apps. Binary incompatible
  * changes allowed.
diff --git a/mcop/tcpserver.h b/mcop/tcpserver.h
index 4c31540..59ee44e 100644
--- a/mcop/tcpserver.h
+++ b/mcop/tcpserver.h
@@ -27,7 +27,7 @@
 #include "arts_export.h"
 #include "iomanager.h"
 /*
- * BC - Status (2002-03-08): TCPServer
+ * BC - tqStatus (2002-03-08): TCPServer
  *
  * Not part of the public API. Do NOT use it in your apps. Binary incompatible
  * changes allowed.
diff --git a/mcop/thread.h b/mcop/thread.h
index d81010d..c7ce9ec 100644
--- a/mcop/thread.h
+++ b/mcop/thread.h
@@ -26,7 +26,7 @@
 #include "arts_export.h"
 
 /*
- * BC - Status (2002-03-08): SystemThreads, Thread, Mutex, ThreadCondition,
+ * BC - tqStatus (2002-03-08): SystemThreads, Thread, Mutex, ThreadCondition,
  * Semaphore
  *
  * These classes are kept binary compatible. As the threading implementation
diff --git a/mcop/type.h b/mcop/type.h
index a4ca501..4cdd3f6 100644
--- a/mcop/type.h
+++ b/mcop/type.h
@@ -27,7 +27,7 @@
 #include "buffer.h"
 
 /*
- * BC - Status (2002-03-08): Type
+ * BC - tqStatus (2002-03-08): Type
  *
  * Keep binary compatible. DO NOT TOUCH, DO NOT CHANGE.
  */
diff --git a/mcop/unixconnection.h b/mcop/unixconnection.h
index 0640670..c8d2d20 100644
--- a/mcop/unixconnection.h
+++ b/mcop/unixconnection.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): UnixConnection
+ * BC - tqStatus (2002-03-08): UnixConnection
  *
  * Not part of the public API. Do NOT use it in your apps. Can change, even
  * binary incompatible.
diff --git a/mcop/unixserver.h b/mcop/unixserver.h
index fa91fba..3220e42 100644
--- a/mcop/unixserver.h
+++ b/mcop/unixserver.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): UnixServer
+ * BC - tqStatus (2002-03-08): UnixServer
  *
  * Not part of the public API. Do NOT use it in your apps. Can change, even
  * binary incompatible.
diff --git a/mcop/weakreference.h b/mcop/weakreference.h
index 344eacb..a91bc0d 100644
--- a/mcop/weakreference.h
+++ b/mcop/weakreference.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): WeakReference(Base)
+ * BC - tqStatus (2002-03-08): WeakReference(Base)
  *
  * Has to be kept binary compatible by not touching it. Add a new class if
  * you need something else.
diff --git a/mcopidl/yacc.cc b/mcopidl/yacc.cc
index e063506..edd9157 100644
--- a/mcopidl/yacc.cc
+++ b/mcopidl/yacc.cc
@@ -414,7 +414,7 @@ static const short yycheck[] = {     0,
 #endif
 
 /* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
+   It is tqreplaced by the list of actions, each action
    as one case of the switch.  */
 
 #define yyerrok		(yyerrstatus = 0)
diff --git a/qtmcop/CMakeLists.txt b/qtmcop/CMakeLists.txt
index dbb73bf..75764c5 100644
--- a/qtmcop/CMakeLists.txt
+++ b/qtmcop/CMakeLists.txt
@@ -35,13 +35,13 @@ install( FILES
 ##### qtmcop ##############################
 
 add_custom_command(
-  OUTPUT qiomanager_p.moc
-  COMMAND tmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc
+  OUTPUT qiomanager_p.tqmoc
+  COMMAND tqmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.tqmoc
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h
 )
 
 tde_add_library( qtmcop SHARED
-  SOURCES qiomanager.cc qiomanager_p.moc
+  SOURCES qiomanager.cc qiomanager_p.tqmoc
   VERSION 1.0.0
   LINK mcop-shared ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/qtmcop/Makefile.am b/qtmcop/Makefile.am
index 74f638a..11a7c18 100644
--- a/qtmcop/Makefile.am
+++ b/qtmcop/Makefile.am
@@ -8,7 +8,7 @@ libqtmcop_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIB_QT)
 libqtmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(KDE_RPATH) \
 	$(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(USER_LDFLAGS) $(X_LDFLAGS) $(LDFLAGS_AS_NEEDED)
 
-METASOURCES = qiomanager_p.moc
+METASOURCES = qiomanager_p.tqmoc
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = qiomanager.h
diff --git a/qtmcop/qiomanager.cc b/qtmcop/qiomanager.cc
index 1853586..041e7e6 100644
--- a/qtmcop/qiomanager.cc
+++ b/qtmcop/qiomanager.cc
@@ -156,9 +156,9 @@ void QIOManager::processOneEvent(bool blocking)
 	else
 	{
 		if(blocking)
-			qApp->processOneEvent();
+			tqApp->processOneEvent();
 		else
-			qApp->processEvents(0);
+			tqApp->processEvents(0);
 	}
 }
 
@@ -296,4 +296,4 @@ void QIOManager::setBlocking(bool blocking)
 	qioBlocking = blocking;
 }
 
-#include "qiomanager_p.moc"
+#include "qiomanager_p.tqmoc"
diff --git a/qtmcop/qiomanager.h b/qtmcop/qiomanager.h
index a1a8b20..7c5d655 100644
--- a/qtmcop/qiomanager.h
+++ b/qtmcop/qiomanager.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): QIOManager.
+ * BC - tqStatus (2002-03-08): QIOManager.
  *
  * QIOManager is kept binary compatible.
  */
diff --git a/qtmcop/qiomanager_p.h b/qtmcop/qiomanager_p.h
index b4fea29..6048397 100644
--- a/qtmcop/qiomanager_p.h
+++ b/qtmcop/qiomanager_p.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): QIOWatch, QTimeWatch.
+ * BC - tqStatus (2002-03-08): QIOWatch, QTimeWatch.
  *
  * These classes provide implementation details and not meant to be used
  * in any way.
diff --git a/soundserver/artsshell.cc b/soundserver/artsshell.cc
index 59390c8..ebda656 100644
--- a/soundserver/artsshell.cc
+++ b/soundserver/artsshell.cc
@@ -254,7 +254,7 @@ int suspend(Arts::SoundServer server)
 // Display server status information
 void status(Arts::SoundServerV2 server)
 {
-	Arts::RealtimeStatus rtStatus = server.realtimeStatus();
+	Arts::RealtimetqStatus rttqStatus = server.realtimetqStatus();
 	long seconds = server.secondsUntilSuspend();
 
 	cout << "server status: ";
@@ -274,7 +274,7 @@ void status(Arts::SoundServerV2 server)
 	}
 
 	cout << "real-time status: ";
-	switch (rtStatus)
+	switch (rttqStatus)
 	{
 	  case Arts::rtRealtime:
 		  cout << "real-time" << endl;
diff --git a/soundserver/crashhandler.cc b/soundserver/crashhandler.cc
index 5864d89..441ef1d 100644
--- a/soundserver/crashhandler.cc
+++ b/soundserver/crashhandler.cc
@@ -65,27 +65,27 @@ CrashHandler::setCrashHandler (HandlerType handler)
   if (!handler)
     handler = SIG_DFL;
 
-  sigset_t mask;
-  sigemptyset(&mask);
+  sigset_t tqmask;
+  sigemptyset(&tqmask);
 
 #ifdef SIGSEGV
   signal (SIGSEGV, handler);
-  sigaddset(&mask, SIGSEGV);
+  sigaddset(&tqmask, SIGSEGV);
 #endif
 #ifdef SIGFPE
   signal (SIGFPE, handler);
-  sigaddset(&mask, SIGFPE);
+  sigaddset(&tqmask, SIGFPE);
 #endif
 #ifdef SIGILL
   signal (SIGILL, handler);
-  sigaddset(&mask, SIGILL);
+  sigaddset(&tqmask, SIGILL);
 #endif
 #ifdef SIGABRT
   signal (SIGABRT, handler);
-  sigaddset(&mask, SIGABRT);
+  sigaddset(&tqmask, SIGABRT);
 #endif
 
-  sigprocmask(SIG_UNBLOCK, &mask, 0);
+  sigprocmask(SIG_UNBLOCK, &tqmask, 0);
 
   _crashHandler = handler;
 }
diff --git a/soundserver/kmedia2.idl b/soundserver/kmedia2.idl
index cdcb101..ca17d67 100644
--- a/soundserver/kmedia2.idl
+++ b/soundserver/kmedia2.idl
@@ -1,6 +1,6 @@
 /*
 
-NEW KMedia2 layout:
+NEW KMedia2 tqlayout:
 ===================
 
 KMedia1 itself doesn't play anything. Instead it has a backend for every
@@ -47,7 +47,7 @@ enum poCapabilities {
 /**
  * KMedia2 time information
  *
- * This is a time value which contains either milliseconds & seconds, or
+ * This is a time value which tqcontains either milliseconds & seconds, or
  * a custom unit or both. It is a flexible time base.
  *
  * If a value isn't there, it is set to -1.
diff --git a/soundserver/soundserver.idl b/soundserver/soundserver.idl
index 7c2cc41..8cdc2d1 100644
--- a/soundserver/soundserver.idl
+++ b/soundserver/soundserver.idl
@@ -163,7 +163,7 @@ interface SimpleSoundServer : PlayObjectFactory
 	object createObject(string name);
 };
 
-enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
+enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
 
 /**
  * This is an enhanced sound server interface which can be used to
@@ -171,7 +171,7 @@ enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
  */
 interface SoundServer : SimpleSoundServer
 {
-	readonly attribute RealtimeStatus realtimeStatus;
+	readonly attribute RealtimetqStatus realtimetqStatus;
 
 	/**
 	 * Returns how many seconds you have to wait _now_ for the soundserver
diff --git a/soundserver/soundserver_impl.cc b/soundserver/soundserver_impl.cc
index 7c84792..b922692 100644
--- a/soundserver/soundserver_impl.cc
+++ b/soundserver/soundserver_impl.cc
@@ -39,14 +39,14 @@ using namespace Arts;
 
 #ifdef HAVE_REALTIME_SCHED
 #include <sched.h>
-RealtimeStatus SoundServer_impl::realtimeStatus() {
+RealtimetqStatus SoundServer_impl::realtimetqStatus() {
 	int sched = sched_getscheduler(0);
 	if (sched == SCHED_FIFO || sched == SCHED_RR) return rtRealtime;
 	if (!getenv("STARTED_THROUGH_ARTSWRAPPER")) return rtNoWrapper;
 	return rtNoRealtime;
 }
 #else
-RealtimeStatus SoundServer_impl::realtimeStatus() {
+RealtimetqStatus SoundServer_impl::realtimetqStatus() {
 	return rtNoSupport;
 }
 #endif
diff --git a/soundserver/soundserver_impl.h b/soundserver/soundserver_impl.h
index 670b146..87ce72c 100644
--- a/soundserver/soundserver_impl.h
+++ b/soundserver/soundserver_impl.h
@@ -35,7 +35,7 @@ namespace Arts {
 	class SoundServer_impl : virtual public SoundServer_skel,
 							 public SimpleSoundServer_impl
 	{
-		RealtimeStatus realtimeStatus();
+		RealtimetqStatus realtimetqStatus();
 		long secondsUntilSuspend();
 		bool suspend();
 		bool suspended();
diff --git a/tests/testifacerepo.cc b/tests/testifacerepo.cc
index a5c5962..ceb36d3 100644
--- a/tests/testifacerepo.cc
+++ b/tests/testifacerepo.cc
@@ -52,7 +52,7 @@ struct TestInterfaceRepo : public TestCase
 
 		testEquals("Arts::AttributeType",def.name);
 	}
-	bool contains(vector<string>& sequence, const string& element)
+	bool tqcontains(vector<string>& sequence, const string& element)
 	{
 		vector<string>::iterator it;
 		it = find(sequence.begin(),sequence.end(), element);
@@ -61,22 +61,22 @@ struct TestInterfaceRepo : public TestCase
 	TEST(queryInterfaces) {
 		vector<string> *interfaces = interfaceRepo.queryInterfaces();
 
-		testAssert(contains(*interfaces,"Arts::InterfaceRepo"));
-		testAssert(!contains(*interfaces,"Arts::MethodDef"));
+		testAssert(tqcontains(*interfaces,"Arts::InterfaceRepo"));
+		testAssert(!tqcontains(*interfaces,"Arts::MethodDef"));
 		delete interfaces;
 	}
 	TEST(queryTypes) {
 		vector<string> *types = interfaceRepo.queryTypes();
 
-		testAssert(contains(*types,"Arts::MethodDef"));
-		testAssert(!contains(*types,"Arts::AttributeType"));
+		testAssert(tqcontains(*types,"Arts::MethodDef"));
+		testAssert(!tqcontains(*types,"Arts::AttributeType"));
 		delete types;
 	}
 	TEST(queryEnums) {
 		vector<string> *enums = interfaceRepo.queryEnums();
 
-		testAssert(contains(*enums,"Arts::AttributeType"));
-		testAssert(!contains(*enums,"Arts::InterfaceRepo"));
+		testAssert(tqcontains(*enums,"Arts::AttributeType"));
+		testAssert(!tqcontains(*enums,"Arts::InterfaceRepo"));
 		delete enums;
 	}
 };
diff --git a/tests/testwrapper.cc b/tests/testwrapper.cc
index 9be8c35..a5279a8 100644
--- a/tests/testwrapper.cc
+++ b/tests/testwrapper.cc
@@ -157,7 +157,7 @@ struct TestWrapper : public TestCase
 		d.value(6);
 		testEquals(1, active_d_objects);
 
-		b = d; // uses operator, not constructor. should invalidate A::cacheOK
+		b = d; // uses operator, not constructor. should tqinvalidate A::cacheOK
 		testEquals(6, b.value());
 		testEquals(1, active_d_objects);