diff --git a/components/codetools/codetoolscfgscript.pas b/components/codetools/codetoolscfgscript.pas
index 6bc8346997..3859e4fcbc 100644
--- a/components/codetools/codetoolscfgscript.pas
+++ b/components/codetools/codetoolscfgscript.pas
@@ -452,7 +452,7 @@ begin
   CheckCTCSVariable(Left);
   CheckCTCSVariable(Right);
   {$ENDIF}
-  //debugln(['CompareCTCSVariables AAA1 Left=',dbgs(Left),' Right=',dbgs(Right)]);
+  //debugln(['CompareCTCSVariables START Left=',dbgs(Left),' Right=',dbgs(Right)]);
   Result:=false;
   Equal:=false;
   LeftIsLowerThanRight:=false;
diff --git a/components/codetools/examples/scanexamples/modemacpas.pas b/components/codetools/examples/scanexamples/modemacpas.pas
index ce04f55614..14c93edbed 100644
--- a/components/codetools/examples/scanexamples/modemacpas.pas
+++ b/components/codetools/examples/scanexamples/modemacpas.pas
@@ -11,11 +11,11 @@ uses
 {$DEFINE bogus4}
 
 {$ifc defined test1}
-type aaa1 = integer;
+type mmp1 = integer;
 {$elifc defined test2}
-type aaa2 = integer;
+type mmp2 = integer;
 {$elifc defined test3}
-type aaa3 = integer;
+type mmp3 = integer;
   {$ifc defined bogus1}
   type bogus1 = integer;
   {$elifc defined bogus2}
@@ -27,7 +27,7 @@ type aaa3 = integer;
     {$error Neither bogus1 nor bogus2 nor bogus3 are defined.}
   {$endc}
 {$elsec}
-type aaaELSE = integer;
+type mmpELSE = integer;
   {$error Neither test1 nor test2 nor test3 are defined.}
 {$endc}
 
diff --git a/components/h2pas/h2pasconvert.pas b/components/h2pas/h2pasconvert.pas
index e4a215b61e..f5f3950cd0 100644
--- a/components/h2pas/h2pasconvert.pas
+++ b/components/h2pas/h2pasconvert.pas
@@ -2726,7 +2726,7 @@ begin
   repeat
     CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
     if CurAtom='' then break;
-    //DebugLn(['TReplaceImplicitTypes.FindNextImplicitType AAA1 ',CurAtom]);
+    //DebugLn(['TReplaceImplicitTypes.FindNextImplicitType atom ',CurAtom]);
     if CurAtom=':' then begin
       // var, const, out declaration
       CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
@@ -4253,8 +4253,8 @@ var
     Identifier:=@Tool.Src[Position+Count];
     AVLNode:=NeededPointerTypes.FindKey(Identifier,
                                         @CompareImplicitTypeStringAndName);
-    DebugLn(['AddNeededPointerType ',GetIdentifier(Identifier),' Position=',Position,' Count=',Count]);
-    DebugLn(['AddNeededPointerType AAA1 ',copy(Tool.Src,Position,100)]);
+    DebugLn(['AddNeededPointerType Identifier ',GetIdentifier(Identifier),' Position=',Position,' Count=',Count]);
+    DebugLn(['AddNeededPointerType Position ',copy(Tool.Src,Position,100)]);
     if AVLNode<>nil then begin
       Item:=TImplicitType(AVLNode.Data);
       if Item.MaxPosition<Count then
diff --git a/lcl/include/speedbutton.inc b/lcl/include/speedbutton.inc
index 85ece3d4aa..be183036af 100644
--- a/lcl/include/speedbutton.inc
+++ b/lcl/include/speedbutton.inc
@@ -543,7 +543,7 @@ begin
   end;
   ClientSize.cx:= PaintRect.Right - PaintRect.Left;
   ClientSize.cy:= PaintRect.Bottom - PaintRect.Top;
-  //debugln(['TCustomSpeedButton.MeasureDraw AAA1 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect)]);
+  //debugln(['TCustomSpeedButton.MeasureDraw Step1 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect)]);
   // compute size of glyph
   GlyphSize := GetGlyphSize(Draw,PaintRect);
   GlyphWidth := GlyphSize.CX;
@@ -551,7 +551,7 @@ begin
     GlyphWidth:=GlyphWidth div NumGlyphs;
   GlyphHeight := GlyphSize.CY;
   HasGlyph:=(GlyphWidth<>0) and (GlyphHeight<>0);
-  //debugln(['TCustomSpeedButton.MeasureDraw AAA2 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight]);
+  //debugln(['TCustomSpeedButton.MeasureDraw Step2 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight]);
 
   // compute size of text
   CurLayout:=BidiAdjustButtonLayout(UseRightToLeftReading, Layout);
@@ -644,7 +644,7 @@ begin
     end;
   end;
 
-  //debugln(['TCustomSpeedButton.MeasureDraw AAA3 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight,' TextSize=',TextSize.cx,'x',TextSize.cy,' S=',S,' M=',M]);
+  //debugln(['TCustomSpeedButton.MeasureDraw Step3 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight,' TextSize=',TextSize.cx,'x',TextSize.cy,' S=',S,' M=',M]);
 
   if Draw then
   begin
diff --git a/packager/packagelinks.pas b/packager/packagelinks.pas
index 16d2dbb120..4f3c362090 100644
--- a/packager/packagelinks.pas
+++ b/packager/packagelinks.pas
@@ -890,8 +890,10 @@ begin
     DebugLn(['TPackageLinks.FindLinkWithDependencyInTree Dependency makes no sense']);
     exit;
   end;
+  {$IFDEF VerbosePkgLinkSameName}
   if CompareText(Dependency.PackageName,'tstver')=0 then
-    debugln(['TPackageLinks.FindLinkWithDependencyInTree AAA1 ',Dependency.AsString(true)]);
+    debugln(['TPackageLinks.FindLinkWithDependencyInTree START ',Dependency.AsString(true)]);
+  {$ENDIF}
   // if there are several fitting the description, use the last used
   // and highest version
   CurNode:=FindLeftMostNode(LinkTree,Dependency.PackageName);