diff --git a/components/codetools/customcodetool.pas b/components/codetools/customcodetool.pas
index 078cd9cde5..4f03b0b05d 100644
--- a/components/codetools/customcodetool.pas
+++ b/components/codetools/customcodetool.pas
@@ -152,9 +152,9 @@ type
     procedure SetScanner(NewScanner: TLinkScanner); virtual;
     procedure DoDeleteNodes(StartNode: TCodeTreeNode); virtual;
     procedure CloseUnfinishedNodes;
-    procedure RaiseIdentExpectedButAtomFound;
-    procedure RaiseBracketOpenExpectedButAtomFound;
-    procedure RaiseBracketCloseExpectedButAtomFound;
+    procedure SaveRaiseIdentExpectedButAtomFound;
+    procedure SaveRaiseBracketOpenExpectedButAtomFound;
+    procedure SaveRaiseBracketCloseExpectedButAtomFound;
     procedure RaiseUndoImpossible;
     procedure SetIgnoreErrorAfter(const AValue: TCodePosition); virtual;
     procedure IncreaseTreeChangeStep(NodesDeleting: boolean);
@@ -866,7 +866,7 @@ end;
 
 procedure TCustomCodeTool.AtomIsIdentifierSaveE;
 
-  procedure RaiseIdentExpectedButEOFFound;
+  procedure SaveRaiseIdentExpectedButEOFFound;
   begin
     SaveRaiseExceptionFmt(ctsIdentExpectedButEOFFound,[GetAtom],true);
   end;
@@ -874,9 +874,9 @@ procedure TCustomCodeTool.AtomIsIdentifierSaveE;
 begin
   if InternalAtomIsIdentifier then exit;
   if CurPos.StartPos>SrcLen then
-    RaiseIdentExpectedButEOFFound
+    SaveRaiseIdentExpectedButEOFFound
   else
-    RaiseIdentExpectedButAtomFound;
+    SaveRaiseIdentExpectedButAtomFound;
 end;
 
 function TCustomCodeTool.AtomIsCustomOperator(AllowIdentifier,
@@ -885,9 +885,9 @@ function TCustomCodeTool.AtomIsCustomOperator(AllowIdentifier,
   procedure RaiseOperatorExpected;
   begin
     if CurPos.StartPos>SrcLen then
-      SaveRaiseExceptionFmt(ctsOperatorExpectedButEOFFound,[GetAtom],true)
+      RaiseExceptionFmt(ctsOperatorExpectedButEOFFound,[GetAtom],true)
     else
-      SaveRaiseExceptionFmt(ctsOperatorExpectedButAtomFound,[GetAtom],true)
+      RaiseExceptionFmt(ctsOperatorExpectedButAtomFound,[GetAtom],true)
   end;
 
 begin
@@ -1929,7 +1929,7 @@ begin
     AntiCloseBracket:=cafRoundBracketClose;
   end else begin
     if ExceptionOnNotFound then
-      RaiseBracketOpenExpectedButAtomFound;
+      SaveRaiseBracketOpenExpectedButAtomFound;
     exit;
   end;
   Start:=CurPos;
@@ -1976,7 +1976,7 @@ begin
     AntiOpenBracket:=cafRoundBracketOpen;
   end else begin
     if ExceptionOnNotFound then
-      RaiseBracketCloseExpectedButAtomFound;
+      SaveRaiseBracketCloseExpectedButAtomFound;
     exit;
   end;
   Start:=CurPos;
@@ -3139,17 +3139,17 @@ begin
   end;
 end;
 
-procedure TCustomCodeTool.RaiseIdentExpectedButAtomFound;
+procedure TCustomCodeTool.SaveRaiseIdentExpectedButAtomFound;
 begin
   SaveRaiseExceptionFmt(ctsIdentExpectedButAtomFound,[GetAtom],true);
 end;
 
-procedure TCustomCodeTool.RaiseBracketOpenExpectedButAtomFound;
+procedure TCustomCodeTool.SaveRaiseBracketOpenExpectedButAtomFound;
 begin
   SaveRaiseExceptionFmt(ctsBracketOpenExpectedButAtomFound,[GetAtom],true);
 end;
 
-procedure TCustomCodeTool.RaiseBracketCloseExpectedButAtomFound;
+procedure TCustomCodeTool.SaveRaiseBracketCloseExpectedButAtomFound;
 begin
   if CurPos.StartPos<SrcLen then
     SaveRaiseExceptionFmt(ctsBracketCloseExpectedButAtomFound,[GetAtom],true)
diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index b9208031a4..30ebc12c1e 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -9161,9 +9161,9 @@ function TFindDeclarationTool.CheckParameterSyntax(CursorNode: TCodeTreeNode;
   procedure RaiseBracketNotOpened;
   begin
     if CurPos.Flag=cafRoundBracketClose then
-      SaveRaiseExceptionFmt(ctsBracketNotFound,['('])
+      RaiseExceptionFmt(ctsBracketNotFound,['('])
     else
-      SaveRaiseExceptionFmt(ctsBracketNotFound,['[']);
+      RaiseExceptionFmt(ctsBracketNotFound,['[']);
   end;
 
   function CheckIdentifierAndParameterList: boolean; forward;
diff --git a/components/codetools/multikeywordlisttool.pas b/components/codetools/multikeywordlisttool.pas
index e539227e3b..6420838fb0 100644
--- a/components/codetools/multikeywordlisttool.pas
+++ b/components/codetools/multikeywordlisttool.pas
@@ -111,7 +111,7 @@ begin
     end;
     inc(i);
   end;
-  SaveRaiseException(
+  RaiseException(
     '[TMultiKeyWordListCodeTool.SetCurKeyWordFuncList] unknown list',true);
 end;
 
diff --git a/components/codetools/pascalparsertool.pas b/components/codetools/pascalparsertool.pas
index 2e38b91d07..4daed76d98 100644
--- a/components/codetools/pascalparsertool.pas
+++ b/components/codetools/pascalparsertool.pas
@@ -1143,7 +1143,7 @@ begin
   end else if not (CurNode.Desc in (AllClassBaseSections+AllClassInterfaces))
   then begin
     //debugln(['TPascalParserTool.KeyWordFuncClassMethod ',CurNode.Parent.DescAsString,' ',CurNode.DescAsString]);
-    RaiseIdentExpectedButAtomFound;
+    SaveRaiseIdentExpectedButAtomFound;
   end;
 
   HasForwardModifier:=false;
@@ -1287,7 +1287,7 @@ begin
         // MacPas '...' VarArgs parameter
         if (Scanner.CompilerMode<>cmMacPas) then begin
           if ExceptionOnError then
-            RaiseIdentExpectedButAtomFound
+            SaveRaiseIdentExpectedButAtomFound
           else
             exit;
         end;
@@ -2163,7 +2163,7 @@ begin
   else if CurPos.Flag=cafEdgedBracketOpen then
     Push(siEdgedBracketOpen)
   else
-    RaiseBracketOpenExpectedButAtomFound;
+    SaveRaiseBracketOpenExpectedButAtomFound;
   try
     repeat
       ReadNextAtom;
@@ -2327,7 +2327,7 @@ begin
     CurNode.EndPos:=CurPos.StartPos;
     EndChildNode;
   end else if not (CurNode.Desc in (AllClassBaseSections+AllClassInterfaces)) then
-    RaiseIdentExpectedButAtomFound;
+    SaveRaiseIdentExpectedButAtomFound;
   // create class method node
   CreateChildNode;
   CurNode.Desc:=ctnProperty;
diff --git a/components/codetools/pascalreadertool.pas b/components/codetools/pascalreadertool.pas
index 1bcc51be3f..cce0680319 100644
--- a/components/codetools/pascalreadertool.pas
+++ b/components/codetools/pascalreadertool.pas
@@ -258,7 +258,7 @@ begin
   Result:=false;
   if CleanPos>SrcLen then exit;
   if CleanCodePosInFront>CleanPos then
-    SaveRaiseException(
+    RaiseException(
       'TPascalReaderTool.CleanPosIsInComment CleanCodePosInFront>CleanPos');
   MoveCursorToCleanPos(CleanCodePosInFront);
   repeat
@@ -908,7 +908,7 @@ begin
   if (ProcNode<>nil) and (ProcNode.Desc in [ctnProcedureType,ctnProcedure]) then
     ProcNode:=ProcNode.FirstChild;
   if (ProcNode=nil) or (ProcNode.Desc<>ctnProcedureHead) then begin
-    SaveRaiseException('Internal Error in'
+    RaiseException('Internal Error in'
       +' TPascalParserTool.MoveCursorFirstProcSpecifier: '
       +' (ProcNode=nil) or (ProcNode.Desc<>ctnProcedure)');
   end;