diff --git a/LibraryVersions.h.cmake b/LibraryVersions.h.cmake
index 66730589ed..df24cba839 100644
--- a/LibraryVersions.h.cmake
+++ b/LibraryVersions.h.cmake
@@ -25,38 +25,37 @@
 // No CMake version info for libarea, Zipios, or KDL
 
 // Coin3D
-constexpr char * FC_COIN3D_VERSION = "${COIN3D_VERSION}";
+constexpr char * fcCoin3dVersion = "${COIN3D_VERSION}";
 
 // Eigen3
-constexpr char * FC_EIGEN3_VERSION = "${EIGEN3_VERSION}";
+constexpr char * fcEigen3Version = "${EIGEN3_VERSION}";
 
 // FreeType
-constexpr char * FC_FREETYPE_VERSION = "${FREETYPE_VERSION_STRING}";
+constexpr char * fcFreetypeVersion = "${FREETYPE_VERSION_STRING}";
 
 // pcl
-constexpr char * FC_PCL_VERSION = "${PCL_VERSION}";
+constexpr char * fcPclVersion = "${PCL_VERSION}";
 
 // PyCXX
-constexpr char * FC_PYCXX_VERSION = "${PYCXX_VERSION}";
+constexpr char * fcPycxxVersion = "${PYCXX_VERSION}";
 
 // PySide
-constexpr char * FC_PYSIDE_VERSION = "${PySide2_VERSION}";
+constexpr char * fcPysideVersion = "${PySide2_VERSION}";
 
 // PyBind
-constexpr char * FC_PYBIND11_VERSION = "${pybind11_VERSION}";
+constexpr char * fcPybind11Version = "${pybind11_VERSION}";
 
 // Shiboken
-constexpr char * FC_SHIBOKEN_VERSION = "${Shiboken2_VERSION}";
+constexpr char * fcShibokenVersion = "${Shiboken2_VERSION}";
 
 // vtk
-constexpr char * FC_VTK_VERSION = "${VTK_VERSION}";
+constexpr char * fcVtkVersion = "${VTK_VERSION}";
 
 // Xerces-C
-constexpr char * FC_XERCESC_VERSION = "${XercesC_VERSION}";
+constexpr char * fcXercescVersion = "${XercesC_VERSION}";
 
 // Pivy
-constexpr char * FC_PIVY_VERSION = "${PIVY_VERSION}";
+constexpr char * fcPivyVersion = "${PIVY_VERSION}";
 
 
 #endif // LIBRARY_VERSIONS_H
-
diff --git a/src/App/Application.cpp b/src/App/Application.cpp
index 47a82cba73..68f1040362 100644
--- a/src/App/Application.cpp
+++ b/src/App/Application.cpp
@@ -2313,20 +2313,20 @@ void processProgramOptions(const variables_map& vm, std::map<std::string,std::st
         if (vm.count("verbose")) {
             str << "\nLibrary versions:\n";
             str << "boost    " << BOOST_LIB_VERSION << '\n';
-            str << "Coin3D   " << FC_COIN3D_VERSION << '\n';
-            str << "Eigen3   " << FC_EIGEN3_VERSION << '\n';
+            str << "Coin3D   " << fcCoin3dVersion << '\n';
+            str << "Eigen3   " << fcEigen3Version << '\n';
 #ifdef OCC_VERSION_STRING_EXT
             str << "OCC      " << OCC_VERSION_STRING_EXT << '\n';
 #endif
             str << "Qt       " << QT_VERSION_STR << '\n';
             str << "Python   " << PY_VERSION << '\n';
-            str << "PySide   " << FC_PYSIDE_VERSION << '\n';
-            str << "shiboken " << FC_SHIBOKEN_VERSION << '\n';
+            str << "PySide   " << fcPysideVersion << '\n';
+            str << "shiboken " << fcShibokenVersion << '\n';
 #ifdef SMESH_VERSION_STR
             str << "SMESH    " << SMESH_VERSION_STR << '\n';
 #endif
-            str << "VTK      " << FC_VTK_VERSION << '\n';
-            str << "xerces-c " << FC_XERCESC_VERSION << '\n';
+            str << "VTK      " << fcVtkVersion << '\n';
+            str << "xerces-c " << fcXercescVersion << '\n';
         }
         throw Base::ProgramInformation(str.str());
     }
@@ -2627,12 +2627,12 @@ void Application::initConfig(int argc, char ** argv)
     mConfig["BOOST_VERSION"] = BOOST_LIB_VERSION;
     mConfig["PYTHON_VERSION"] = PY_VERSION;
     mConfig["QT_VERSION"] = QT_VERSION_STR;
-    mConfig["EIGEN_VERSION"] = FC_EIGEN3_VERSION;
-    mConfig["PYSIDE_VERSION"] = FC_PYSIDE_VERSION;
+    mConfig["EIGEN_VERSION"] = fcEigen3Version;
+    mConfig["PYSIDE_VERSION"] = fcPysideVersion;
 #ifdef SMESH_VERSION_STR
     mConfig["SMESH_VERSION"] = SMESH_VERSION_STR;
 #endif
-    mConfig["XERCESC_VERSION"] = FC_XERCESC_VERSION;
+    mConfig["XERCESC_VERSION"] = fcXercescVersion;
 
 
     logStatus();
diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp
index f0baa1a54c..3e982a4bac 100644
--- a/src/Gui/Splashscreen.cpp
+++ b/src/Gui/Splashscreen.cpp
@@ -535,7 +535,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("Eigen"),
         baseurl + QLatin1String("#_TocEigen"),
         QLatin1String("https://eigen.tuxfamily.org"),
-        QString::fromLatin1(FC_EIGEN3_VERSION)
+        QString::fromLatin1(fcEigen3Version)
     };
 
     // FreeType
@@ -543,7 +543,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("FreeType"),
         baseurl + QLatin1String("#_TocFreeType"),
         QLatin1String("https://freetype.org"),
-        QString::fromLatin1(FC_FREETYPE_VERSION)
+        QString::fromLatin1(fcFreetypeVersion)
     };
 
     // KDL
@@ -577,7 +577,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("Point Cloud Library"),
         baseurl + QLatin1String("#_TocPcl"),
         QLatin1String("https://www.pointclouds.org"),
-        QString::fromLatin1(FC_PCL_VERSION)
+        QString::fromLatin1(fcPclVersion)
     };
 
     // PyCXX
@@ -585,7 +585,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("PyCXX"),
         baseurl + QLatin1String("#_TocPyCXX"),
         QLatin1String("http://cxx.sourceforge.net"),
-        QString::fromLatin1(FC_PYCXX_VERSION)
+        QString::fromLatin1(fcPycxxVersion)
     };
 
     // Python
@@ -601,7 +601,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("Qt for Python (PySide)"),
         baseurl + QLatin1String("#_TocPySide"),
         QLatin1String("https://wiki.qt.io/Qt_for_Python"),
-        QString::fromLatin1(FC_PYSIDE_VERSION)
+        QString::fromLatin1(fcPysideVersion)
     };
 
     // Qt
@@ -629,7 +629,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("Qt for Python (Shiboken)"),
         baseurl + QLatin1String("#_TocPySide"),
         QLatin1String("https://wiki.qt.io/Qt_for_Python"),
-        QString::fromLatin1(FC_SHIBOKEN_VERSION)
+        QString::fromLatin1(fcShibokenVersion)
     };
 
     // vtk
@@ -637,7 +637,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("vtk"),
         baseurl + QLatin1String("#_TocVtk"),
         QLatin1String("https://www.vtk.org"),
-        QString::fromLatin1(FC_VTK_VERSION)
+        QString::fromLatin1(fcVtkVersion)
     };
 
     // Xerces-C
@@ -645,7 +645,7 @@ void AboutDialog::showLibraryInformation()
         QLatin1String("Xerces-C"),
         baseurl + QLatin1String("#_TocXercesC"),
         QLatin1String("https://xerces.apache.org/xerces-c"),
-        QString::fromLatin1(FC_XERCESC_VERSION)
+        QString::fromLatin1(fcXercescVersion)
     };
 
     // Zipios++
@@ -769,7 +769,7 @@ void AboutDialog::on_copyButton_clicked()
     str << "Python " << PY_VERSION << ", ";
     str << "Qt " << QT_VERSION_STR << ", ";
     str << "Coin " << COIN_VERSION << ", ";
-    str << "Vtk " << FC_VTK_VERSION << ", ";
+    str << "Vtk " << fcVtkVersion << ", ";
 #if defined(HAVE_OCC_VERSION)
     str << "OCC "
         << OCC_VERSION_MAJOR << "."