diff --git a/components/buildintf/packagedependencyintf.pas b/components/buildintf/packagedependencyintf.pas
index 9162d6b7f2..f0aa06444e 100644
--- a/components/buildintf/packagedependencyintf.pas
+++ b/components/buildintf/packagedependencyintf.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils,
   // LazUtils
-  LazFileUtils, LazStringUtils;
+  LazFileUtils;
 
 type
 
@@ -108,12 +108,12 @@ implementation
 
 function IsValidUnitName(AUnitName: String): Boolean;
 begin
-  Result := LazIsValidIdent(AUnitName, True, True);
+  Result := IsValidIdent(AUnitName, True, True);
 end;
 
 function IsValidPkgName(APkgName: String): Boolean;
 begin
-  Result := LazIsValidIdent(APkgName, True, True);
+  Result := IsValidIdent(APkgName, True, True);
 end;
 
 function PackageFileNameIsValid(const AFilename: string): boolean;
diff --git a/components/codetools/codetoolmanager.pas b/components/codetools/codetoolmanager.pas
index 0990112cc3..3213e94199 100644
--- a/components/codetools/codetoolmanager.pas
+++ b/components/codetools/codetoolmanager.pas
@@ -3003,7 +3003,7 @@ begin
   {$ENDIF}
   if (TreeOfPCodeXYPosition=nil) or (TreeOfPCodeXYPosition.Count=0) then
     exit(true);
-  if not LazIsValidIdent(NewIdentifier,True,True) then exit;
+  if not IsValidIdent(NewIdentifier,True,True) then exit;
 
   ClearCurCodeTool;
   SourceChangeCache.Clear;
diff --git a/components/codetools/directorycacher.pas b/components/codetools/directorycacher.pas
index b710ccade4..f7da8cdd22 100644
--- a/components/codetools/directorycacher.pas
+++ b/components/codetools/directorycacher.pas
@@ -726,7 +726,7 @@ begin
     UnitLinkLen:=UnitLinkEnd-UnitLinkStart;
     if UnitLinkLen>0 then begin
       TheUnitName:=copy(UnitLinks,UnitLinkStart,UnitLinkLen);
-      if LazIsValidIdent(TheUnitName,true,true) then begin
+      if IsValidIdent(TheUnitName,true,true) then begin
         UnitLinkStart:=UnitLinkEnd+1;
         UnitLinkEnd:=UnitLinkStart;
         while (UnitLinkEnd<=length(UnitLinks))
@@ -1761,7 +1761,7 @@ begin
             aNameSpace:=NameSpaces;
             NameSpaces:='';
           end;
-          if LazIsValidIdent(aNameSpace,true,true) then begin
+          if IsValidIdent(aNameSpace,true,true) then begin
             aName:=aNameSpace+'.'+AUnitName;
             Result:=FindUnitSourceInCompletePath(aName,InFilename,AnyCase,
               FPCSrcSearchRequiresPPU,'');
diff --git a/components/codetools/ppugraph.pas b/components/codetools/ppugraph.pas
index 326c601772..667684567c 100644
--- a/components/codetools/ppugraph.pas
+++ b/components/codetools/ppugraph.pas
@@ -35,9 +35,9 @@ uses
   dynlibs,
   {$ENDIF}
   // LazUtils
-  LazStringUtils, LazUTF8,
+  LazUTF8, LazFileUtils,
   // Codetools
-  PPUParser, CodeTree, FileProcs, LazFileUtils, BasicCodeTools, CodeGraph,
+  PPUParser, CodeTree, FileProcs, BasicCodeTools, CodeGraph,
   CodeToolManager, CodeToolsStructs;
 
 const
@@ -671,7 +671,7 @@ begin
             System.Delete(GroupName,i,1);
         if (Groupname='') then continue;
         Groupname:=FPCPPUGroupPrefix+LowerCase(Groupname);
-        if (not LazIsValidIdent(Groupname,true,true)) then continue;
+        if (not IsValidIdent(Groupname,true,true)) then continue;
         AddFPCGroup(GroupName,AppendPathDelim(FPCPPUBaseDir)+FileInfo.Name);
       end;
     until FindNextUTF8(FileInfo)<>0;
@@ -700,7 +700,7 @@ begin
       if not FilenameExtIs(Filename,'ppu',true) then continue;
       AUnitName:=ExtractFileNameOnly(Filename);
       Filename:=AppendPathDelim(Directory)+Filename;
-      if not LazIsValidIdent(AUnitName,true,true) then begin
+      if not IsValidIdent(AUnitName,true,true) then begin
         DebugLn(['TPPUGroups.AddFPCGroup NOTE: invalid ppu name: ',Filename]);
         continue;
       end;
diff --git a/components/ideintf/propedits.pp b/components/ideintf/propedits.pp
index 6f62f7d210..a906fbb691 100644
--- a/components/ideintf/propedits.pp
+++ b/components/ideintf/propedits.pp
@@ -37,7 +37,7 @@ uses
   // LazControls
   CheckBoxThemed,
   // LazUtils
-  FileUtil, StringHashList, LazMethodList, LazLoggerBase, LazUtilities, LazStringUtils,
+  FileUtil, StringHashList, LazMethodList, LazLoggerBase, LazUtilities,
   GraphType, FPCAdds, // for StrToQWord in older fpc versions
   // IdeIntf
   ObjInspStrConsts, PropEditUtils, TextTools,
@@ -5485,7 +5485,7 @@ var
 begin
   NewMethodName := GetValue;
   {$IFDEF VerboseMethodPropEdit}
-  debugln(['TMethodPropertyEditor.Edit OldValue="',NewMethodName,'" FromLookupRoot=',(LazIsValidIdent(NewMethodName, True, True) and PropertyHook.MethodFromLookupRoot(GetMethodValue))]);
+  debugln(['TMethodPropertyEditor.Edit OldValue="',NewMethodName,'" FromLookupRoot=',(IsValidIdent(NewMethodName, True, True) and PropertyHook.MethodFromLookupRoot(GetMethodValue))]);
   DumpStack;
   {$ENDIF}
   if IsValidIdent(NewMethodName)
@@ -7017,7 +7017,7 @@ var
 begin
   Result.Code := nil;
   Result.Data := nil;
-  if LazIsValidIdent(aName,true,true) and Assigned(ATypeInfo) then
+  if IsValidIdent(aName,true,true) and Assigned(ATypeInfo) then
   begin
     i := GetHandlerCount(htCreateMethod);
     while GetNextHandlerIndex(htCreateMethod, i) do
diff --git a/components/todolist/todolist.pas b/components/todolist/todolist.pas
index dddcae6c99..a00f5f27bc 100644
--- a/components/todolist/todolist.pas
+++ b/components/todolist/todolist.pas
@@ -66,7 +66,7 @@ uses
   LCLType, LclIntf, Forms, Controls, StdCtrls, Dialogs, ComCtrls,
   ActnList, XMLPropStorage, ExtCtrls,
   // LazUtils
-  LazFileUtils, LazStringUtils, LazFileCache, LazLoggerBase, LazTracer,
+  LazFileUtils, LazFileCache, LazLoggerBase, LazTracer,
   // Codetools
   CodeToolManager, FileProcs,
   // IDEIntf
@@ -389,7 +389,7 @@ begin
   CurOwner:=nil;
   CurProject:=nil;
   CurPkg:=nil;
-  if LazIsValidIdent(IDEItem,true) then begin
+  if IsValidIdent(IDEItem,true,true) then begin
     // package
     CurPkg:=PackageEditingInterface.FindPackageWithName(IDEItem);
     CurOwner:=CurPkg;
diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index 836fa37b06..9fc776a353 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -1847,7 +1847,7 @@ begin
       else
         continue;
       CurUnitName:=ExtractFilenameOnly(CurFilename);
-      if not LazIsValidIdent(CurUnitName) then
+      if not IsValidIdent(CurUnitName) then
         continue;
       //DebugLn(['TBuildManager.CheckUnitPathForAmbiguousPascalFiles ',CurUnitName,' ',CurFilename]);
       // check if unit already found