diff --git a/src/base/BaseProperties.cpp b/src/base/BaseProperties.cpp
index be964ac..adff519 100644
--- a/src/base/BaseProperties.cpp
+++ b/src/base/BaseProperties.cpp
@@ -115,7 +115,7 @@ const PropertyName TRIGGER_SEGMENT_RETUNE        = "triggersegmentretune";
 const PropertyName TRIGGER_SEGMENT_ADJUST_TIMES  = "triggersegmentadjusttimes";
 
 const std::string TRIGGER_SEGMENT_ADJUST_NONE = "none";
-const std::string TRIGGER_SEGMENT_ADJUST_STQUISH = "squish";
+const std::string TRIGGER_SEGMENT_ADJUST_SQUISH = "squish";
 const std::string TRIGGER_SEGMENT_ADJUST_SYNC_START = "syncstart";
 const std::string TRIGGER_SEGMENT_ADJUST_SYNC_END = "syncend";
 
diff --git a/src/base/BaseProperties.h b/src/base/BaseProperties.h
index 44cd477..f83b2f7 100644
--- a/src/base/BaseProperties.h
+++ b/src/base/BaseProperties.h
@@ -62,7 +62,7 @@ extern const PropertyName TRIGGER_SEGMENT_RETUNE;
 extern const PropertyName TRIGGER_SEGMENT_ADJUST_TIMES;
 
 extern const std::string TRIGGER_SEGMENT_ADJUST_NONE;
-extern const std::string TRIGGER_SEGMENT_ADJUST_STQUISH;
+extern const std::string TRIGGER_SEGMENT_ADJUST_SQUISH;
 extern const std::string TRIGGER_SEGMENT_ADJUST_SYNC_START;
 extern const std::string TRIGGER_SEGMENT_ADJUST_SYNC_END;
 
diff --git a/src/base/BasicQuantizer.h b/src/base/BasicQuantizer.h
index 2f3ce9e..1a9a7b7 100644
--- a/src/base/BasicQuantizer.h
+++ b/src/base/BasicQuantizer.h
@@ -19,8 +19,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef BASIC_TQUANTIZER_H
-#define BASIC_TQUANTIZER_H
+#ifndef BASIC_QUANTIZER_H
+#define BASIC_QUANTIZER_H
 
 #include "Quantizer.h"
 
diff --git a/src/base/Composition.h b/src/base/Composition.h
index 3514a86..24865dd 100644
--- a/src/base/Composition.h
+++ b/src/base/Composition.h
@@ -770,7 +770,7 @@ public:
 
     //////
     //
-    // TQUANTIZERS
+    // QUANTIZERS
 
     /**
      * Return a quantizer that quantizes to the our most basic
diff --git a/src/base/Equation.h b/src/base/Equation.h
index 668c321..61377a5 100644
--- a/src/base/Equation.h
+++ b/src/base/Equation.h
@@ -20,8 +20,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _ETQUATION_H_
-#define _ETQUATION_H_
+#ifndef _EQUATION_H_
+#define _EQUATION_H_
 
 namespace Rosegarden {
 
diff --git a/src/base/LegatoQuantizer.h b/src/base/LegatoQuantizer.h
index fee5360..645da05 100644
--- a/src/base/LegatoQuantizer.h
+++ b/src/base/LegatoQuantizer.h
@@ -19,8 +19,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef LEGATO_TQUANTIZER_H
-#define LEGATO_TQUANTIZER_H
+#ifndef LEGATO_QUANTIZER_H
+#define LEGATO_QUANTIZER_H
 
 #include "Quantizer.h"
 
diff --git a/src/base/NotationQuantizer.cpp b/src/base/NotationQuantizer.cpp
index 8f4b1e7..9e76a94 100644
--- a/src/base/NotationQuantizer.cpp
+++ b/src/base/NotationQuantizer.cpp
@@ -37,7 +37,7 @@ using std::cout;
 using std::cerr;
 using std::endl;
 
-//#define DEBUG_NOTATION_TQUANTIZER 1
+//#define DEBUG_NOTATION_QUANTIZER 1
 
 namespace Rosegarden {
 
@@ -83,7 +83,7 @@ public:
 	}
 	virtual timeT getQuantizedAbsoluteTime(const Event *e) const {
 	    timeT t = m_impl->getProvisional((Event *)e, AbsoluteTimeValue);
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "ProvisionalQuantizer::getQuantizedAbsoluteTime: returning " << t << endl;
 #endif
 	    return t;
@@ -295,7 +295,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
     long bestScore = 0;
     bool bestRight = false;
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "quantizeAbsoluteTime: t is " << t << ", d is " << d << endl;
 #endif
 
@@ -321,7 +321,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 	}
     }
     
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     if (n != s->end() && n != nprime) {
 	cout << "found n (distinct from nprime) at " << (*n)->getAbsoluteTime() << endl;
     }
@@ -340,7 +340,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 					      t, d, noteType, n, nprime, right);
 
 	if (depth == 0 || score < bestScore) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << " [*]";
 #endif
 	    bestBase = base;
@@ -348,13 +348,13 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 	    bestRight = right;
 	}
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << endl;
 #endif
     }
 
     if (bestBase == -2) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Quantizer::quantizeAbsoluteTime: weirdness: no snap found" << endl;
 #endif
     } else {
@@ -373,7 +373,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c
 
 	t += sigTime;
 	
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "snap base is " << bestBase << ", snapped to " << t << endl;
 #endif
     }
@@ -457,7 +457,7 @@ NotationQuantizer::Impl::scoreAbsoluteTimeForBase(Segment *s,
 	    }
 	}
     
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "  depth/eff/dist/t/score/pen1/pen2/res: " << depth << "/" << effectiveDepth << "/" << distance << "/" << (right ? t + distance : t - distance) << "/" << score << "/" << penalty1 << "/" << penalty2 << "/" << (score * penalty1 * penalty2);
 	if (right) cout << " -> ";
 	else cout << " <- ";
@@ -553,7 +553,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 
     Profiler profiler("NotationQuantizer::Impl::quantizeDuration");
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "quantizeDuration: chord has " << c.size() << " notes" << endl;
 #endif
 
@@ -584,7 +584,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	if ((**ci)->has(m_provisionalDuration) &&
 	    (**ci)->has(BEAMED_GROUP_TUPLET_BASE)) {
 	    // dealt with already in tuplet code, we'd only mess it up here
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "not recalculating duration for tuplet" << endl;
 #endif
 	    continue;
@@ -595,7 +595,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	if (!m_contrapuntal) {
 	    // if not contrapuntal, give all notes in chord equal duration
 	    if (nonContrapuntalDuration > 0) {
-#ifdef DEBUG_NOTATION_TQUANTIZER 
+#ifdef DEBUG_NOTATION_QUANTIZER 
 		cout << "setting duration trivially to " << nonContrapuntalDuration << endl;
 #endif
 		setProvisional(**ci, DurationValue, nonContrapuntalDuration);
@@ -613,7 +613,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 
 	timeT qt = getProvisional(**ci, AbsoluteTimeValue);
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "note at time " << (**ci)->getAbsoluteTime() << " (provisional time " << qt << ")" << endl;
 #endif
 
@@ -626,7 +626,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	    base /= divisions[depth];
 	}
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "duration is " << ud << ", probably between "
 		  << bases.first << " and " << bases.second << endl;
 #endif
@@ -645,7 +645,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 
 	    qd = Note::getNearestNote(spaceAvailable).getDuration();
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "non-contrapuntal segment, rounded duration down to "
 		 << qd << " (as only " << spaceAvailable << " available)"
 		 << endl;
@@ -675,7 +675,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 		bases.second == absTimeBase) {
 		
 		if (nextNoteTime >= qt + bases.second) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 		    cout << "We rounded to " << qd
 			 << " but we're on " << absTimeBase << " absTimeBase"
 			 << " and the next base is " << bases.second
@@ -699,14 +699,14 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 		    if (note.getNoteType() < Note::Longest) {
 			
 			if (bases.second <= spaceAvailable) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 			    cout << "We rounded down to " << qd
 				 << " but have room for " << bases.second
 				 << ", rounding up again" << endl;
 #endif
 			    qd = bases.second;
 			} else {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 			    cout << "We rounded down to " << qd
 				 << "; can't fit " << bases.second << endl;
 #endif
@@ -720,7 +720,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const
 	if (!m_contrapuntal) nonContrapuntalDuration = qd;
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "totalFrac " << totalFrac << ", totalFracCount " << totalFracCount << ", avg " << (totalFracCount > 0 ? (totalFrac / totalFracCount) : 0) << endl;
 #endif
 }
@@ -746,7 +746,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s,
 	if (depth >= 0) base /= divisions[depth];
 	if (base <= Note(Note::Semiquaver).getDuration()) break;
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "\nscanTupletsInBar: trying at depth " << depth << " (base " << base << ")" << endl;
 #endif
 
@@ -766,7 +766,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s,
 		continue;
 	    }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "scanTupletsInBar: testing " << tupletStart << "," << base << " at tuplet base " << tupletBase << endl;
 #endif
 
@@ -786,7 +786,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s,
 	    }
 
 	    if (jTime >= tupletEnd) { // nothing to make tuplets of
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 		cout << "scanTupletsInBar: nothing here" << endl;
 #endif
 		tupletStart = tupletEnd;
@@ -827,14 +827,14 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
 	
 	if (!(*j)->isa(Note::EventType)) { ++j; continue; }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "scanTupletsAt time " << jTime << " (unquantized "
 	     << (*j)->getAbsoluteTime() << "), found note" << endl;
 #endif
 
 	// reject any group containing anything already a tuplet
 	if ((*j)->has(BEAMED_GROUP_TUPLET_BASE)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "already made tuplet here" << endl;
 #endif
 	    return;
@@ -843,19 +843,19 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
 	timeT originalBase;
 
 	if (!(*j)->get<Int>(m_provisionalBase, originalBase)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "some notes not provisionally quantized, no good" << endl;
 #endif
 	    return;
 	}
 
 	if (originalBase == base) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "accepting note at original base" << endl;
 #endif
 	    candidates.push_back(*j);
 	} else if (((jTime - sigTime) % base) == 0) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	    cout << "accepting note that happens to lie on original base" << endl;
 #endif
 	    candidates.push_back(*j);
@@ -867,7 +867,7 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
 	    // any of the likelihood tests for tuplets.
 
 	    if (!isValidTupletAt(s, j, depth, base, sigTime, tupletBase)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 		cout << "no good" << endl;
 #endif
 		return;
@@ -883,13 +883,13 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s,
     // must have at least one note that is not already quantized to the
     // original base
     if (count < 1) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "scanTupletsAt: found no note not already quantized to " << base << endl;
 #endif
 	return;
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "scanTupletsAt: Tuplet group of duration " << base << " starting at " << tupletStart << endl;
 #endif
 
@@ -970,7 +970,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s,
     timeT ud = m_q->getFromSource(*i, DurationValue);
 
     if (ud > (tupletBase * 5 / 4)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "\nNotationQuantizer::isValidTupletAt: note too long at "
 	     << (*i)->getDuration() << " (tupletBase is " << tupletBase << ")"
 	     << endl;
@@ -981,7 +981,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s,
     //!!! This bit is a cop-out.  It means we reject anything that looks
     // like it's going to have rests in it.  Bah.
     if (ud <= (tupletBase * 3 / 8)) {
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "\nNotationQuantizer::isValidTupletAt: note too short at "
 	     << (*i)->getDuration() << " (tupletBase is " << tupletBase << ")"
 	     << endl;
@@ -1000,7 +1000,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s,
     bool dummy;
     long tupletScore = scoreAbsoluteTimeForBase
 	(s, i, depth, tupletBase, sigTime, t, d, noteType, s->end(), s->end(), dummy);
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "\nNotationQuantizer::isValidTupletAt: score " << score
 	 << " vs tupletScore " << tupletScore << endl;
 #endif
@@ -1027,7 +1027,7 @@ NotationQuantizer::Impl::quantizeRange(Segment *s,
     int events = 0, notes = 0, passes = 0;
     int setGood = 0, setBad = 0;
     
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "NotationQuantizer::Impl::quantizeRange: from time "
 	      << (from == s->end() ? -1 : (*from)->getAbsoluteTime())
 	      << " to "
@@ -1177,7 +1177,7 @@ NotationQuantizer::Impl::quantizeRange(Segment *s,
 	    (*i)->getDuration() == d) ++setBad;
 	else ++setGood;
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Setting to target at " << t << "," << d << endl;
 #endif
 
diff --git a/src/base/NotationQuantizer.h b/src/base/NotationQuantizer.h
index 02c1c59..87b0d72 100644
--- a/src/base/NotationQuantizer.h
+++ b/src/base/NotationQuantizer.h
@@ -19,8 +19,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef NOTATION_TQUANTIZER_H_
-#define NOTATION_TQUANTIZER_H_
+#ifndef NOTATION_QUANTIZER_H_
+#define NOTATION_QUANTIZER_H_
 
 #include "Quantizer.h"
 
diff --git a/src/base/Quantizer.cpp b/src/base/Quantizer.cpp
index 7b90c61..c0e4d1b 100644
--- a/src/base/Quantizer.cpp
+++ b/src/base/Quantizer.cpp
@@ -37,7 +37,7 @@ using std::cout;
 using std::cerr;
 using std::endl;
 
-//#define DEBUG_NOTATION_TQUANTIZER 1
+//#define DEBUG_NOTATION_QUANTIZER 1
 
 namespace Rosegarden {
 
@@ -366,7 +366,7 @@ Quantizer::setToTarget(Segment *s, Segment::iterator i,
 	// that are already being referred to in ViewElementLists,
 	// preventing us from locating them in the ViewElementLists
 	// because their ordering would have silently changed
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Quantizer: setting " << absTime << " to notation absolute time and "
 	     << duration << " to notation duration"
 	     << endl;
@@ -404,7 +404,7 @@ Quantizer::setToTarget(Segment *s, Segment::iterator i,
 	m_toInsert.push_back(e);
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "m_toInsert.size() is now " << m_toInsert.size() << endl;
 #endif
 }
@@ -464,7 +464,7 @@ Quantizer::insertNewEvents(Segment *s) const
 	s->insert(m_toInsert[i]);
     }
 
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
     cout << "Quantizer::insertNewEvents: sz is " << sz
 	      << ", minTime " << minTime << ", maxTime " << maxTime
 	      << endl;
@@ -482,7 +482,7 @@ Quantizer::insertNewEvents(Segment *s) const
 	}
     }
 		
-#ifdef DEBUG_NOTATION_TQUANTIZER
+#ifdef DEBUG_NOTATION_QUANTIZER
 	cout << "Quantizer: calling normalizeRests("
 		  << minTime << ", " << maxTime << ")" << endl;
 #endif
diff --git a/src/base/Quantizer.h b/src/base/Quantizer.h
index 035299c..407b651 100644
--- a/src/base/Quantizer.h
+++ b/src/base/Quantizer.h
@@ -19,8 +19,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef TQUANTIZER_H
-#define TQUANTIZER_H
+#ifndef QUANTIZER_H
+#define QUANTIZER_H
 
 #include "Segment.h"
 #include "Event.h"
diff --git a/src/base/Segment.h b/src/base/Segment.h
index be2981b..564d118 100644
--- a/src/base/Segment.h
+++ b/src/base/Segment.h
@@ -283,7 +283,7 @@ public:
 
     //////
     //
-    // TQUANTIZATION
+    // QUANTIZATION
 
     /**
      * Switch quantization on or off.
diff --git a/src/base/TriggerSegment.cpp b/src/base/TriggerSegment.cpp
index bcf6888..c4c29de 100644
--- a/src/base/TriggerSegment.cpp
+++ b/src/base/TriggerSegment.cpp
@@ -47,7 +47,7 @@ TriggerSegmentRec::TriggerSegmentRec(TriggerSegmentId id,
     m_defaultRetune(retune)
 {
     if (m_defaultTimeAdjust == "") {
-	m_defaultTimeAdjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
+	m_defaultTimeAdjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
     }
 
     calculateBases();
diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h
index fcda69e..09ae1a7 100644
--- a/src/commands/edit/EventQuantizeCommand.h
+++ b/src/commands/edit/EventQuantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENTQUANTIZECOMMAND_H_
-#define _RG_EVENTQUANTIZECOMMAND_H_
+#ifndef _RG_EVENQUANTIZECOMMAND_H_
+#define _RG_EVENQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
 #include <tqobject.h>
diff --git a/src/commands/edit/EventUnquantizeCommand.h b/src/commands/edit/EventUnquantizeCommand.h
index 9bb2718..4203726 100644
--- a/src/commands/edit/EventUnquantizeCommand.h
+++ b/src/commands/edit/EventUnquantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_EVENTUNTQUANTIZECOMMAND_H_
-#define _RG_EVENTUNTQUANTIZECOMMAND_H_
+#ifndef _RG_EVENTUNQUANTIZECOMMAND_H_
+#define _RG_EVENTUNQUANTIZECOMMAND_H_
 
 #include "document/BasicCommand.h"
 #include <tqstring.h>
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index 05ea393..3a5d334 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_ADJUSTMENUFIXNOTATIONTQUANTIZECOMMAND_H_
-#define _RG_ADJUSTMENUFIXNOTATIONTQUANTIZECOMMAND_H_
+#ifndef _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
+#define _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index 3a5f946..8fb3b53 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_ADJUSTMENUREMOVENOTATIONTQUANTIZECOMMAND_H_
-#define _RG_ADJUSTMENUREMOVENOTATIONTQUANTIZECOMMAND_H_
+#ifndef _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
+#define _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
 
 #include "document/BasicSelectionCommand.h"
 #include <tqstring.h>
diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.h b/src/commands/segment/SegmentChangeQuantizationCommand.h
index 032773e..6c69728 100644
--- a/src/commands/segment/SegmentChangeQuantizationCommand.h
+++ b/src/commands/segment/SegmentChangeQuantizationCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_SEGMENTCHANGETQUANTIZATIONCOMMAND_H_
-#define _RG_SEGMENTCHANGETQUANTIZATIONCOMMAND_H_
+#ifndef _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
+#define _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_
 
 #include <kcommand.h>
 #include <tqstring.h>
diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h
index b078f8f..7e97781 100644
--- a/src/commands/segment/SegmentQuickCopyCommand.h
+++ b/src/commands/segment/SegmentQuickCopyCommand.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_SEGMENTQUICKCOPYCOMMAND_H_
-#define _RG_SEGMENTQUICKCOPYCOMMAND_H_
+#ifndef _RG_SEGMENQUICKCOPYCOMMAND_H_
+#define _RG_SEGMENQUICKCOPYCOMMAND_H_
 
 #include <kcommand.h>
 #include <tqstring.h>
diff --git a/src/gui/application/RosegardenDCOP.h b/src/gui/application/RosegardenDCOP.h
index 749c79b..2689945 100644
--- a/src/gui/application/RosegardenDCOP.h
+++ b/src/gui/application/RosegardenDCOP.h
@@ -43,7 +43,7 @@ typedef enum
      STARTING_TO_PLAY,
      STARTING_TO_RECORD,
      RECORDING_ARMED,                   // gui only state
-     TQUIT
+     QUIT
 } TransportStatus;
 
 
diff --git a/src/gui/dialogs/QuantizeDialog.h b/src/gui/dialogs/QuantizeDialog.h
index d6133fa..f7c2077 100644
--- a/src/gui/dialogs/QuantizeDialog.h
+++ b/src/gui/dialogs/QuantizeDialog.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_TQUANTIZEDIALOG_H_
-#define _RG_TQUANTIZEDIALOG_H_
+#ifndef _RG_QUANTIZEDIALOG_H_
+#define _RG_QUANTIZEDIALOG_H_
 
 #include <kdialogbase.h>
 
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 0d3c0e4..85035df 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -101,7 +101,7 @@ TriggerSegmentDialog::setupFromConfig()
     std::string timing = qstrtostr
                          (config->readEntry
                           ("triggersegmenttiming",
-                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH)));
+                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH)));
     bool retune = config->readBoolEntry("triggersegmentretune", true);
 
     if (seg >= 0 && seg < m_segment->count())
@@ -109,7 +109,7 @@ TriggerSegmentDialog::setupFromConfig()
 
     if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) {
         m_adjustTime->setCurrentItem(0);
-    } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) {
+    } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) {
         m_adjustTime->setCurrentItem(3);
     } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) {
         m_adjustTime->setCurrentItem(1);
@@ -157,7 +157,7 @@ TriggerSegmentDialog::getTimeAdjust() const
     case 2:
         return BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END;
     case 3:
-        return BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
+        return BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
 
     default:
         return BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE;
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 21c9220..279f9f7 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -150,7 +150,7 @@ UseOrnamentDialog::setupFromConfig()
     std::string timing = qstrtostr
                          (config->readEntry
                           ("useornamenttiming",
-                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH)));
+                           strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH)));
     bool retune = config->readBoolEntry("useornamentretune", true);
 
     size_t i = 0;
@@ -172,7 +172,7 @@ UseOrnamentDialog::setupFromConfig()
 
     if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) {
         m_adjustTime->setCurrentItem(0);
-    } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) {
+    } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) {
         m_adjustTime->setCurrentItem(3);
     } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) {
         m_adjustTime->setCurrentItem(1);
@@ -229,7 +229,7 @@ UseOrnamentDialog::getTimeAdjust() const
     case 2:
         return BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END;
     case 3:
-        return BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
+        return BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
 
     default:
         return BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE;
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index d7f874b..b1f7f87 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -203,7 +203,7 @@ EventView::EventView(RosegardenGUIDoc *doc,
         std::string timing = rec->getDefaultTimeAdjust();
         if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) {
             adjust->setCurrentItem(0);
-        } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) {
+        } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) {
             adjust->setCurrentItem(3);
         } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) {
             adjust->setCurrentItem(1);
@@ -744,7 +744,7 @@ EventView::slotEditTriggerVelocity()
 void
 EventView::slotTriggerTimeAdjustChanged(int option)
 {
-    std::string adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
+    std::string adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
 
     switch (option) {
 
@@ -758,7 +758,7 @@ EventView::slotTriggerTimeAdjustChanged(int option)
         adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END;
         break;
     case 3:
-        adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH;
+        adjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH;
         break;
 
     default:
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index a9bfc4c..7c9f498 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -6055,7 +6055,7 @@ NotationView::slotMakeOrnament()
                          style->getName(),
                          getDocument()->getComposition().getNextTriggerSegmentId(),
                          true,
-                         BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH,
+                         BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH,
                          Marks::NoMark)); //!!!
 
     addCommandToHistory(command);
diff --git a/src/gui/editors/notation/NoteCharacterNames.cpp b/src/gui/editors/notation/NoteCharacterNames.cpp
index fb4f96e..bcd450c 100644
--- a/src/gui/editors/notation/NoteCharacterNames.cpp
+++ b/src/gui/editors/notation/NoteCharacterNames.cpp
@@ -45,8 +45,8 @@ const CharName SEMIBREVIS_WHITE = "MUSICAL SYMBOL SEMIBREVIS WHITE";
 const CharName SEMIBREVIS_BLACK = "MUSICAL SYMBOL SEMIBREVIS BLACK";
 const CharName TRIANGLE_NOTEHEAD_UP_WHITE = "MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE";
 const CharName TRIANGLE_NOTEHEAD_UP_BLACK = "MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK";
-const CharName STQUARE_NOTEHEAD_WHITE = "MUSICAL SYMBOL STQUARE NOTEHEAD WHITE";
-const CharName STQUARE_NOTEHEAD_BLACK = "MUSICAL SYMBOL STQUARE NOTEHEAD BLACK";
+const CharName SQUARE_NOTEHEAD_WHITE = "MUSICAL SYMBOL SQUARE NOTEHEAD WHITE";
+const CharName SQUARE_NOTEHEAD_BLACK = "MUSICAL SYMBOL SQUARE NOTEHEAD BLACK";
 
 // These two names are not valid Unicode names.  They describe flags
 // that should be used to compose multi-flag notes, rather than used
@@ -70,7 +70,7 @@ const CharName WHOLE_REST = "MUSICAL SYMBOL WHOLE REST"; // Unicode-4 glyph 1D13
 const CharName WHOLE_REST_ON_STAFF = "MUSICAL SYMBOL WHOLE REST ON STAFF";
 const CharName HALF_REST = "MUSICAL SYMBOL HALF REST";  // Unicode-4 glyph 1D13C
 const CharName HALF_REST_ON_STAFF = "MUSICAL SYMBOL HALF REST ON STAFF";
-const CharName TQUARTER_REST = "MUSICAL SYMBOL TQUARTER REST";
+const CharName QUARTER_REST = "MUSICAL SYMBOL QUARTER REST";
 const CharName EIGHTH_REST = "MUSICAL SYMBOL EIGHTH REST";
 const CharName SIXTEENTH_REST = "MUSICAL SYMBOL SIXTEENTH REST";
 const CharName THIRTY_SECOND_REST = "MUSICAL SYMBOL THIRTY-SECOND REST";
diff --git a/src/gui/editors/notation/NoteCharacterNames.h b/src/gui/editors/notation/NoteCharacterNames.h
index be062df..9022ecd 100644
--- a/src/gui/editors/notation/NoteCharacterNames.h
+++ b/src/gui/editors/notation/NoteCharacterNames.h
@@ -49,8 +49,8 @@ extern const CharName SEMIBREVIS_WHITE;
 extern const CharName SEMIBREVIS_BLACK;
 extern const CharName TRIANGLE_NOTEHEAD_UP_WHITE;
 extern const CharName TRIANGLE_NOTEHEAD_UP_BLACK;
-extern const CharName STQUARE_NOTEHEAD_WHITE;
-extern const CharName STQUARE_NOTEHEAD_BLACK;
+extern const CharName SQUARE_NOTEHEAD_WHITE;
+extern const CharName SQUARE_NOTEHEAD_BLACK;
 
 extern const CharName FLAG_PARTIAL;
 extern const CharName FLAG_PARTIAL_FINAL;
@@ -66,7 +66,7 @@ extern const CharName WHOLE_REST;
 extern const CharName WHOLE_REST_ON_STAFF;
 extern const CharName HALF_REST;
 extern const CharName HALF_REST_ON_STAFF;
-extern const CharName TQUARTER_REST;
+extern const CharName QUARTER_REST;
 extern const CharName EIGHTH_REST;
 extern const CharName SIXTEENTH_REST;
 extern const CharName THIRTY_SECOND_REST;
diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp
index 1e316fd..0b3332d 100644
--- a/src/gui/editors/notation/NoteStyle.cpp
+++ b/src/gui/editors/notation/NoteStyle.cpp
@@ -225,8 +225,8 @@ NoteStyle::getNoteHeadCharName(Note::Type type)
 
     } else if (desc.shape == Rectangle) {
 
-        name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK
-               : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE;
+        name = desc.filled ? NoteCharacterNames::SQUARE_NOTEHEAD_BLACK
+               : NoteCharacterNames::SQUARE_NOTEHEAD_WHITE;
 
     } else if (desc.shape == Number) {
 
@@ -327,7 +327,7 @@ NoteStyle::getRestCharName(Note::Type type, bool restOutsideStave)
     case Note::Quaver:
         return NoteCharacterNames::EIGHTH_REST;
     case Note::Crotchet:
-        return NoteCharacterNames::TQUARTER_REST;
+        return NoteCharacterNames::QUARTER_REST;
     case Note::Minim:
         return restOutsideStave ?
                NoteCharacterNames::HALF_REST
diff --git a/src/gui/seqmanager/SegmentMmapper.cpp b/src/gui/seqmanager/SegmentMmapper.cpp
index 63f79b3..b859aa6 100644
--- a/src/gui/seqmanager/SegmentMmapper.cpp
+++ b/src/gui/seqmanager/SegmentMmapper.cpp
@@ -473,7 +473,7 @@ SegmentMmapper::mergeTriggerSegment(Segment **target,
         timeT d = (*i)->getDuration();
 
         if (evDuration != trDuration &&
-                timeAdjust == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) {
+                timeAdjust == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) {
             t = timeT(double(t * evDuration) / double(trDuration));
             d = timeT(double(d * evDuration) / double(trDuration));
         }
diff --git a/src/gui/widgets/QuantizeParameters.h b/src/gui/widgets/QuantizeParameters.h
index a32c745..c5a5c71 100644
--- a/src/gui/widgets/QuantizeParameters.h
+++ b/src/gui/widgets/QuantizeParameters.h
@@ -23,8 +23,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RG_ROSEGARDENTQUANTIZEPARAMETERS_H_
-#define _RG_ROSEGARDENTQUANTIZEPARAMETERS_H_
+#ifndef _RG_ROSEGARDENQUANTIZEPARAMETERS_H_
+#define _RG_ROSEGARDENQUANTIZEPARAMETERS_H_
 
 #include <tqframe.h>
 #include <tqstring.h>
diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp
index 51240dc..ceeddf6 100644
--- a/src/sequencer/RosegardenSequencerApp.cpp
+++ b/src/sequencer/RosegardenSequencerApp.cpp
@@ -143,7 +143,7 @@ RosegardenSequencerApp::quit()
     close();
 
     // and break out of the loop next time around
-    m_transportStatus = TQUIT;
+    m_transportStatus = QUIT;
 }
 
 
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index af3d9a3..dd97510 100644
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 
     RealTime sleepTime = RealTime(0, 10000000);
 
-    while (!_exiting && roseSeq && roseSeq->getStatus() != TQUIT) {
+    while (!_exiting && roseSeq && roseSeq->getStatus() != QUIT) {
 
         bool atLeisure = true;
 
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index 58d8093..ddd5fd5 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -2054,8 +2054,8 @@ AlsaDriver::resetPlayback(const RealTime &oldPosition, const RealTime &position)
         unsigned char t_sec = (unsigned char) position.sec % 60;
         unsigned char t_min = (unsigned char) (position.sec / 60) % 60;
         unsigned char t_hrs = (unsigned char) (position.sec / 3600);
-#define STUPID_BROKEN_ETQUIPMENT
-#ifdef STUPID_BROKEN_ETQUIPMENT
+#define STUPID_BROKEN_EQUIPMENT
+#ifdef STUPID_BROKEN_EQUIPMENT
         // Some recorders assume you are talking in 30fps...
         unsigned char t_frm = (unsigned char) (position.nsec / 33333333U);
         unsigned char t_sbf = (unsigned char) ((position.nsec / 333333U) % 100U);
diff --git a/src/sound/AudioPlayQueue.cpp b/src/sound/AudioPlayQueue.cpp
index 6858328..2bd07c3 100644
--- a/src/sound/AudioPlayQueue.cpp
+++ b/src/sound/AudioPlayQueue.cpp
@@ -25,8 +25,8 @@
 #include "PlayableAudioFile.h"
 #include "Profiler.h"
 
-//#define DEBUG_AUDIO_PLAY_TQUEUE 1
-//#define FINE_DEBUG_AUDIO_PLAY_TQUEUE 1
+//#define DEBUG_AUDIO_PLAY_QUEUE 1
+//#define FINE_DEBUG_AUDIO_PLAY_QUEUE 1
 
 namespace Rosegarden
 {
@@ -94,7 +94,7 @@ AudioPlayQueue::addScheduled(PlayableAudioFile *file)
         m_instrumentIndex.push_back(ReverseFileMap());
     }
 
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue[" << this << "]::addScheduled(" << file << "): start " << file->getStartTime() << ", end " << file->getEndTime() << ", slots: " << std::endl;
 #endif
 
@@ -107,13 +107,13 @@ AudioPlayQueue::addScheduled(PlayableAudioFile *file)
                 m_maxBuffers = m_counts[i];
             }
         }
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
         std::cerr << i << " ";
 #endif
 
     }
 
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << std::endl << "(max buffers now "
     << m_maxBuffers << ")" << std::endl;
 #endif
@@ -122,13 +122,13 @@ AudioPlayQueue::addScheduled(PlayableAudioFile *file)
 void
 AudioPlayQueue::addUnscheduled(PlayableAudioFile *file)
 {
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue[" << this << "]::addUnscheduled(" << file << "): start " << file->getStartTime() << ", end " << file->getEndTime() << ", instrument " << file->getInstrument() << std::endl;
 #endif
 
     m_unscheduled.push_back(file);
 
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
 
     std::cerr << "AudioPlayQueue[" << this << "]::addUnscheduled: now " << m_unscheduled.size() << " unscheduled files" << std::endl;
 #endif
@@ -138,7 +138,7 @@ AudioPlayQueue::addUnscheduled(PlayableAudioFile *file)
 void
 AudioPlayQueue::erase(PlayableAudioFile *file)
 {
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue::erase(" << file << "): start " << file->getStartTime() << ", end " << file->getEndTime() << std::endl;
 #endif
 
@@ -195,7 +195,7 @@ AudioPlayQueue::erase(PlayableAudioFile *file)
 void
 AudioPlayQueue::clear()
 {
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue::clear()" << std::endl;
 #endif
 
@@ -255,7 +255,7 @@ AudioPlayQueue::getPlayingFiles(const RealTime &sliceStart,
                     f->getStartTime() + f->getDuration() <= sliceStart)
                 continue;
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
 
             std::cerr << "... found " << f << " in slot " << i << std::endl;
 #endif
@@ -273,7 +273,7 @@ AudioPlayQueue::getPlayingFiles(const RealTime &sliceStart,
         }
     }
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
     if (playing.size() > 0) {
         std::cerr << "AudioPlayQueue::getPlayingFiles(" << sliceStart << ","
         << sliceDuration << "): total "
@@ -289,7 +289,7 @@ AudioPlayQueue::getPlayingFilesForInstrument(const RealTime &sliceStart,
         PlayableAudioFile **playing,
         size_t &size) const
 {
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
     bool printed = false;
     Profiler profiler("AudioPlayQueue::getPlayingFilesForInstrument", true);
 #endif
@@ -321,7 +321,7 @@ AudioPlayQueue::getPlayingFilesForInstrument(const RealTime &sliceStart,
             if (f->getInstrument() != instrumentId)
                 continue;
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
 
             if (!printed) {
                 std::cerr << "AudioPlayQueue::getPlayingFilesForInstrument(" << sliceStart
@@ -334,7 +334,7 @@ AudioPlayQueue::getPlayingFilesForInstrument(const RealTime &sliceStart,
             if (f->getStartTime() > sliceEnd ||
                     f->getEndTime() <= sliceStart) {
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
                 std::cerr << "... rejected " << f << " in slot " << i << std::endl;
                 if (f->getStartTime() > sliceEnd) {
                     std::cerr << "(" << f->getStartTime() << " > " << sliceEnd
@@ -348,7 +348,7 @@ AudioPlayQueue::getPlayingFilesForInstrument(const RealTime &sliceStart,
                 continue;
             }
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
             std::cerr << "... found " << f << " in slot " << i << " ("
             << f->getStartTime() << " -> " << f->getEndTime()
             << ")" << std::endl;
@@ -363,7 +363,7 @@ AudioPlayQueue::getPlayingFilesForInstrument(const RealTime &sliceStart,
                 break; // already have it
 
             if (written >= size) {
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
                 std::cerr << "No room to write it!" << std::endl;
 #endif
 
@@ -382,7 +382,7 @@ unscheduled:
         PlayableAudioFile *f = *fli;
 
         if (f->getInstrument() != instrumentId) {
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
             std::cerr << "rejecting unscheduled " << f << " as wrong instrument ("
             << f->getInstrument() << " != " << instrumentId << ")" << std::endl;
 #endif
@@ -390,7 +390,7 @@ unscheduled:
             continue;
         }
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
         if (!printed) {
             std::cerr << "AudioPlayQueue::getPlayingFilesForInstrument(" << sliceStart
             << ", " << sliceDuration << ", " << instrumentId << ")"
@@ -402,7 +402,7 @@ unscheduled:
         if (f->getStartTime() <= sliceEnd &&
                 f->getStartTime() + f->getDuration() > sliceStart) {
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
             std::cerr << "... found " << f << " in unscheduled list ("
             << f->getStartTime() << " -> " << f->getEndTime()
             << ")" << std::endl;
@@ -412,7 +412,7 @@ unscheduled:
                 break;
             playing[written++] = f;
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
 
         } else {
 
@@ -429,7 +429,7 @@ unscheduled:
         }
     }
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
     if (written > 0) {
         std::cerr << "AudioPlayQueue::getPlayingFilesForInstrument: total "
         << written << " files" << std::endl;
@@ -442,7 +442,7 @@ unscheduled:
 bool
 AudioPlayQueue::haveFilesForInstrument(InstrumentId instrumentId) const
 {
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue::haveFilesForInstrument(" << instrumentId << ")...";
 #endif
 
@@ -450,7 +450,7 @@ AudioPlayQueue::haveFilesForInstrument(InstrumentId instrumentId) const
 
     if (index < m_instrumentIndex.size() &&
             !m_instrumentIndex[index].empty()) {
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
         std::cerr << " yes (scheduled)" << std::endl;
 #endif
 
@@ -461,7 +461,7 @@ AudioPlayQueue::haveFilesForInstrument(InstrumentId instrumentId) const
             fli != m_unscheduled.end(); ++fli) {
         PlayableAudioFile *file = *fli;
         if (file->getInstrument() == instrumentId) {
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
             std::cerr << " yes (unscheduled)" << std::endl;
 #endif
 
@@ -469,7 +469,7 @@ AudioPlayQueue::haveFilesForInstrument(InstrumentId instrumentId) const
         }
     }
 
-#ifdef FINE_DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef FINE_DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << " no" << std::endl;
 #endif
 
@@ -479,7 +479,7 @@ AudioPlayQueue::haveFilesForInstrument(InstrumentId instrumentId) const
 const AudioPlayQueue::FileSet &
 AudioPlayQueue::getAllScheduledFiles() const
 {
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue[" << this << "]::getAllScheduledFiles: have " << m_files.size() << " files" << std::endl;
 #endif
 
@@ -489,7 +489,7 @@ AudioPlayQueue::getAllScheduledFiles() const
 const AudioPlayQueue::FileList &
 AudioPlayQueue::getAllUnscheduledFiles() const
 {
-#ifdef DEBUG_AUDIO_PLAY_TQUEUE
+#ifdef DEBUG_AUDIO_PLAY_QUEUE
     std::cerr << "AudioPlayQueue[" << this << "]::getAllUnscheduledFiles: have " << m_unscheduled.size() << " files" << std::endl;
 #endif
 
diff --git a/src/sound/AudioPlayQueue.h b/src/sound/AudioPlayQueue.h
index 0ef0efb..2a7067c 100644
--- a/src/sound/AudioPlayQueue.h
+++ b/src/sound/AudioPlayQueue.h
@@ -19,8 +19,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _AUDIO_PLAY_TQUEUE_H_
-#define _AUDIO_PLAY_TQUEUE_H_
+#ifndef _AUDIO_PLAY_QUEUE_H_
+#define _AUDIO_PLAY_QUEUE_H_
 
 #include "RealTime.h"
 #include "Instrument.h"
diff --git a/src/sound/Midi.h b/src/sound/Midi.h
index c6d877b..65bfe93 100644
--- a/src/sound/Midi.h
+++ b/src/sound/Midi.h
@@ -61,7 +61,7 @@ const MidiByte MIDI_SELECT_CHNL_MODE       = 0xB0;
 
 // system messages
 const MidiByte MIDI_SYSTEM_EXCLUSIVE       = 0xF0;
-const MidiByte MIDI_TC_TQUARTER_FRAME       = 0xF1;
+const MidiByte MIDI_TC_QUARTER_FRAME       = 0xF1;
 const MidiByte MIDI_SONG_POSITION_PTR      = 0xF2;
 const MidiByte MIDI_SONG_SELECT            = 0xF3;
 const MidiByte MIDI_TUNE_REQUEST           = 0xF6;
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index a2a4475..76d5c85 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -464,7 +464,7 @@ MidiFile::parseHeader(const string &midiHeader)
     m_numberOfTracks = midiBytesToInt(midiHeader.substr(10, 2));
     m_timingDivision = midiBytesToInt(midiHeader.substr(12, 2));
 
-    if ( m_format == MIDI_SETQUENTIAL_TRACK_FILE ) {
+    if ( m_format == MIDI_SEQUENTIAL_TRACK_FILE ) {
 #ifdef MIDI_DEBUG
         std::cerr << "MidiFile::parseHeader()"
         << "- can't load sequential track file"
diff --git a/src/sound/MidiFile.h b/src/sound/MidiFile.h
index 4134dd3..fdc242e 100644
--- a/src/sound/MidiFile.h
+++ b/src/sound/MidiFile.h
@@ -73,7 +73,7 @@ public:
     {
         MIDI_SINGLE_TRACK_FILE          = 0x00,
         MIDI_SIMULTANEOUS_TRACK_FILE    = 0x01,
-        MIDI_SETQUENTIAL_TRACK_FILE      = 0x02,
+        MIDI_SEQUENTIAL_TRACK_FILE      = 0x02,
         MIDI_CONVERTED_TO_APPLICATION   = 0xFE,
         MIDI_FILE_NOT_LOADED            = 0xFF
     } MIDIFileFormatType;