diff --git a/code/nel/include/nel/3d/scene_group.h b/code/nel/include/nel/3d/scene_group.h
index 9b4f8d792..d587f23d9 100644
--- a/code/nel/include/nel/3d/scene_group.h
+++ b/code/nel/include/nel/3d/scene_group.h
@@ -107,7 +107,7 @@ public:
 		bool	Visible;
 
 		/// Precomputed Lighting.
-		// If true (false by default), then the instance don't cast shadow (used by ig_lighter.exe).
+		// If true (false by default), then the instance don't cast shadow (used by ig_lighter).
 		bool	DontCastShadow;
 		// If true (false by default), then the instance's lighting will not be precomputed.
 		bool	AvoidStaticLightPreCompute;
@@ -120,7 +120,7 @@ public:
 		 *	If 0xFF => take Ambient of the sun.
 		 */
 		uint8	LocalAmbientId;
-		/** if true (false by default), the instance don't cast shadow, but ONLY FOR ig_lighter.exe (ig_lighter_lib)
+		/** if true (false by default), the instance don't cast shadow, but ONLY FOR ig_lighter (ig_lighter_lib)
 		 *	(zone_lighter and zone_ig_lighter ignore it).
 		 *	This is a special trick for the "Matis Serre" where the exterior mesh cast shadow in the interior, but
 		 *	is not visible in the interior in realTime because of cluster clipping.... omg :(
diff --git a/code/nel/tools/3d/file_info/main.cpp b/code/nel/tools/3d/file_info/main.cpp
index 4a14a43c9..306a7fc74 100644
--- a/code/nel/tools/3d/file_info/main.cpp
+++ b/code/nel/tools/3d/file_info/main.cpp
@@ -331,9 +331,9 @@ void	displayInfoFileInStream(FILE *logStream, const char *fileName, const set<st
 				fprintf(logStream, "    'StaticLight Not Computed' means the instance has a ASP flag or the ig is not yet lighted\n");
 				fprintf(logStream, "    If lighted, for each instance, the format is 'SunContribution(8Bit) - idLight0;idLight1 (or NOLIGHT) - LocalAmbientId (or GLOBAL_AMBIENT)' \n");
 				fprintf(logStream, "    DCS means the instance don't cast shadow (used in the lighter)\n");
-				fprintf(logStream, "    DCSINT Same but very special for ig_lighter.exe only\n");
-				fprintf(logStream, "    DCSEXT Same but very special for zone_lighter and zone_ig_lighter.exe only\n");
-				fprintf(logStream, "    ASP means the instance AvoidStaticLightPreCompute (used in the lighter.exe)\n");
+				fprintf(logStream, "    DCSINT Same but very special for ig_lighter only\n");
+				fprintf(logStream, "    DCSEXT Same but very special for zone_lighter and zone_ig_lighter only\n");
+				fprintf(logStream, "    ASP means the instance AvoidStaticLightPreCompute (used in the lighter)\n");
 				fprintf(logStream, "  -------------------------------------------------------------\n");
 				uint k;
 				for(k = 0; k < ig._InstancesInfos.size(); ++k)
diff --git a/code/nel/tools/misc/bnp_make/main.cpp b/code/nel/tools/misc/bnp_make/main.cpp
index 48588d6cc..6f0c6a235 100644
--- a/code/nel/tools/misc/bnp_make/main.cpp
+++ b/code/nel/tools/misc/bnp_make/main.cpp
@@ -425,13 +425,13 @@ int main (int nNbArg, char **ppArgs)
 				}
 				else
 				{
-					nlwarning ("ERROR (bnp_make.exe) : can't set current directory to %s", ppArgs[2]);
+					nlwarning ("ERROR (bnp_make) : can't set current directory to %s", ppArgs[2]);
 					return -1;
 				}
 			}
 			else
 			{
-				nlwarning ("ERROR (bnp_make.exe) : can't set current directory to %s", ppArgs[3]);
+				nlwarning ("ERROR (bnp_make) : can't set current directory to %s", ppArgs[3]);
 				return -1;
 			}
 		}
@@ -439,7 +439,7 @@ int main (int nNbArg, char **ppArgs)
 		{
 			if (chdir (ppArgs[2]) == -1)
 			{
-				nlwarning ("ERROR (bnp_make.exe) : can't set current directory to %s", ppArgs[2]);
+				nlwarning ("ERROR (bnp_make) : can't set current directory to %s", ppArgs[2]);
 				return -1;
 			}
 			//getcwd (sCurDir, MAX_PATH);
@@ -476,7 +476,7 @@ int main (int nNbArg, char **ppArgs)
 			}
 			else
 			{
-				nlwarning ("ERROR (bnp_make.exe) : can't set current directory to %s", path.c_str());
+				nlwarning ("ERROR (bnp_make) : can't set current directory to %s", path.c_str());
 				return -1;
 			}
 		}
@@ -522,7 +522,7 @@ int main (int nNbArg, char **ppArgs)
 			}
 			else
 			{
-				nlwarning ("ERROR (bnp_make.exe) : can't set current directory to %s", path.c_str());
+				nlwarning ("ERROR (bnp_make) : can't set current directory to %s", path.c_str());
 				return -1;
 			}
 		}
diff --git a/code/nel/tools/misc/lock/lock.cpp b/code/nel/tools/misc/lock/lock.cpp
index efdda5d73..616095bb6 100644
--- a/code/nel/tools/misc/lock/lock.cpp
+++ b/code/nel/tools/misc/lock/lock.cpp
@@ -25,7 +25,7 @@ int main(int argc, char* argv[])
 {
 	if (argc <3)
 	{
-		printf ("lock.exe [filein] [fleout]\n\t");
+		printf ("lock [filein] [fleout]\n\t");
 	}
 	else
 	{
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 2454b231c..762cee9c7 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -3027,7 +3027,7 @@ void CPatchThread::xDeltaPatch(const string &patch, const string &src, const str
 	}
 
 
-	// Launching xdelta.exe
+	// Launching xdelta
 /*
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp
index 2cc465990..3803462cd 100644
--- a/code/ryzom/server/src/ai_service/commands.cpp
+++ b/code/ryzom/server/src/ai_service/commands.cpp
@@ -1812,7 +1812,8 @@ bool execLoadScript(CStringWriter& stringWriter, vector<string> const& args)
 		NLMISC::CIFile file(NLMISC::CPath::lookup(args[2]));
 		
 		vector<string> lines;
-		while (!file.eof()) {
+		while (!file.eof())
+		{
 			const size_t bufferSize = 4*1024;
 			char buffer[bufferSize];
 			file.getline(buffer, bufferSize);
@@ -1844,7 +1845,8 @@ NLMISC_COMMAND(getInfo,"display returned values of buffered commands","")
 {
 	CLogStringWriter	stringWriter(&log);
 	
-	FOREACHC(strIt, vector<string>, bufferedRetStrings) {
+	FOREACHC(strIt, vector<string>, bufferedRetStrings)
+	{
 		stringWriter.append(*strIt);
 	}
 	
@@ -2995,7 +2997,8 @@ NLMISC_COMMAND(simulateBug, "simulate an old AIS bug; command is one of 'list',
 				initBugSimulationTexts();
 				log.displayNL("Bug simulations");
 				log.displayNL("Id|Description                              |State");
-				for (int i=0; i<bugSimulationCount; ++i) {
+				for (int i=0; i<bugSimulationCount; ++i)
+				{
 					log.displayNL("%02d|%s|%s", i, simulateBugText(i), simulateBugs[i]?"on":"off");
 				}
 				return true;