diff --git a/flow/gsl/gslengine.c b/flow/gsl/gslengine.c
index 6c6c9f5..d85ebfb 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) tqalignment */
+  gsl_externvar_sub_sample_mask = sub_sample_mask << 2;	/* shift out sizeof (float) alignment */
   gsl_externvar_sub_sample_steps = sub_sample_mask + 1;
   _gsl_tick_stamp_set_leap (block_size);
 
diff --git a/flow/gsl/gslloader-wav.c b/flow/gsl/gslloader-wav.c
index 85e4cc3..6cb8831 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_tqalignment)
+		      guint       byte_alignment)
 {
   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_tqalignment);
+      return wav_read_data_header (fd, header, byte_alignment);
     }
-  if (header->data_length < 1 || header->data_length % byte_tqalignment != 0)
+  if (header->data_length < 1 || header->data_length % byte_alignment != 0)
     {
-      WAV_DEBUG ("invalid data length (%u) or tqalignment (%u)",
-		 header->data_length, header->data_length % byte_tqalignment);
+      WAV_DEBUG ("invalid data length (%u) or alignment (%u)",
+		 header->data_length, header->data_length % byte_alignment);
       return GSL_ERROR_FORMAT_INVALID;
     }
 
diff --git a/flow/gsl/gslopschedule.c b/flow/gsl/gslopschedule.c
index 8e797a3..a72f52b 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 tqalignment, ll >= leaf_level+1 */
+  guint ll = 1 << g_bit_storage (leaf_level);	/* power2 growth alignment, ll >= leaf_level+1 */
   
   if (sched->leaf_levels < ll)
     {
diff --git a/mcop/object.cc b/mcop/object.cc
index 5153f0f..a50061e 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()
 {
 	/*
-	 * tqinvalidate method lookup cache entries of this object, as it might
+	 * invalidate 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/tests/testwrapper.cc b/tests/testwrapper.cc
index a5279a8..9be8c35 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 tqinvalidate A::cacheOK
+		b = d; // uses operator, not constructor. should invalidate A::cacheOK
 		testEquals(6, b.value());
 		testEquals(1, active_d_objects);