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/gsl/gslengine.c b/flow/gsl/gslengine.c
index d85ebfb..6c6c9f5 100644
--- a/flow/gsl/gslengine.c
+++ b/flow/gsl/gslengine.c
@@ -664,7 +664,7 @@ gsl_engine_init (gboolean run_threaded,
   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_mask = sub_sample_mask << 2;	/* shift out sizeof (float) tqalignment */
   gsl_externvar_sub_sample_steps = sub_sample_mask + 1;
   _gsl_tick_stamp_set_leap (block_size);
 
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/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/mcop/object.cc b/mcop/object.cc
index a50061e..5153f0f 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/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/kmedia2.idl b/soundserver/kmedia2.idl
index cdcb101..96fd5a0 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
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/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);