From 5a07704c653dc666c9b49beb9ac2bd7b9f567ed7 Mon Sep 17 00:00:00 2001
From: Michael Wild <themiwi@users.sourceforge.net>
Date: Sun, 20 Jun 2010 12:34:11 +0200
Subject: [PATCH] No EXECUTABLE_PREFIX for apps, install into libexec instead

Prefix all app names with freefoam- and drop superfluous "Foam" in
application names. Adapt tutorial scripts.

Also put scripts into libexec and dynamically rename.
Use bin/freefoam (based on the old ``foamExec'') as switch-yard instead.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
---
 CMake/Modules/FFAddExecutableToDocIndex.cmake      |   2 +-
 CMake/Modules/FFConfigureFiles.cmake               |  24 ++--
 CMakeLists.txt                                     |  80 ++++++-----
 INSTALL                                            |  17 +--
 INSTALL.html                                       |  85 ++++++------
 ThirdParty/METIS/CMakeLists.txt                    |   2 +-
 ThirdParty/PARMGRIDGEN/IMlib/CMakeLists.txt        |   2 +-
 ThirdParty/PARMGRIDGEN/mgrid/CMakeLists.txt        |   2 +-
 ThirdParty/ParMetis/metis-parmetis/CMakeLists.txt  |   2 +-
 ThirdParty/ParMetis/parmetis/CMakeLists.txt        |   2 +-
 ThirdParty/SCOTCH/CMakeLists.txt                   |   2 +-
 applications/solvers/DNS/dnsFoam/CMakeLists.txt    |   4 +-
 .../solvers/basic/laplacianFoam/CMakeLists.txt     |   4 +-
 .../solvers/basic/potentialFoam/CMakeLists.txt     |   4 +-
 .../basic/scalarTransportFoam/CMakeLists.txt       |   4 +-
 .../solvers/combustion/PDRFoam/CMakeLists.txt      |   4 +-
 .../solvers/combustion/XiFoam/CMakeLists.txt       |   4 +-
 .../combustion/coldEngineFoam/CMakeLists.txt       |   4 +-
 .../combustion/dieselEngineFoam/CMakeLists.txt     |   4 +-
 .../solvers/combustion/dieselFoam/CMakeLists.txt   |   4 +-
 .../solvers/combustion/engineFoam/CMakeLists.txt   |   4 +-
 .../solvers/combustion/fireFoam/CMakeLists.txt     |   4 +-
 .../solvers/combustion/reactingFoam/CMakeLists.txt |   4 +-
 .../combustion/rhoReactingFoam/CMakeLists.txt      |   4 +-
 .../compressible/rhoCentralFoam/BCs/CMakeLists.txt |   2 +-
 .../compressible/rhoCentralFoam/CMakeLists.txt     |   4 +-
 .../rhoCentralDyMFoam/CMakeLists.txt               |   4 +-
 .../compressible/rhoPimpleFoam/CMakeLists.txt      |   4 +-
 .../compressible/rhoPisoFoam/CMakeLists.txt        |   4 +-
 .../rhoPorousMRFPimpleFoam/CMakeLists.txt          |   4 +-
 .../rhoPorousSimpleFoam/CMakeLists.txt             |   4 +-
 .../compressible/rhoSimpleFoam/CMakeLists.txt      |   4 +-
 .../compressible/rhoSonicFoam/CMakeLists.txt       |   4 +-
 .../compressible/rhopSonicFoam/BCs/CMakeLists.txt  |   2 +-
 .../compressible/rhopSonicFoam/CMakeLists.txt      |   4 +-
 .../compressible/sonicDyMFoam/CMakeLists.txt       |   4 +-
 .../solvers/compressible/sonicFoam/CMakeLists.txt  |   4 +-
 .../compressible/sonicLiquidFoam/CMakeLists.txt    |   4 +-
 .../discreteMethods/dsmc/dsmcFoam/CMakeLists.txt   |   4 +-
 .../mdEquilibrationFoam/CMakeLists.txt             |   4 +-
 .../molecularDynamics/mdFoam/CMakeLists.txt        |   4 +-
 .../electrostaticFoam/CMakeLists.txt               |   4 +-
 .../electromagnetics/mhdFoam/CMakeLists.txt        |   4 +-
 .../solvers/financial/financialFoam/CMakeLists.txt |   4 +-
 .../buoyantBoussinesqPisoFoam/CMakeLists.txt       |   4 +-
 .../buoyantBoussinesqSimpleFoam/CMakeLists.txt     |   4 +-
 .../heatTransfer/buoyantPisoFoam/CMakeLists.txt    |   4 +-
 .../heatTransfer/buoyantSimpleFoam/CMakeLists.txt  |   4 +-
 .../buoyantSimpleRadiationFoam/CMakeLists.txt      |   4 +-
 .../heatTransfer/chtMultiRegionFoam/CMakeLists.txt |   4 +-
 .../chtMultiRegionSimpleFoam/CMakeLists.txt        |   4 +-
 .../incompressible/boundaryFoam/CMakeLists.txt     |   4 +-
 .../incompressible/channelFoam/CMakeLists.txt      |   4 +-
 .../solvers/incompressible/icoFoam/CMakeLists.txt  |   4 +-
 .../nonNewtonianIcoFoam/CMakeLists.txt             |   4 +-
 .../incompressible/pimpleDyMFoam/CMakeLists.txt    |   4 +-
 .../incompressible/pimpleFoam/CMakeLists.txt       |   4 +-
 .../solvers/incompressible/pisoFoam/CMakeLists.txt |   4 +-
 .../incompressible/porousSimpleFoam/CMakeLists.txt |   4 +-
 .../incompressible/shallowWaterFoam/CMakeLists.txt |   4 +-
 .../incompressible/simpleFoam/CMakeLists.txt       |   4 +-
 .../lagrangian/coalChemistryFoam/CMakeLists.txt    |   4 +-
 .../CMakeLists.txt                                 |   4 +-
 .../lagrangian/reactingParcelFoam/CMakeLists.txt   |   4 +-
 .../uncoupledKinematicParcelFoam/CMakeLists.txt    |   4 +-
 .../solvers/multiphase/bubbleFoam/CMakeLists.txt   |   4 +-
 .../multiphase/cavitatingFoam/CMakeLists.txt       |   4 +-
 .../compressibleInterDyMFoam/CMakeLists.txt        |   4 +-
 .../compressibleInterFoam/CMakeLists.txt           |   4 +-
 .../solvers/multiphase/interDyMFoam/CMakeLists.txt |   4 +-
 .../solvers/multiphase/interFoam/CMakeLists.txt    |   4 +-
 .../multiphase/interMixingFoam/CMakeLists.txt      |   4 +-
 .../multiphase/interPhaseChangeFoam/CMakeLists.txt |   4 +-
 .../multiphase/multiphaseInterFoam/CMakeLists.txt  |   4 +-
 .../multiphase/porousInterFoam/CMakeLists.txt      |   4 +-
 .../solvers/multiphase/settlingFoam/CMakeLists.txt |   4 +-
 .../multiphase/twoLiquidMixingFoam/CMakeLists.txt  |   4 +-
 .../multiphase/twoPhaseEulerFoam/CMakeLists.txt    |   4 +-
 .../interfacialModels/CMakeLists.txt               |   2 +-
 .../kineticTheoryModels/CMakeLists.txt             |   2 +-
 .../twoPhaseEulerFoam/phaseModel/CMakeLists.txt    |   2 +-
 .../solidDisplacementFoam/CMakeLists.txt           |   4 +-
 .../CMakeLists.txt                                 |   4 +-
 .../estimateScalarError/CMakeLists.txt             |   4 +-
 .../icoErrorEstimate/CMakeLists.txt                |   4 +-
 .../errorEstimation/icoMomentError/CMakeLists.txt  |   4 +-
 .../momentScalarError/CMakeLists.txt               |   4 +-
 .../mesh/advanced/autoRefineMesh/CMakeLists.txt    |   4 +-
 .../mesh/advanced/collapseEdges/CMakeLists.txt     |   4 +-
 .../mesh/advanced/combinePatchFaces/CMakeLists.txt |   4 +-
 .../mesh/advanced/modifyMesh/CMakeLists.txt        |   4 +-
 .../mesh/advanced/refineHexMesh/CMakeLists.txt     |   4 +-
 .../mesh/advanced/refineWallLayer/CMakeLists.txt   |   4 +-
 .../mesh/advanced/refinementLevel/CMakeLists.txt   |   4 +-
 .../mesh/advanced/removeFaces/CMakeLists.txt       |   4 +-
 .../mesh/advanced/selectCells/CMakeLists.txt       |   4 +-
 .../mesh/advanced/splitCells/CMakeLists.txt        |   4 +-
 .../conversion/Optional/ccm26ToFoam/CMakeLists.txt |   4 +-
 .../mesh/conversion/ansysToFoam/CMakeLists.txt     |   4 +-
 .../mesh/conversion/cfx4ToFoam/CMakeLists.txt      |   4 +-
 .../conversion/fluent3DMeshToFoam/CMakeLists.txt   |   4 +-
 .../conversion/fluentMeshToFoam/CMakeLists.txt     |   4 +-
 .../conversion/foamMeshToFluent/CMakeLists.txt     |   4 +-
 .../mesh/conversion/foamToStarMesh/CMakeLists.txt  |   4 +-
 .../mesh/conversion/gambitToFoam/CMakeLists.txt    |   4 +-
 .../mesh/conversion/gmshToFoam/CMakeLists.txt      |   4 +-
 .../mesh/conversion/ideasUnvToFoam/CMakeLists.txt  |   4 +-
 .../mesh/conversion/kivaToFoam/CMakeLists.txt      |   4 +-
 .../mesh/conversion/mshToFoam/CMakeLists.txt       |   4 +-
 .../conversion/netgenNeutralToFoam/CMakeLists.txt  |   4 +-
 .../mesh/conversion/plot3dToFoam/CMakeLists.txt    |   4 +-
 .../mesh/conversion/polyDualMesh/CMakeLists.txt    |   4 +-
 .../mesh/conversion/sammToFoam/CMakeLists.txt      |   4 +-
 .../mesh/conversion/star4ToFoam/CMakeLists.txt     |   4 +-
 .../mesh/conversion/starToFoam/CMakeLists.txt      |   4 +-
 .../mesh/conversion/tetgenToFoam/CMakeLists.txt    |   4 +-
 .../mesh/conversion/writeMeshObj/CMakeLists.txt    |   4 +-
 .../mesh/generation/blockMesh/CMakeLists.txt       |   4 +-
 .../mesh/generation/extrude2DMesh/CMakeLists.txt   |   4 +-
 .../mesh/generation/extrudeMesh/CMakeLists.txt     |   4 +-
 .../extrudeMesh/extrudeModel/CMakeLists.txt        |   2 +-
 .../mesh/generation/snappyHexMesh/CMakeLists.txt   |   4 +-
 .../mesh/manipulation/attachMesh/CMakeLists.txt    |   4 +-
 .../mesh/manipulation/autoPatch/CMakeLists.txt     |   4 +-
 .../mesh/manipulation/cellSet/CMakeLists.txt       |   4 +-
 .../mesh/manipulation/checkMesh/CMakeLists.txt     |   4 +-
 .../mesh/manipulation/createBaffles/CMakeLists.txt |   4 +-
 .../mesh/manipulation/createPatch/CMakeLists.txt   |   4 +-
 .../mesh/manipulation/deformedGeom/CMakeLists.txt  |   4 +-
 .../mesh/manipulation/faceSet/CMakeLists.txt       |   4 +-
 .../mesh/manipulation/flattenMesh/CMakeLists.txt   |   4 +-
 .../mesh/manipulation/insideCells/CMakeLists.txt   |   4 +-
 .../mesh/manipulation/mergeMeshes/CMakeLists.txt   |   4 +-
 .../mergeOrSplitBaffles/CMakeLists.txt             |   4 +-
 .../mesh/manipulation/mirrorMesh/CMakeLists.txt    |   4 +-
 .../manipulation/moveDynamicMesh/CMakeLists.txt    |   4 +-
 .../manipulation/moveEngineMesh/CMakeLists.txt     |   4 +-
 .../mesh/manipulation/moveMesh/CMakeLists.txt      |   4 +-
 .../mesh/manipulation/objToVTK/CMakeLists.txt      |   4 +-
 .../mesh/manipulation/pointSet/CMakeLists.txt      |   4 +-
 .../mesh/manipulation/refineMesh/CMakeLists.txt    |   4 +-
 .../mesh/manipulation/renumberMesh/CMakeLists.txt  |   4 +-
 .../mesh/manipulation/rotateMesh/CMakeLists.txt    |   4 +-
 .../mesh/manipulation/setSet/CMakeLists.txt        |   4 +-
 .../mesh/manipulation/setsToZones/CMakeLists.txt   |   4 +-
 .../mesh/manipulation/splitMesh/CMakeLists.txt     |   4 +-
 .../manipulation/splitMeshRegions/CMakeLists.txt   |   4 +-
 .../mesh/manipulation/stitchMesh/CMakeLists.txt    |   4 +-
 .../mesh/manipulation/subsetMesh/CMakeLists.txt    |   4 +-
 .../manipulation/transformPoints/CMakeLists.txt    |   4 +-
 .../mesh/manipulation/zipUpMesh/CMakeLists.txt     |   4 +-
 .../miscellaneous/expandDictionary/CMakeLists.txt  |   4 +-
 .../miscellaneous/foamDebugSwitches/CMakeLists.txt |   4 +-
 .../miscellaneous/foamFormatConvert/CMakeLists.txt |   4 +-
 .../miscellaneous/foamInfoExec/CMakeLists.txt      |   4 +-
 .../miscellaneous/patchSummary/CMakeLists.txt      |   4 +-
 .../parallelProcessing/decomposePar/CMakeLists.txt |   4 +-
 .../reconstructPar/CMakeLists.txt                  |   4 +-
 .../reconstructParMesh/CMakeLists.txt              |   4 +-
 .../redistributeMeshPar/CMakeLists.txt             |   4 +-
 .../dataConversion/foamDataToFluent/CMakeLists.txt |   4 +-
 .../dataConversion/foamToEnsight/CMakeLists.txt    |   4 +-
 .../foamToEnsightParts/CMakeLists.txt              |   4 +-
 .../dataConversion/foamToFieldview9/CMakeLists.txt |   4 +-
 .../dataConversion/foamToGMV/CMakeLists.txt        |   4 +-
 .../dataConversion/foamToVTK/CMakeLists.txt        |   4 +-
 .../dataConversion/smapToFoam/CMakeLists.txt       |   4 +-
 .../postProcessing/foamCalc/CMakeLists.txt         |   4 +-
 .../lagrangian/particleTracks/CMakeLists.txt       |   4 +-
 .../miscellaneous/dsmcFieldsCalc/CMakeLists.txt    |   4 +-
 .../miscellaneous/engineCompRatio/CMakeLists.txt   |   4 +-
 .../execFlowFunctionObjects/CMakeLists.txt         |   4 +-
 .../miscellaneous/pdfPlot/CMakeLists.txt           |   4 +-
 .../miscellaneous/postChannel/CMakeLists.txt       |   4 +-
 .../miscellaneous/ptot/CMakeLists.txt              |   4 +-
 .../miscellaneous/wdot/CMakeLists.txt              |   4 +-
 .../miscellaneous/writeCellCentres/CMakeLists.txt  |   4 +-
 .../patch/patchAverage/CMakeLists.txt              |   4 +-
 .../patch/patchIntegrate/CMakeLists.txt            |   4 +-
 .../sampling/probeLocations/CMakeLists.txt         |   4 +-
 .../postProcessing/sampling/sample/CMakeLists.txt  |   4 +-
 .../scalarField/pPrime2/CMakeLists.txt             |   4 +-
 .../stressField/stressComponents/CMakeLists.txt    |   4 +-
 .../postProcessing/turbulence/R/CMakeLists.txt     |   4 +-
 .../createTurbulenceFields/CMakeLists.txt          |   4 +-
 .../postProcessing/velocityField/Co/CMakeLists.txt |   4 +-
 .../velocityField/Lambda2/CMakeLists.txt           |   4 +-
 .../velocityField/Mach/CMakeLists.txt              |   4 +-
 .../postProcessing/velocityField/Pe/CMakeLists.txt |   4 +-
 .../postProcessing/velocityField/Q/CMakeLists.txt  |   4 +-
 .../velocityField/enstrophy/CMakeLists.txt         |   4 +-
 .../velocityField/flowType/CMakeLists.txt          |   4 +-
 .../velocityField/streamFunction/CMakeLists.txt    |   4 +-
 .../velocityField/uprime/CMakeLists.txt            |   4 +-
 .../velocityField/vorticity/CMakeLists.txt         |   4 +-
 .../postProcessing/wall/wallGradU/CMakeLists.txt   |   4 +-
 .../wall/wallHeatFlux/CMakeLists.txt               |   4 +-
 .../wall/wallShearStress/CMakeLists.txt            |   4 +-
 .../postProcessing/wall/yPlusLES/CMakeLists.txt    |   4 +-
 .../postProcessing/wall/yPlusRAS/CMakeLists.txt    |   4 +-
 .../applyBoundaryLayer/CMakeLists.txt              |   4 +-
 .../CMakeLists.txt                                 |   4 +-
 .../utilities/preProcessing/boxTurb/CMakeLists.txt |   4 +-
 .../preProcessing/changeDictionary/CMakeLists.txt  |   4 +-
 .../preProcessing/dsmcInitialise/CMakeLists.txt    |   4 +-
 .../preProcessing/engineSwirl/CMakeLists.txt       |   4 +-
 .../foamUpgradeFvSolution/CMakeLists.txt           |   4 +-
 .../preProcessing/mapFields/CMakeLists.txt         |   4 +-
 .../preProcessing/mdInitialise/CMakeLists.txt      |   4 +-
 .../preProcessing/setFields/CMakeLists.txt         |   4 +-
 .../utilities/surface/surfaceAdd/CMakeLists.txt    |   4 +-
 .../surface/surfaceAutoPatch/CMakeLists.txt        |   4 +-
 .../utilities/surface/surfaceCheck/CMakeLists.txt  |   4 +-
 .../utilities/surface/surfaceClean/CMakeLists.txt  |   4 +-
 .../surface/surfaceCoarsen/CMakeLists.txt          |   4 +-
 .../surface/surfaceConvert/CMakeLists.txt          |   4 +-
 .../surface/surfaceFeatureConvert/CMakeLists.txt   |   4 +-
 .../surface/surfaceFeatureExtract/CMakeLists.txt   |   4 +-
 .../utilities/surface/surfaceFind/CMakeLists.txt   |   4 +-
 .../surface/surfaceMeshConvert/CMakeLists.txt      |   4 +-
 .../surfaceMeshConvertTesting/CMakeLists.txt       |   4 +-
 .../surface/surfaceMeshExport/CMakeLists.txt       |   4 +-
 .../surface/surfaceMeshImport/CMakeLists.txt       |   4 +-
 .../surface/surfaceMeshTriangulate/CMakeLists.txt  |   4 +-
 .../utilities/surface/surfaceOrient/CMakeLists.txt |   4 +-
 .../surface/surfacePointMerge/CMakeLists.txt       |   4 +-
 .../surface/surfaceRedistributePar/CMakeLists.txt  |   4 +-
 .../surface/surfaceRefineRedGreen/CMakeLists.txt   |   4 +-
 .../utilities/surface/surfaceSmooth/CMakeLists.txt |   4 +-
 .../surface/surfaceSplitByPatch/CMakeLists.txt     |   4 +-
 .../surfaceSplitNonManifolds/CMakeLists.txt        |   4 +-
 .../utilities/surface/surfaceSubset/CMakeLists.txt |   4 +-
 .../surface/surfaceToPatch/CMakeLists.txt          |   4 +-
 .../surface/surfaceTransformPoints/CMakeLists.txt  |   4 +-
 .../IFCLookUpTableGen/CMakeLists.txt               |   4 +-
 .../thermophysical/adiabaticFlameT/CMakeLists.txt  |   4 +-
 .../thermophysical/chemkinToFoam/CMakeLists.txt    |   4 +-
 .../thermophysical/equilibriumCO/CMakeLists.txt    |   4 +-
 .../equilibriumFlameT/CMakeLists.txt               |   4 +-
 .../mixtureAdiabaticFlameT/CMakeLists.txt          |   4 +-
 bin/CMakeLists.txt                                 |  43 +++---
 bin/{foamClearPolyMesh => freefoam-clearPolyMesh}  |   0
 bin/{foamCopySettings => freefoam-copySettings}    |   0
 bin/{foamGraphExecTime => freefoam-graphExecTime}  |   0
 bin/{foamGraphResKE => freefoam-graphResKE}        |   0
 bin/{foamGraphResUVWP => freefoam-graphResUVWP}    |   0
 bin/{foamJob.in => freefoam-job.in}                |  30 ++---
 bin/{foamLog.in => freefoam-log.in}                |   0
 bin/{paraFoam.in => freefoam-para.in}              |   0
 bin/{foamSolverSweeps => freefoam-solverSweeps}    |   0
 bin/freefoam.in                                    | 148 +++++++++++++++++++++
 data/shellFunctions/RunFunctions.in                |   4 +-
 data/shellFunctions/doxyToAsciidoc.awk             |   2 +-
 src/ODE/CMakeLists.txt                             |   2 +-
 src/OSspecific/POSIX/CMakeLists.txt                |   2 +-
 src/OpenFOAM/CMakeLists.txt                        |   2 +-
 src/Pstream/dummy/CMakeLists.txt                   |   2 +-
 src/Pstream/mpi/CMakeLists.txt                     |   2 +-
 src/autoMesh/CMakeLists.txt                        |   2 +-
 src/conversion/CMakeLists.txt                      |   2 +-
 .../decompositionMethods/CMakeLists.txt            |   2 +-
 .../parMetisDecomp/CMakeLists.txt                  |   2 +-
 src/dynamicFvMesh/CMakeLists.txt                   |   2 +-
 src/dynamicMesh/CMakeLists.txt                     |   2 +-
 src/edgeMesh/CMakeLists.txt                        |   2 +-
 src/engine/CMakeLists.txt                          |   2 +-
 src/errorEstimation/CMakeLists.txt                 |   2 +-
 src/finiteVolume/CMakeLists.txt                    |   2 +-
 .../MGridGenGamgAgglomeration/CMakeLists.txt       |   2 +-
 src/fvMotionSolver/CMakeLists.txt                  |   2 +-
 src/lagrangian/basic/CMakeLists.txt                |   2 +-
 src/lagrangian/coalCombustion/CMakeLists.txt       |   2 +-
 src/lagrangian/dieselSpray/CMakeLists.txt          |   2 +-
 src/lagrangian/dsmc/CMakeLists.txt                 |   2 +-
 src/lagrangian/intermediate/CMakeLists.txt         |   2 +-
 .../molecularMeasurements/CMakeLists.txt           |   2 +-
 .../molecularDynamics/molecule/CMakeLists.txt      |   2 +-
 .../molecularDynamics/potential/CMakeLists.txt     |   2 +-
 src/lagrangian/solidParticle/CMakeLists.txt        |   2 +-
 src/meshTools/CMakeLists.txt                       |   2 +-
 .../foamCalcFunctions/CMakeLists.txt               |   2 +-
 .../functionObjects/IO/CMakeLists.txt              |   2 +-
 .../functionObjects/field/CMakeLists.txt           |   2 +-
 .../functionObjects/forces/CMakeLists.txt          |   2 +-
 .../functionObjects/systemCall/CMakeLists.txt      |   2 +-
 .../functionObjects/utilities/CMakeLists.txt       |   2 +-
 src/postProcessing/postCalc/CMakeLists.txt         |   2 +-
 src/randomProcesses/CMakeLists.txt                 |   2 +-
 src/sampling/CMakeLists.txt                        |   2 +-
 src/surfMesh/CMakeLists.txt                        |   2 +-
 .../barotropicCompressibilityModel/CMakeLists.txt  |   2 +-
 src/thermophysicalModels/basic/CMakeLists.txt      |   2 +-
 .../chemistryModel/CMakeLists.txt                  |   2 +-
 .../laminarFlameSpeed/CMakeLists.txt               |   2 +-
 .../liquidMixture/CMakeLists.txt                   |   2 +-
 src/thermophysicalModels/liquids/CMakeLists.txt    |   2 +-
 src/thermophysicalModels/pdfs/CMakeLists.txt       |   2 +-
 src/thermophysicalModels/radiation/CMakeLists.txt  |   2 +-
 .../reactionThermo/CMakeLists.txt                  |   2 +-
 .../solidMixture/CMakeLists.txt                    |   2 +-
 src/thermophysicalModels/solids/CMakeLists.txt     |   2 +-
 src/thermophysicalModels/specie/CMakeLists.txt     |   2 +-
 .../thermophysicalFunctions/CMakeLists.txt         |   2 +-
 src/topoChangerFvMesh/CMakeLists.txt               |   2 +-
 src/transportModels/incompressible/CMakeLists.txt  |   2 +-
 .../interfaceProperties/CMakeLists.txt             |   2 +-
 src/triSurface/CMakeLists.txt                      |   2 +-
 src/turbulenceModels/LES/LESdeltas/CMakeLists.txt  |   2 +-
 src/turbulenceModels/LES/LESfilters/CMakeLists.txt |   2 +-
 .../compressible/LES/CMakeLists.txt                |   2 +-
 .../compressible/RAS/CMakeLists.txt                |   2 +-
 .../compressible/turbulenceModel/CMakeLists.txt    |   2 +-
 .../incompressible/LES/CMakeLists.txt              |   2 +-
 .../incompressible/RAS/CMakeLists.txt              |   2 +-
 .../incompressible/turbulenceModel/CMakeLists.txt  |   2 +-
 tutorials/DNS/dnsFoam/boxTurb16/Allrun.in          |   2 +-
 tutorials/XiFoam/moriyoshiHomogeneous/Allrun.in    |   8 ++
 tutorials/basic/laplacianFoam/flange/Allrun.in     |   2 +-
 tutorials/basic/potentialFoam/cylinder/Allrun.in   |   2 +-
 tutorials/basic/potentialFoam/pitzDaily/Allrun.in  |   2 +-
 .../basic/scalarTransportFoam/pitzDaily/Allrun.in  |   2 +-
 .../combustion/XiFoam/les/pitzDaily/Allrun.in      |   2 +-
 .../combustion/XiFoam/les/pitzDaily3D/Allrun.in    |   2 +-
 tutorials/combustion/XiFoam/ras/Allrun.in          |  18 +--
 .../combustion/dieselFoam/aachenBomb/Allrun.in     |   2 +-
 tutorials/combustion/engineFoam/kivaTest/Allrun.in |   2 +-
 .../fireFoam/les/smallPoolFire2D/Allrun.in         |   2 +-
 .../reactingFoam/ras/counterFlowFlame2D/Allrun.in  |   2 +-
 tutorials/compressible/rhoCentralFoam/Allrun.in    |   6 +-
 .../rhoCentralFoam/obliqueShock}/Allrun.in         |   2 +-
 .../rhoCentralFoam/shockTube}/Allrun.in            |   2 +-
 .../rhoCentralFoam/wedge15Ma5}/Allrun.in           |   2 +-
 .../rhoPimpleFoam/angledDuct/Allrun.in             |   2 +-
 .../rhoPisoFoam/les/pitzDaily/Allrun.in            |   2 +-
 .../compressible/rhoPisoFoam/ras/cavity/Allrun.in  |   2 +-
 .../rhoPorousMRFPimpleFoam/mixerVessel2D/Allrun.in |   2 +-
 .../angledDuctExplicit/Allrun.in                   |   2 +-
 .../angledDuctImplicit/Allrun.in                   |   2 +-
 .../rhoSonicFoam/forwardStep/Allrun.in             |   2 +-
 .../compressible/rhoSonicFoam/shockTube/Allrun.in  |   2 +-
 .../compressible/rhopSonicFoam/shockTube/Allrun.in |   2 +-
 .../rhopSonicFoam/wedge15Ma5/Allrun.in             |   2 +-
 .../sonicFoam/laminar/forwardStep/Allrun.in        |   2 +-
 .../sonicFoam/laminar/shockTube/Allrun.in          |   4 +-
 .../sonicFoam/ras/nacaAirfoil/Allrun.in            |   2 +-
 .../compressible/sonicFoam/ras/prism/Allrun.in     |   2 +-
 tutorials/compressible/sonicLiquidFoam/Allrun.in   |   2 +-
 .../sonicLiquidFoam/decompressionTank}/Allrun.in   |   2 +-
 .../dsmcFoam/freeSpacePeriodic/Allrun.in           |   2 +-
 .../dsmcFoam/freeSpaceStream/Allrun.in             |   2 +-
 .../dsmcFoam/supersonicCorner/Allrun.in            |   2 +-
 .../discreteMethods/dsmcFoam/wedge15Ma5/Allrun.in  |   2 +-
 .../mdEquilibrationFoam/Allrun.in                  |   2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/Allrun.in  |   2 +-
 .../electrostaticFoam/chargedWire/Allrun.in        |   2 +-
 tutorials/electromagnetics/mhdFoam/Allrun.in       |   4 +-
 .../financial/financialFoam/europeanCall/Allrun.in |   2 +-
 .../buoyantBoussinesqPisoFoam/hotRoom/Allrun.in    |   2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/Allrun.in  |   2 +-
 .../iglooWithFridges/Allrun.in                     |   2 +-
 .../heatTransfer/buoyantPisoFoam/hotRoom/Allrun.in |   2 +-
 .../buoyantSimpleFoam/hotRoom/Allrun.in            |   2 +-
 .../hotRadiationRoom/Allrun.in                     |   2 +-
 .../hotRadiationRoomFvDOM/Allrun.in                |   2 +-
 .../chtMultiRegionFoam/multiRegionHeater/Allrun.in |   6 +-
 .../snappyMultiRegionHeater/Allrun.in              |   6 +-
 .../multiRegionHeater/Allrun.in                    |   6 +-
 .../MRFSimpleFoam/MRFSimpleFoam/CMakeLists.txt.in  |   4 +-
 .../MRFSimpleFoam/mixerVessel2D/Allrun.in          |   3 +-
 .../boundaryFoam/boundaryLaunderSharma/Allrun.in   |   2 +-
 .../boundaryFoam/boundaryWallFunctions/Allrun.in   |   2 +-
 .../channelFoam/channel395/Allrun.in               |   2 +-
 tutorials/incompressible/icoFoam/Allrun.in         |   2 +-
 .../icoFoam/cavityGrade}/Allrun.in                 |   2 +-
 .../icoFoam/elbow}/Allrun.in                       |   2 +-
 .../nonNewtonianIcoFoam/offsetCylinder/Allrun.in   |   2 +-
 .../pimpleDyMFoam/movingCone/Allrun.in             |   2 +-
 .../pimpleDyMFoam/wingMotion/Allrun.in             |   4 +-
 .../incompressible/pimpleFoam/t-junction/Allrun.in |   2 +-
 .../pisoFoam/les/pitzDaily/Allrun.in               |   2 +-
 .../pisoFoam/les/pitzDailyDirectMapped/Allrun.in   |   2 +-
 .../incompressible/pisoFoam/ras/cavity/Allrun.in   |   2 +-
 .../porousSimpleFoam/angledDuctExplicit/Allrun.in  |   2 +-
 .../porousSimpleFoam/angledDuctImplicit/Allrun.in  |   2 +-
 .../shallowWaterFoam/squareBump/Allrun.in          |   2 +-
 .../incompressible/simpleFoam/airFoil2D/Allrun.in  |   2 +-
 .../incompressible/simpleFoam/motorBike/Allrun.in  |   2 +-
 .../incompressible/simpleFoam/pitzDaily/Allrun.in  |   2 +-
 .../simpleFoam/pitzDailyExptInlet/Allrun.in        |   2 +-
 .../incompressible/simpleSRFFoam/mixer/Allrun.in   |   5 +-
 .../simpleSRFFoam/simpleSRFFoam/CMakeLists.txt.in  |   4 +-
 .../coalChemistryFoam/simplifiedSiwek/Allrun.in    |   2 +-
 .../filter/Allrun.in                               |   2 +-
 .../parcelInBox/Allrun.in                          |   2 +-
 .../verticalChannel/Allrun.in                      |   6 +-
 .../reactingParcelFoam/evaporationTest/Allrun.in   |   2 +-
 .../rhoPisoTwinParcelFoam/CMakeLists.txt.in        |   4 +-
 .../simplifiedSiwek/Allrun.in                      |   5 +-
 .../multiphase/bubbleFoam/bubbleColumn/Allrun.in   |   2 +-
 tutorials/multiphase/cavitatingFoam/les/Allrun.in  |   2 +-
 .../cavitatingFoam/les/throttle}/Allrun.in         |   2 +-
 .../cavitatingFoam/les/throttle3D}/Allrun.in       |   2 +-
 .../cavitatingFoam/ras/throttle/Allrun.in          |   2 +-
 .../les/depthCharge2D/Allrun.in                    |   2 +-
 .../les/depthCharge3D/Allrun.in                    |   2 +-
 .../ras/damBreakWithObstacle/Allrun.in             |   2 +-
 .../interDyMFoam/ras/floatingObject/Allrun.in      |   2 +-
 .../interDyMFoam/ras/sloshingTank2D/Allrun.in      |   2 +-
 .../interDyMFoam/ras/sloshingTank2D3DoF/Allrun.in  |   2 +-
 .../interDyMFoam/ras/sloshingTank3D/Allrun.in      |   2 +-
 .../interDyMFoam/ras/sloshingTank3D3DoF/Allrun.in  |   2 +-
 .../interDyMFoam/ras/sloshingTank3D6DoF/Allrun.in  |   2 +-
 .../MRFInterFoam/MRFInterFoam/CMakeLists.txt.in    |   5 +-
 .../interFoam/MRFInterFoam/mixerVessel2D/Allrun.in |   5 +-
 tutorials/multiphase/interFoam/laminar/Allrun.in   |   2 +-
 .../interFoam/laminar/damBreak}/Allrun.in          |   2 +-
 .../interFoam/les/nozzleFlow2D/Allrun.in           |   2 +-
 tutorials/multiphase/interFoam/ras/Allrun.in       |   2 +-
 .../interMixingFoam/laminar/damBreak/Allrun.in     |   2 +-
 .../cavitatingBullet/Allrun.in                     |   2 +-
 .../laminar/damBreak4phase/Allrun.in               |   2 +-
 .../laminar/damBreak4phaseFine/Allrun.in           |   2 +-
 .../multiphase/settlingFoam/ras/dahl/Allrun.in     |   2 +-
 .../multiphase/settlingFoam/ras/tank3D/Allrun.in   |   2 +-
 .../multiphase/twoPhaseEulerFoam/bed/Allrun.in     |   2 +-
 .../multiphase/twoPhaseEulerFoam/bed2/Allrun.in    |   2 +-
 .../twoPhaseEulerFoam/bubbleColumn/Allrun.in       |   2 +-
 .../solidDisplacementFoam/plateHole/Allrun.in      |   2 +-
 .../beamEndLoad/Allrun.in                          |   2 +-
 429 files changed, 964 insertions(+), 806 deletions(-)
 rename bin/{foamClearPolyMesh => freefoam-clearPolyMesh} (100%)
 rename bin/{foamCopySettings => freefoam-copySettings} (100%)
 rename bin/{foamGraphExecTime => freefoam-graphExecTime} (100%)
 rename bin/{foamGraphResKE => freefoam-graphResKE} (100%)
 rename bin/{foamGraphResUVWP => freefoam-graphResUVWP} (100%)
 rename bin/{foamJob.in => freefoam-job.in} (87%)
 rename bin/{foamLog.in => freefoam-log.in} (100%)
 rename bin/{paraFoam.in => freefoam-para.in} (100%)
 rename bin/{foamSolverSweeps => freefoam-solverSweeps} (100%)
 create mode 100755 bin/freefoam.in
 create mode 100755 tutorials/XiFoam/moriyoshiHomogeneous/Allrun.in
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => compressible/rhoCentralFoam/obliqueShock}/Allrun.in (94%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => compressible/rhoCentralFoam/shockTube}/Allrun.in (94%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => compressible/rhoCentralFoam/wedge15Ma5}/Allrun.in (94%)
 copy tutorials/{combustion/dieselFoam/aachenBomb => compressible/sonicLiquidFoam/decompressionTank}/Allrun.in (93%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => incompressible/icoFoam/cavityGrade}/Allrun.in (94%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => incompressible/icoFoam/elbow}/Allrun.in (94%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => multiphase/cavitatingFoam/les/throttle}/Allrun.in (94%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => multiphase/cavitatingFoam/les/throttle3D}/Allrun.in (94%)
 copy tutorials/{combustion/XiFoam/les/pitzDaily3D => multiphase/interFoam/laminar/damBreak}/Allrun.in (94%)

diff --git a/CMake/Modules/FFAddExecutableToDocIndex.cmake b/CMake/Modules/FFAddExecutableToDocIndex.cmake
index a17ca8ce5..90f978c3d 100644
--- a/CMake/Modules/FFAddExecutableToDocIndex.cmake
+++ b/CMake/Modules/FFAddExecutableToDocIndex.cmake
@@ -59,7 +59,7 @@ function( FF_ADD_EXECUTABLE_TO_DOC_INDEX TARGET SOURCE )
   get_filename_component( f ${SOURCE} NAME_WE )
   set( files "\"${f}_8C.html\" \"${f}_8C-source.html\"" )
   set( __FF_ADD_EXECUTABLE_TO_DOC_INDEX_targets
-    ${__FF_ADD_EXECUTABLE_TO_DOC_INDEX_targets} "${EXECUTABLE_PREFIX}${TARGET} (${files})"
+    ${__FF_ADD_EXECUTABLE_TO_DOC_INDEX_targets} "${TARGET} (${files})"
     CACHE INTERNAL "Files to include in the documentation index"
     FORCE
     )
diff --git a/CMake/Modules/FFConfigureFiles.cmake b/CMake/Modules/FFConfigureFiles.cmake
index 13855a458..32f81d8b1 100644
--- a/CMake/Modules/FFConfigureFiles.cmake
+++ b/CMake/Modules/FFConfigureFiles.cmake
@@ -70,15 +70,11 @@
 # - FF_LIB_DIR:
 #   - build tree: ${CMAKE_BINARY_DIR}/lib/FreeFOAM-${FF_VERSION_FULL}
 #   - install tree: ${FF_INSTALL_LIB_PATH}
-# - FF_FRAMEWORK_DIR:
-#   - build tree: ${CMAKE_BINARY_DIR}/Library/Frameworks
-#   - install tree: ${FF_INSTALL_FRAMEWORK_PATH}
-# - FF_PV3FOAMREADER_DIR:
-#    - build tree: ${FF_LIB_DIR}/plugins/PV3FoamReader
-#    - install tree: ${FF_INSTALL_PV3FOAMREADER_PATH}
-# - FF_INCLUDE_DIR:
-#   - build tree: ${CMAKE_BINARY_DIR}/include
-#   - install tree: ${FF_INSTALL_HEADER_PATH}
+# - FF_LIBEXEC_BASE_DIR:
+#   - build tree: ${CMAKE_BINARY_DIR}/libexec/FreeFOAM
+#   - install tree: ${FF_INSTALL_LIBEXEC_BASE_PATH}
+# - FF_LIBEXEC_DIR:
+#   ${FF_LIBEXEC_BASE_DIR}/${FF_VERSION_FULL}
 # - FF_CONFIG_DIR:
 #   - build tree: ${CMAKE_BINARY_DIR}/etc
 #   - install tree: ${FF_INSTALL_CONFIG_PATH}
@@ -125,9 +121,8 @@ macro( FF_CONFIGURE_FILES _buildFilesVar _installFilesVar _destDir )
       # configure the script for build tree
       set( FF_BIN_DIR ${CMAKE_BINARY_DIR}/bin )
       set( FF_LIB_DIR ${FF_LIBRARY_OUTPUT_DIRECTORY} )
-      set( FF_FRAMEWORK_DIR "${FF_FRAMEWORK_OUTPUT_DIRECTORY}" )
-      set( FF_PV3FOAMREADER_DIR "${FF_BIN_DIR}/plugins/PV3FoamReader" )
-      set( FF_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include" )
+      set( FF_LIBEXEC_BASE_DIR ${CMAKE_BINARY_DIR}/libexec/FreeFOAM )
+      set( FF_LIBEXEC_DIR ${FF_LIBEXEC_BASE_DIR}/${FF_VERSION_FULL} )
       set( FF_DATA_DIR ${CMAKE_BINARY_DIR}/data )
       set( FF_LOCAL_DOC_DIR ${CMAKE_BINARY_DIR}/doc )
       if( FF_USE_LOCAL_DOXYGEN_DOCS )
@@ -144,9 +139,8 @@ macro( FF_CONFIGURE_FILES _buildFilesVar _installFilesVar _destDir )
         # configure the script for install tree
         set( FF_BIN_DIR ${FF_INSTALL_BIN_PATH} )
         set( FF_LIB_DIR ${FF_INSTALL_LIB_PATH} )
-        set( FF_FRAMEWORK_DIR "${FF_INSTALL_FRAMEWORK_PATH}" )
-        set( FF_PV3FOAMREADER_DIR "${FF_INSTALL_PV3FOAMREADER_PATH}" )
-        set( FF_INCLUDE_DIR "${FF_INSTALL_HEADER_PATH}" )
+        set( FF_LIBEXEC_BASE_DIR ${FF_INSTALL_LIBEXEC_BASE_PATH} )
+        set( FF_LIBEXEC_DIR ${FF_LIBEXEC_BASE_DIR}/${FF_VERSION_FULL} )
         set( FF_DATA_DIR ${FF_INSTALL_DATA_PATH} )
         set( FF_LOCAL_DOC_DIR ${FF_INSTALL_DOC_PATH} )
         if( FF_USE_LOCAL_DOXYGEN_DOCS )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b526fca7..f85027ab3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,35 +68,51 @@ mark_as_advanced( FF_BUILD_FRAMEWORK )
 # we want shared libraries
 set( BUILD_SHARED_LIBS SHARED )
 
-# use a prefix for executables
-set (EXECUTABLE_PREFIX "ff_" CACHE STRING "Prefix prepended to all program and script names")
-mark_as_advanced( EXECUTABLE_PREFIX )
-string( TOUPPER "${EXECUTABLE_PREFIX}" EXECUTABLE_PREFIX_UPPER )
-
 # installation directories
-set( FF_INSTALL_BIN_PATH bin CACHE STRING "Executables installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_BIN_PATH bin CACHE STRING
+  "Executables installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
 if( APPLE AND FF_BUILD_FRAMEWORK )
-  set( FF_INSTALL_FRAMEWORK_PATH /Library/Frameworks CACHE STRING "Framework installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+  set( FF_INSTALL_FRAMEWORK_PATH /Library/Frameworks CACHE STRING
+    "Framework installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
 endif( APPLE AND FF_BUILD_FRAMEWORK )
-set( FF_INSTALL_LIB_PATH lib/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE STRING "Library installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_HEADER_PATH include/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE STRING "Header installation path (absolute or relative to CMAKE_INSTALL_PREFIX, not for frameworks)" )
-set( FF_INSTALL_CONFIG_PATH etc/${CMAKE_PROJECT_NAME}/${FF_VERSION_FULL} CACHE STRING "Configuration files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_DATA_PATH share/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE STRING "Data files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_DOC_PATH share/doc/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE STRING "Documentation files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_MAN_PATH share/man CACHE STRING "Man-pages installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_TUTORIALS_PATH ${FF_INSTALL_DOC_PATH} CACHE STRING "Tutorials installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_CMAKE_PATH ${FF_INSTALL_DATA_PATH}/CMake CACHE STRING "CMake configuration files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
-set( FF_INSTALL_PVFOAMREADER_PATH ${FF_INSTALL_LIB_PATH}/plugins/PVFoamReader CACHE STRING "ParaView2 OpenFOAM-reader plugin installation path" )
-set( FF_INSTALL_PV3FOAMREADER_PATH ${FF_INSTALL_LIB_PATH}/plugins/PV3FoamReader CACHE STRING "ParaView3 OpenFOAM-reader plugin installation path" )
-set( FF_INSTALL_USERDFOAM_PATH ${FF_INSTALL_LIB_PATH}/plugins/userd-foam CACHE STRING "Ensight OpenFOAM-reader plugin installation path" )
-mark_as_advanced( FF_INSTALL_BIN_PATH FF_INSTALL_FRAMEWORK_PATH FF_INSTALL_LIB_PATH FF_INSTALL_HEADER_PATH
-  FF_INSTALL_CONFIG_PATH FF_INSTALL_DATA_PATH FF_INSTALL_MAN_PATH FF_INSTALL_DOC_PATH FF_INSTALL_TUTORIALS_PATH
-  FF_INSTALL_CMAKE_PATH FF_INSTALL_PVFOAMREADER_PATH FF_INSTALL_PV3FOAMREADER_PATH FF_INSTALL_USERDFOAM_PATH )
+set( FF_INSTALL_LIB_PATH lib/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE
+  STRING "Library installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_LIBEXEC_BASE_PATH libexec/${CMAKE_PROJECT_NAME} CACHE STRING
+  "Installation path for executables not on PATH (absolute or relative to CMAKE_INSTALL_PREFIX). The ${CMAKE_PROJECT_NAME} version number will be appended as a sub-directory." )
+set( FF_INSTALL_LIBEXEC_PATH ${FF_INSTALL_LIBEXEC_BASE_PATH}/${FF_VERSION_FULL} )
+set( FF_INSTALL_HEADER_PATH include/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}
+  CACHE STRING "Header installation path (absolute or relative to CMAKE_INSTALL_PREFIX, not for frameworks)" )
+set( FF_INSTALL_CONFIG_PATH etc/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE
+  STRING "Configuration files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_DATA_PATH share/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL} CACHE
+  STRING "Data files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_DOC_PATH share/doc/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}
+  CACHE STRING "Documentation files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_MAN_PATH share/man CACHE STRING
+  "Man-pages installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_TUTORIALS_PATH share/doc/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}
+  CACHE STRING "Tutorials installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_CMAKE_PATH share/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}/CMake
+  CACHE STRING "CMake configuration files installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" )
+set( FF_INSTALL_PVFOAMREADER_PATH lib/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}/plugins/PVFoamReader
+  CACHE STRING "ParaView2 OpenFOAM-reader plugin installation path" )
+set( FF_INSTALL_PV3FOAMREADER_PATH lib/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}/plugins/PV3FoamReader
+  CACHE STRING "ParaView3 OpenFOAM-reader plugin installation path" )
+set( FF_INSTALL_USERDFOAM_PATH lib/${CMAKE_PROJECT_NAME}-${FF_VERSION_FULL}/plugins/userd-foam
+  CACHE STRING "Ensight OpenFOAM-reader plugin installation path" )
+mark_as_advanced( FF_INSTALL_BIN_PATH FF_INSTALL_FRAMEWORK_PATH
+  FF_INSTALL_LIB_PATH  FF_INSTALL_LIBEXEC_BASE_PATH FF_INSTALL_LIBEXEC_PATH
+  FF_INSTALL_HEADER_PATH FF_INSTALL_CONFIG_PATH FF_INSTALL_DATA_PATH
+  FF_INSTALL_MAN_PATH FF_INSTALL_DOC_PATH FF_INSTALL_TUTORIALS_PATH
+  FF_INSTALL_CMAKE_PATH FF_INSTALL_PVFOAMREADER_PATH
+  FF_INSTALL_PV3FOAMREADER_PATH FF_INSTALL_USERDFOAM_PATH )
 
 # make absolute paths
-foreach( _p FF_INSTALL_BIN_PATH FF_INSTALL_LIB_PATH FF_INSTALL_FRAMEWORK_PATH
-    FF_INSTALL_HEADER_PATH FF_INSTALL_CONFIG_PATH FF_INSTALL_DATA_PATH FF_INSTALL_DOC_PATH
-    FF_INSTALL_MAN_PATH FF_INSTALL_TUTORIALS_PATH FF_INSTALL_CMAKE_PATH )
+foreach( _p FF_INSTALL_BIN_PATH FF_INSTALL_LIB_PATH
+    FF_INSTALL_LIBEXEC_BASE_PATH FF_INSTALL_LIBEXEC_PATH
+    FF_INSTALL_FRAMEWORK_PATH FF_INSTALL_HEADER_PATH FF_INSTALL_CONFIG_PATH
+    FF_INSTALL_DATA_PATH FF_INSTALL_DOC_PATH FF_INSTALL_MAN_PATH
+    FF_INSTALL_TUTORIALS_PATH FF_INSTALL_CMAKE_PATH )
   if( NOT IS_ABSOLUTE ${${_p}} )
     set( ${_p} "${CMAKE_INSTALL_PREFIX}/${${_p}}" )
   endif( NOT IS_ABSOLUTE ${${_p}} )
@@ -120,7 +136,8 @@ foreach( browser open gnome-open kde-open x-www-browser www-browser
   endif( HTML_DOC_BROWSER )
 endforeach( browser )
 if( NOT HTML_DOC_BROWSER )
-  message( STATUS "Failed to find a program to open HTML pages with (a.k.a a browser). Point HTML_DOC_BROWSER to a suitable program." )
+  message( STATUS
+    "Failed to find a program to open HTML pages with (a.k.a a browser). Point HTML_DOC_BROWSER to a suitable program." )
   set( HTML_DOC_BROWSER "ECHO" CACHE STRING "Command to open an HTML file (ECHO will print it to STDOUT)" FORCE )
 endif( NOT HTML_DOC_BROWSER )
 set( FF_HTML_DOC_BROWSER_COMMAND "\${HTML_DOC_BROWSER} %f" CACHE STRING "Command to open an HTML file" )
@@ -131,7 +148,7 @@ mark_as_advanced( HTML_DOC_BROWSER FF_HTML_DOC_BROWSER_COMMAND )
 set( CMAKE_INSTALL_RPATH ${FF_INSTALL_LIB_PATH} )
 
 # we want executables and libraries in uniform places
-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/FreeFOAM/${FF_VERSION_FULL} )
 set( FF_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/FreeFOAM-${FF_VERSION_FULL} )
 set( FF_FRAMEWORK_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Library/Frameworks )
 if( FF_BUILD_FRAMEWORK )
@@ -147,10 +164,10 @@ if( FF_USE_MPI )
   find_package( MPI REQUIRED )
 endif( FF_USE_MPI )
 if( CMAKE_SYSTEM_NAME STREQUAL Linux )
-option( FF_USE_GAMMA "Build ${CMAKE_PROJECT} against GAMMA parallel libraries" OFF )
-if( FF_USE_GAMMA )
-  find_package( GAMMA REQUIRED )
-endif( FF_USE_GAMMA )
+  option( FF_USE_GAMMA "Build ${CMAKE_PROJECT} against GAMMA parallel libraries" OFF )
+  if( FF_USE_GAMMA )
+    find_package( GAMMA REQUIRED )
+  endif( FF_USE_GAMMA )
 endif( CMAKE_SYSTEM_NAME STREQUAL Linux )
 if( MPI_FOUND OR GAMMA_FOUND )
   set( FF_USE_PARALLEL TRUE )
@@ -197,7 +214,8 @@ else( FF_BUILD_PRIVATE_METIS )
     message( SEND_ERROR "metis is required! Override METIS_* settings [advanced]." )
   endif( NOT METIS_FOUND )
   if( METIS_REQUIRES_MPI AND NOT FF_USE_MPI )
-    message( SEND_ERROR "Your metis implementation requires FF_USE_MPI to be enabled. If you don't have/want MPI, enable FF_BUILD_PRIVATE_METIS instead." )
+    message( SEND_ERROR
+      "Your metis implementation requires FF_USE_MPI to be enabled. If you don't have/want MPI, enable FF_BUILD_PRIVATE_METIS instead." )
   endif( METIS_REQUIRES_MPI AND NOT FF_USE_MPI )
 endif( FF_BUILD_PRIVATE_METIS )
 
diff --git a/INSTALL b/INSTALL
index 20ae61174..53bd09b82 100644
--- a/INSTALL
+++ b/INSTALL
@@ -241,17 +241,12 @@ $ cd $HOME/FreeFOAM/$LOGNAME-{shortver}/run/tutorials
 And try to run e.g. the 'cavity' tutorial case:
 ---------------
 $ cd icoFoam
-$ ff_blockMesh -case cavity
-$ ff_checkMesh -case cavity
-$ ff_icoFoam -case cavity
+$ freefoam blockMesh -case cavity
+$ freefoam checkMesh -case cavity
+$ freefoam ico -case cavity
 ---------------
 Things should run smoothly and finish without an error.
 
-[NOTE]
-The prefix 'ff_' used in above commands depends on the configuration
-variable +EXECUTABLE_PREFIX+ and might be different from the default.
-Adapt above invocations accordingly.
-
 Obtaining the Source Code from the GIT repository
 -------------------------------------------------
 - Clone the FreeFOAM repository (here the clone is placed in
@@ -280,6 +275,9 @@ Build Configuration Reference
 +FF_INSTALL_BIN_PATH+::
   Installation path of the binaries. If not absolute, it is relative to
   'CMAKE_INSTALL_PREFIX'.
++FF_INSTALL_LIBEXEC_PATH+::
+  Installation path of the binaries which should not be on the +PATH+. If not
+  absolute, it is relative to +CMAKE_INSTALL_PREFIX+.
 +FF_INSTALL_CONFIG_PATH+::
   Installation path of the configuration files. If not absolute, it is
   relative to 'CMAKE_INSTALL_PREFIX'.
@@ -304,9 +302,6 @@ Build Configuration Reference
 +FF_INSTALL_USERDFOAM_PATH+::
   Installation path of the Ensight plug-in. If not absolute, it is
   relative to 'CMAKE_INSTALL_PREFIX'.
-+EXECUTABLE_PREFIX+::
-  Prefix which get prepended to the name of the executables. This defaults to
-  'ff_' and serves the disambiguation of names.
 +FF_USE_GAMMA+::
   If enabled, FreeFOAM will use the GAMMA parallel communications library.
 +FF_USE_MPI+::
diff --git a/INSTALL.html b/INSTALL.html
index 645b75731..ed2b37d19 100644
--- a/INSTALL.html
+++ b/INSTALL.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.5.1" />
+<meta name="generator" content="AsciiDoc 8.5.3" />
 <title>FreeFOAM Installation Instructions for Version 0.1.0rc4</title>
 <style type="text/css">
 /* Debug borders */
@@ -118,12 +118,14 @@ div#preamble {
 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 div.admonitionblock {
-  margin-top: 0.25em;
+  margin-top: 1.0em;
   margin-bottom: 1.5em;
 }
 div.admonitionblock {
-  margin-top: 2.5em;
-  margin-bottom: 2.5em;
+  margin-top: 2.0em;
+  margin-bottom: 2.0em;
+  margin-right: 10%;
+  color: #606060;
 }
 
 div.content { /* Block element content. */
@@ -165,21 +167,21 @@ div.listingblock > div.content {
   padding: 0.5em;
 }
 
-div.quoteblock {
-  padding-left: 2.0em;
+div.quoteblock, div.verseblock {
+  padding-left: 1.0em;
+  margin-left: 1.0em;
   margin-right: 10%;
+  border-left: 5px solid #dddddd;
+  color: #777777;
 }
+
 div.quoteblock > div.attribution {
   padding-top: 0.5em;
   text-align: right;
 }
 
-div.verseblock {
-  padding-left: 2.0em;
-  margin-right: 10%;
-}
-div.verseblock > div.content {
-  white-space: pre;
+div.verseblock > pre.content {
+  font-family: inherit;
 }
 div.verseblock > div.attribution {
   padding-top: 0.75em;
@@ -200,12 +202,12 @@ div.admonitionblock .icon {
 }
 div.admonitionblock td.content {
   padding-left: 0.5em;
-  border-left: 2px solid silver;
+  border-left: 3px solid #dddddd;
 }
 
 div.exampleblock > div.content {
-  border-left: 2px solid silver;
-  padding: 0.5em;
+  border-left: 3px solid #dddddd;
+  padding-left: 0.5em;
 }
 
 div.imageblock div.content { padding-left: 0; }
@@ -255,7 +257,7 @@ div.compact div, div.compact div {
 div.tableblock > table {
   border: 3px solid #527bbd;
 }
-thead {
+thead, p.table.header {
   font-family: sans-serif;
   font-weight: bold;
 }
@@ -342,6 +344,10 @@ span.footnote, span.footnoteref {
   div#footer-badges { display: none; }
 }
 
+div#toc {
+  margin-bottom: 2.5em;
+}
+
 div#toctitle {
   color: #527bbd;
   font-family: sans-serif;
@@ -393,8 +399,8 @@ div.quoteblock-attribution {
   text-align: right;
 }
 
-div.verseblock-content {
-  white-space: pre;
+pre.verseblock-content {
+  font-family: inherit;
 }
 div.verseblock-attribution {
   padding-top: 0.75em;
@@ -402,7 +408,7 @@ div.verseblock-attribution {
 }
 
 div.exampleblock-content {
-  border-left: 2px solid silver;
+  border-left: 3px solid #dddddd;
   padding-left: 0.5em;
 }
 
@@ -461,8 +467,9 @@ toc: function (toclevels) {
       for (var i = el.firstChild; i != null; i = i.nextSibling) {
         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
           var mo = re.exec(i.tagName);
-          if (mo)
+          if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
+          }
           iterate(i);
         }
       }
@@ -548,7 +555,7 @@ footnotes: function () {
 <span id="author">Michael Wild</span><br />
 <span id="email"><tt>&lt;<a href="mailto:themiwi@users.sourceforge.net">themiwi@users.sourceforge.net</a>&gt;</tt></span><br />
 <span id="revnumber">version 0.1.0rc4,</span>
-<span id="revdate">2009-12-18</span>
+<span id="revdate">2010-06-18</span>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
@@ -957,21 +964,11 @@ $ cd $HOME/FreeFOAM/$LOGNAME-0.1/run/tutorials</tt></pre>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ cd icoFoam
-$ ff_blockMesh -case cavity
-$ ff_checkMesh -case cavity
-$ ff_icoFoam -case cavity</tt></pre>
+$ freefoam blockMesh -case cavity
+$ freefoam checkMesh -case cavity
+$ freefoam ico -case cavity</tt></pre>
 </div></div>
 <div class="paragraph"><p>Things should run smoothly and finish without an error.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">The prefix <em>ff_</em> used in above commands depends on the configuration
-variable <tt>EXECUTABLE_PREFIX</tt> and might be different from the default.
-Adapt above invocations accordingly.</td>
-</tr></table>
-</div>
 </div>
 <h2 id="_obtaining_the_source_code_from_the_git_repository">5. Obtaining the Source Code from the GIT repository</h2>
 <div class="sectionbody">
@@ -1042,6 +1039,15 @@ Proceed in the same way (replacing the path names apropriately) as in the
 </p>
 </dd>
 <dt>
+<tt>FF_INSTALL_LIBEXEC_PATH</tt>
+</dt>
+<dd>
+<p>
+  Installation path of the binaries which should not be on the <tt>PATH</tt>. If not
+  absolute, it is relative to <tt>CMAKE_INSTALL_PREFIX</tt>.
+</p>
+</dd>
+<dt>
 <tt>FF_INSTALL_CONFIG_PATH</tt>
 </dt>
 <dd>
@@ -1108,15 +1114,6 @@ Proceed in the same way (replacing the path names apropriately) as in the
 </p>
 </dd>
 <dt>
-<tt>EXECUTABLE_PREFIX</tt>
-</dt>
-<dd>
-<p>
-  Prefix which get prepended to the name of the executables. This defaults to
-  <em>ff_</em> and serves the disambiguation of names.
-</p>
-</dd>
-<dt>
 <tt>FF_USE_GAMMA</tt>
 </dt>
 <dd>
@@ -1575,7 +1572,7 @@ variable to update the cache of available programs.</p></div>
 <div id="footer">
 <div id="footer-text">
 Version 0.1.0rc4<br />
-Last updated 2009-12-18 11:29:50 CEST
+Last updated 2010-06-18 08:55:41 CEST
 </div>
 </div>
 </body>
diff --git a/ThirdParty/METIS/CMakeLists.txt b/ThirdParty/METIS/CMakeLists.txt
index 12421c240..b52fcec49 100644
--- a/ThirdParty/METIS/CMakeLists.txt
+++ b/ThirdParty/METIS/CMakeLists.txt
@@ -207,7 +207,7 @@ install( TARGETS GKlib metis
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT noinstall
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT noinstall
   )
 
 # ditto
diff --git a/ThirdParty/PARMGRIDGEN/IMlib/CMakeLists.txt b/ThirdParty/PARMGRIDGEN/IMlib/CMakeLists.txt
index 90715b33c..bb78bd4ca 100644
--- a/ThirdParty/PARMGRIDGEN/IMlib/CMakeLists.txt
+++ b/ThirdParty/PARMGRIDGEN/IMlib/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS IMlib
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT noinstall
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT noinstall
   )
 
 ff_add_target_to_build_tree_export( IMlib )
diff --git a/ThirdParty/PARMGRIDGEN/mgrid/CMakeLists.txt b/ThirdParty/PARMGRIDGEN/mgrid/CMakeLists.txt
index 5390e4033..f3c344271 100644
--- a/ThirdParty/PARMGRIDGEN/mgrid/CMakeLists.txt
+++ b/ThirdParty/PARMGRIDGEN/mgrid/CMakeLists.txt
@@ -57,7 +57,7 @@ install( TARGETS mgrid
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT noinstall
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT noinstall
   )
 
 ff_add_target_to_build_tree_export( mgrid )
diff --git a/ThirdParty/ParMetis/metis-parmetis/CMakeLists.txt b/ThirdParty/ParMetis/metis-parmetis/CMakeLists.txt
index e29dcdaa8..32b2304ac 100644
--- a/ThirdParty/ParMetis/metis-parmetis/CMakeLists.txt
+++ b/ThirdParty/ParMetis/metis-parmetis/CMakeLists.txt
@@ -68,7 +68,7 @@ install( TARGETS metis-parmetis
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT noinstall
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT noinstall
   )
 
 # ditto
diff --git a/ThirdParty/ParMetis/parmetis/CMakeLists.txt b/ThirdParty/ParMetis/parmetis/CMakeLists.txt
index 6aa30308a..54ff45a94 100644
--- a/ThirdParty/ParMetis/parmetis/CMakeLists.txt
+++ b/ThirdParty/ParMetis/parmetis/CMakeLists.txt
@@ -65,7 +65,7 @@ install( TARGETS parmetis
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT noinstall
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT noinstall
   )
 
 # ditto
diff --git a/ThirdParty/SCOTCH/CMakeLists.txt b/ThirdParty/SCOTCH/CMakeLists.txt
index ca9577a42..2162f385a 100644
--- a/ThirdParty/SCOTCH/CMakeLists.txt
+++ b/ThirdParty/SCOTCH/CMakeLists.txt
@@ -253,7 +253,7 @@ install( TARGETS scotch
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT noinstall
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT noinstall
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT noinstall
   )
 
 # ditto
diff --git a/applications/solvers/DNS/dnsFoam/CMakeLists.txt b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
index 47ed142c0..a6bb60fa0 100644
--- a/applications/solvers/DNS/dnsFoam/CMakeLists.txt
+++ b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( dnsFoam ${SRCS} )
 
 set_target_properties( dnsFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}dnsFoam
+  OUTPUT_NAME freefoam-dns
   )
 
 target_link_libraries( dnsFoam
@@ -48,7 +48,7 @@ target_link_libraries( dnsFoam
 install( TARGETS dnsFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( dnsFoam dnsFoam.C )
diff --git a/applications/solvers/basic/laplacianFoam/CMakeLists.txt b/applications/solvers/basic/laplacianFoam/CMakeLists.txt
index 3a4163647..e9e8bbfdf 100644
--- a/applications/solvers/basic/laplacianFoam/CMakeLists.txt
+++ b/applications/solvers/basic/laplacianFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( laplacianFoam ${SRCS} )
 
 set_target_properties( laplacianFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}laplacianFoam
+  OUTPUT_NAME freefoam-laplacian
   )
 
 target_link_libraries( laplacianFoam
@@ -45,7 +45,7 @@ target_link_libraries( laplacianFoam
 install( TARGETS laplacianFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( laplacianFoam laplacianFoam.C )
diff --git a/applications/solvers/basic/potentialFoam/CMakeLists.txt b/applications/solvers/basic/potentialFoam/CMakeLists.txt
index 238de0db4..89d400320 100644
--- a/applications/solvers/basic/potentialFoam/CMakeLists.txt
+++ b/applications/solvers/basic/potentialFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( potentialFoam ${SRCS} )
 
 set_target_properties( potentialFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}potentialFoam
+  OUTPUT_NAME freefoam-potential
   )
 
 target_link_libraries( potentialFoam
@@ -45,7 +45,7 @@ target_link_libraries( potentialFoam
 install( TARGETS potentialFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( potentialFoam potentialFoam.C )
diff --git a/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt b/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
index 110f261da..a309365bc 100644
--- a/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
+++ b/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( scalarTransportFoam ${SRCS} )
 
 set_target_properties( scalarTransportFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}scalarTransportFoam
+  OUTPUT_NAME freefoam-scalarTransport
   )
 
 target_link_libraries( scalarTransportFoam
@@ -45,7 +45,7 @@ target_link_libraries( scalarTransportFoam
 install( TARGETS scalarTransportFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( scalarTransportFoam scalarTransportFoam.C )
diff --git a/applications/solvers/combustion/PDRFoam/CMakeLists.txt b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
index 4a6b0a7cc..df2a84bde 100644
--- a/applications/solvers/combustion/PDRFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories(
 add_executable( PDRFoam ${SRCS} )
 
 set_target_properties( PDRFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}PDRFoam
+  OUTPUT_NAME freefoam-PDR
   )
 
 target_link_libraries( PDRFoam
@@ -61,7 +61,7 @@ target_link_libraries( PDRFoam
 install( TARGETS PDRFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( PDRFoam PDRFoam.C )
diff --git a/applications/solvers/combustion/XiFoam/CMakeLists.txt b/applications/solvers/combustion/XiFoam/CMakeLists.txt
index 2c2d2fd13..8482d37c1 100644
--- a/applications/solvers/combustion/XiFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/XiFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( XiFoam ${SRCS} )
 
 set_target_properties( XiFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}XiFoam
+  OUTPUT_NAME freefoam-Xi
   )
 
 target_link_libraries( XiFoam
@@ -53,7 +53,7 @@ target_link_libraries( XiFoam
 install( TARGETS XiFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( XiFoam XiFoam.C )
diff --git a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
index 302bea2b9..361099000 100644
--- a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../engineFoam ../XiFoam )
 add_executable( coldEngineFoam ${SRCS} )
 
 set_target_properties( coldEngineFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}coldEngineFoam
+  OUTPUT_NAME freefoam-coldEngine
   )
 
 target_link_libraries( coldEngineFoam
@@ -52,7 +52,7 @@ target_link_libraries( coldEngineFoam
 install( TARGETS coldEngineFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( coldEngineFoam coldEngineFoam.C )
diff --git a/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt b/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
index 47c71e703..b7ab4b9f2 100644
--- a/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../engineFoam )
 add_executable( dieselEngineFoam ${SRCS} )
 
 set_target_properties( dieselEngineFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}dieselEngineFoam
+  OUTPUT_NAME freefoam-dieselEngine
   )
 
 target_link_libraries( dieselEngineFoam
@@ -62,7 +62,7 @@ target_link_libraries( dieselEngineFoam
 install( TARGETS dieselEngineFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( dieselEngineFoam dieselEngineFoam.C )
diff --git a/applications/solvers/combustion/dieselFoam/CMakeLists.txt b/applications/solvers/combustion/dieselFoam/CMakeLists.txt
index ad94b8871..143a71286 100644
--- a/applications/solvers/combustion/dieselFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/dieselFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../dieselEngineFoam )
 add_executable( dieselFoam ${SRCS} )
 
 set_target_properties( dieselFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}dieselFoam
+  OUTPUT_NAME freefoam-diesel
   )
 
 target_link_libraries( dieselFoam
@@ -61,7 +61,7 @@ target_link_libraries( dieselFoam
 install( TARGETS dieselFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( dieselFoam dieselFoam.C )
diff --git a/applications/solvers/combustion/engineFoam/CMakeLists.txt b/applications/solvers/combustion/engineFoam/CMakeLists.txt
index 8e14f5137..9562e9fce 100644
--- a/applications/solvers/combustion/engineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/engineFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../XiFoam )
 add_executable( engineFoam ${SRCS} )
 
 set_target_properties( engineFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}engineFoam
+  OUTPUT_NAME freefoam-engine
   )
 
 target_link_libraries( engineFoam
@@ -54,7 +54,7 @@ target_link_libraries( engineFoam
 install( TARGETS engineFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( engineFoam engineFoam.C )
diff --git a/applications/solvers/combustion/fireFoam/CMakeLists.txt b/applications/solvers/combustion/fireFoam/CMakeLists.txt
index f28049010..bd8d01c07 100644
--- a/applications/solvers/combustion/fireFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/fireFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include( files.cmake )
 add_executable( fireFoam ${SRCS} )
 
 set_target_properties( fireFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}fireFoam
+  OUTPUT_NAME freefoam-fire
   )
 
 target_link_libraries( fireFoam
@@ -54,7 +54,7 @@ target_link_libraries( fireFoam
 install( TARGETS fireFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( fireFoam fireFoam.C )
diff --git a/applications/solvers/combustion/reactingFoam/CMakeLists.txt b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
index 98d10f446..3318b9369 100644
--- a/applications/solvers/combustion/reactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( reactingFoam ${SRCS} )
 
 set_target_properties( reactingFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}reactingFoam
+  OUTPUT_NAME freefoam-reacting
   )
 
 target_link_libraries( reactingFoam
@@ -52,7 +52,7 @@ target_link_libraries( reactingFoam
 install( TARGETS reactingFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( reactingFoam reactingFoam.C )
diff --git a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
index 4b28126e5..8345c7790 100644
--- a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rhoReactingFoam ${SRCS} )
 
 set_target_properties( rhoReactingFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoReactingFoam
+  OUTPUT_NAME freefoam-rhoReacting
   )
 
 target_link_libraries( rhoReactingFoam
@@ -52,7 +52,7 @@ target_link_libraries( rhoReactingFoam
 install( TARGETS rhoReactingFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoReactingFoam rhoReactingFoam.C )
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
index 8edb28a30..ce77a81c9 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
@@ -54,7 +54,7 @@ install( TARGETS librhoCentralFoam
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/rhoCentralFoam COMPONENT dev
   )
diff --git a/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
index 64ec7061e..39befc97b 100644
--- a/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
@@ -37,7 +37,7 @@ include( files.cmake )
 add_executable( rhoCentralFoam ${SRCS} )
 
 set_target_properties( rhoCentralFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoCentralFoam
+  OUTPUT_NAME freefoam-rhoCentral
   )
 
 target_link_libraries( rhoCentralFoam
@@ -51,7 +51,7 @@ target_link_libraries( rhoCentralFoam
 install( TARGETS rhoCentralFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoCentralFoam rhoCentralFoam.C )
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/CMakeLists.txt
index 7f6284c7e..2fb8a9b13 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( .. )
 add_executable( rhoCentralDyMFoam ${SRCS} )
 
 set_target_properties( rhoCentralDyMFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoCentralDyMFoam
+  OUTPUT_NAME freefoam-rhoCentralDyM
   )
 
 target_link_libraries( rhoCentralDyMFoam
@@ -54,7 +54,7 @@ target_link_libraries( rhoCentralDyMFoam
 install( TARGETS rhoCentralDyMFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoCentralDyMFoam rhoCentralDyMFoam.C )
diff --git a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
index 51688c02f..cd7620aed 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rhoPimpleFoam ${SRCS} )
 
 set_target_properties( rhoPimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoPimpleFoam
+  OUTPUT_NAME freefoam-rhoPimple
   )
 
 target_link_libraries( rhoPimpleFoam
@@ -50,7 +50,7 @@ target_link_libraries( rhoPimpleFoam
 install( TARGETS rhoPimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoPimpleFoam rhoPimpleFoam.C )
diff --git a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
index a90f1341e..6e598b0c1 100644
--- a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rhoPisoFoam ${SRCS} )
 
 set_target_properties( rhoPisoFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoPisoFoam
+  OUTPUT_NAME freefoam-rhoPiso
   )
 
 target_link_libraries( rhoPisoFoam
@@ -50,7 +50,7 @@ target_link_libraries( rhoPisoFoam
 install( TARGETS rhoPisoFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoPisoFoam rhoPisoFoam.C )
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
index 3ee9e9478..3b4c46a69 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include( files.cmake )
 add_executable( rhoPorousMRFPimpleFoam ${SRCS} )
 
 set_target_properties( rhoPorousMRFPimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoPorousMRFPimpleFoam
+  OUTPUT_NAME freefoam-rhoPorousMRFPimple
   )
 
 target_link_libraries( rhoPorousMRFPimpleFoam
@@ -52,7 +52,7 @@ target_link_libraries( rhoPorousMRFPimpleFoam
 install( TARGETS rhoPorousMRFPimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoPorousMRFPimpleFoam rhoPorousMRFPimpleFoam.C )
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
index 4f1daff55..3db39efa9 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rhoPorousSimpleFoam ${SRCS} )
 
 set_target_properties( rhoPorousSimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoPorousSimpleFoam
+  OUTPUT_NAME freefoam-rhoPorousSimple
   )
 
 target_link_libraries( rhoPorousSimpleFoam
@@ -49,7 +49,7 @@ target_link_libraries( rhoPorousSimpleFoam
 install( TARGETS rhoPorousSimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoPorousSimpleFoam rhoPorousSimpleFoam.C )
diff --git a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
index 8bda9901a..64de45c7e 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rhoSimpleFoam ${SRCS} )
 
 set_target_properties( rhoSimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoSimpleFoam
+  OUTPUT_NAME freefoam-rhoSimple
   )
 
 target_link_libraries( rhoSimpleFoam
@@ -49,7 +49,7 @@ target_link_libraries( rhoSimpleFoam
 install( TARGETS rhoSimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoSimpleFoam rhoSimpleFoam.C )
diff --git a/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
index d576411a1..96d686e00 100644
--- a/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rhoSonicFoam ${SRCS} )
 
 set_target_properties( rhoSonicFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhoSonicFoam
+  OUTPUT_NAME freefoam-rhoSonic
   )
 
 target_link_libraries( rhoSonicFoam
@@ -45,7 +45,7 @@ target_link_libraries( rhoSonicFoam
 install( TARGETS rhoSonicFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhoSonicFoam rhoSonicFoam.C )
diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
index dfe92c0e1..f6d4837f2 100644
--- a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS librhopSonicFoam
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/rhopSonicFoam COMPONENT dev
   )
diff --git a/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
index fcd33e376..01e7141c8 100644
--- a/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include( files.cmake )
 add_executable( rhopSonicFoam ${SRCS} )
 
 set_target_properties( rhopSonicFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rhopSonicFoam
+  OUTPUT_NAME freefoam-rhopSonic
   )
 
 target_link_libraries( rhopSonicFoam
@@ -48,7 +48,7 @@ target_link_libraries( rhopSonicFoam
 install( TARGETS rhopSonicFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rhopSonicFoam rhopSonicFoam.C )
diff --git a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
index 8001d363c..d4defa20f 100644
--- a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(
 add_executable( sonicDyMFoam ${SRCS} )
 
 set_target_properties( sonicDyMFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}sonicDyMFoam
+  OUTPUT_NAME freefoam-sonicDyM
   )
 
 target_link_libraries( sonicDyMFoam
@@ -55,7 +55,7 @@ target_link_libraries( sonicDyMFoam
 install( TARGETS sonicDyMFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( sonicDyMFoam sonicDyMFoam.C )
diff --git a/applications/solvers/compressible/sonicFoam/CMakeLists.txt b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
index 2231f1aab..91beb89c7 100644
--- a/applications/solvers/compressible/sonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( sonicFoam ${SRCS} )
 
 set_target_properties( sonicFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}sonicFoam
+  OUTPUT_NAME freefoam-sonic
   )
 
 target_link_libraries( sonicFoam
@@ -50,7 +50,7 @@ target_link_libraries( sonicFoam
 install( TARGETS sonicFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( sonicFoam sonicFoam.C )
diff --git a/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt b/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
index 8f255e3b3..2d0b5ff9f 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( sonicLiquidFoam ${SRCS} )
 
 set_target_properties( sonicLiquidFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}sonicLiquidFoam
+  OUTPUT_NAME freefoam-sonicLiquid
   )
 
 target_link_libraries( sonicLiquidFoam
@@ -45,7 +45,7 @@ target_link_libraries( sonicLiquidFoam
 install( TARGETS sonicLiquidFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( sonicLiquidFoam sonicLiquidFoam.C )
diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt b/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
index 0aaa1eaa5..24cac2eda 100644
--- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( dsmcFoam ${SRCS} )
 
 set_target_properties( dsmcFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}dsmcFoam
+  OUTPUT_NAME freefoam-dsmc
   )
 
 target_link_libraries( dsmcFoam
@@ -48,7 +48,7 @@ target_link_libraries( dsmcFoam
 install( TARGETS dsmcFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( dsmcFoam dsmcFoam.C )
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
index 39de95f75..1bdda7354 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mdEquilibrationFoam ${SRCS} )
 
 set_target_properties( mdEquilibrationFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mdEquilibrationFoam
+  OUTPUT_NAME freefoam-mdEquilibration
   )
 
 target_link_libraries( mdEquilibrationFoam
@@ -50,7 +50,7 @@ target_link_libraries( mdEquilibrationFoam
 install( TARGETS mdEquilibrationFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mdEquilibrationFoam mdEquilibrationFoam.C )
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
index ef82e749a..77362447a 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mdFoam ${SRCS} )
 
 set_target_properties( mdFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mdFoam
+  OUTPUT_NAME freefoam-md
   )
 
 target_link_libraries( mdFoam
@@ -50,7 +50,7 @@ target_link_libraries( mdFoam
 install( TARGETS mdFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mdFoam mdFoam.C )
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt b/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
index 8eb42bd02..66770757b 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( electrostaticFoam ${SRCS} )
 
 set_target_properties( electrostaticFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}electrostaticFoam
+  OUTPUT_NAME freefoam-electrostatic
   )
 
 target_link_libraries( electrostaticFoam
@@ -45,7 +45,7 @@ target_link_libraries( electrostaticFoam
 install( TARGETS electrostaticFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( electrostaticFoam electrostaticFoam.C )
diff --git a/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt b/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
index 74b78d494..a1dcd17cc 100644
--- a/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mhdFoam ${SRCS} )
 
 set_target_properties( mhdFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mhdFoam
+  OUTPUT_NAME freefoam-mhd
   )
 
 target_link_libraries( mhdFoam
@@ -45,7 +45,7 @@ target_link_libraries( mhdFoam
 install( TARGETS mhdFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mhdFoam mhdFoam.C )
diff --git a/applications/solvers/financial/financialFoam/CMakeLists.txt b/applications/solvers/financial/financialFoam/CMakeLists.txt
index cfd71a99a..94c50aa93 100644
--- a/applications/solvers/financial/financialFoam/CMakeLists.txt
+++ b/applications/solvers/financial/financialFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( financialFoam ${SRCS} )
 
 set_target_properties( financialFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}financialFoam
+  OUTPUT_NAME freefoam-financial
   )
 
 target_link_libraries( financialFoam
@@ -47,7 +47,7 @@ target_link_libraries( financialFoam
 install( TARGETS financialFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( financialFoam financialFoam.C )
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
index 00c1e84cd..24ceba8ea 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(
 add_executable( buoyantBoussinesqPisoFoam ${SRCS} )
 
 set_target_properties( buoyantBoussinesqPisoFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}buoyantBoussinesqPisoFoam
+  OUTPUT_NAME freefoam-buoyantBoussinesqPiso
   )
 
 target_link_libraries( buoyantBoussinesqPisoFoam
@@ -53,7 +53,7 @@ target_link_libraries( buoyantBoussinesqPisoFoam
 install( TARGETS buoyantBoussinesqPisoFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( buoyantBoussinesqPisoFoam buoyantBoussinesqPisoFoam.C )
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
index f7bdc9963..daeeca2a0 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( buoyantBoussinesqSimpleFoam ${SRCS} )
 
 set_target_properties( buoyantBoussinesqSimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}buoyantBoussinesqSimpleFoam
+  OUTPUT_NAME freefoam-buoyantBoussinesqSimple
   )
 
 target_link_libraries( buoyantBoussinesqSimpleFoam
@@ -48,7 +48,7 @@ target_link_libraries( buoyantBoussinesqSimpleFoam
 install( TARGETS buoyantBoussinesqSimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( buoyantBoussinesqSimpleFoam buoyantBoussinesqSimpleFoam.C )
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
index 2e6cfa591..6ba667279 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( buoyantPisoFoam ${SRCS} )
 
 set_target_properties( buoyantPisoFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}buoyantPisoFoam
+  OUTPUT_NAME freefoam-buoyantPiso
   )
 
 target_link_libraries( buoyantPisoFoam
@@ -50,7 +50,7 @@ target_link_libraries( buoyantPisoFoam
 install( TARGETS buoyantPisoFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( buoyantPisoFoam buoyantPisoFoam.C )
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
index c434f8ecf..9677da031 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( buoyantSimpleFoam ${SRCS} )
 
 set_target_properties( buoyantSimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}buoyantSimpleFoam
+  OUTPUT_NAME freefoam-buoyantSimple
   )
 
 target_link_libraries( buoyantSimpleFoam
@@ -49,7 +49,7 @@ target_link_libraries( buoyantSimpleFoam
 install( TARGETS buoyantSimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( buoyantSimpleFoam buoyantSimpleFoam.C )
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
index 2d1edee49..8483e64a2 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../buoyantSimpleFoam )
 add_executable( buoyantSimpleRadiationFoam ${SRCS} )
 
 set_target_properties( buoyantSimpleRadiationFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}buoyantSimpleRadiationFoam
+  OUTPUT_NAME freefoam-buoyantSimpleRadiation
   )
 
 target_link_libraries( buoyantSimpleRadiationFoam
@@ -52,7 +52,7 @@ target_link_libraries( buoyantSimpleRadiationFoam
 install( TARGETS buoyantSimpleRadiationFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( buoyantSimpleRadiationFoam buoyantSimpleRadiationFoam.C )
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
index 4e7368ab0..a96b0f859 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
@@ -41,7 +41,7 @@ include_directories(
 add_executable( chtMultiRegionFoam ${SRCS} )
 
 set_target_properties( chtMultiRegionFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}chtMultiRegionFoam
+  OUTPUT_NAME freefoam-chtMultiRegion
   )
 
 target_link_libraries( chtMultiRegionFoam
@@ -56,7 +56,7 @@ target_link_libraries( chtMultiRegionFoam
 install( TARGETS chtMultiRegionFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( chtMultiRegionFoam chtMultiRegionFoam.C )
diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
index 06a9559f3..07013a5cb 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
@@ -39,7 +39,7 @@ include_directories(
 add_executable( chtMultiRegionSimpleFoam ${SRCS} )
 
 set_target_properties( chtMultiRegionSimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}chtMultiRegionSimpleFoam
+  OUTPUT_NAME freefoam-chtMultiRegionSimple
   )
 
 target_link_libraries( chtMultiRegionSimpleFoam
@@ -54,7 +54,7 @@ target_link_libraries( chtMultiRegionSimpleFoam
 install( TARGETS chtMultiRegionSimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( chtMultiRegionSimpleFoam chtMultiRegionSimpleFoam.C )
diff --git a/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt b/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt
index 93da7acb0..625dac72e 100644
--- a/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( boundaryFoam ${SRCS} )
 
 set_target_properties( boundaryFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}boundaryFoam
+  OUTPUT_NAME freefoam-boundary
   )
 
 target_link_libraries( boundaryFoam
@@ -49,7 +49,7 @@ target_link_libraries( boundaryFoam
 install( TARGETS boundaryFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( boundaryFoam boundaryFoam.C )
diff --git a/applications/solvers/incompressible/channelFoam/CMakeLists.txt b/applications/solvers/incompressible/channelFoam/CMakeLists.txt
index a48992bd9..4439560b5 100644
--- a/applications/solvers/incompressible/channelFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/channelFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( channelFoam ${SRCS} )
 
 set_target_properties( channelFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}channelFoam
+  OUTPUT_NAME freefoam-channel
   )
 
 target_link_libraries( channelFoam
@@ -48,7 +48,7 @@ target_link_libraries( channelFoam
 install( TARGETS channelFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( channelFoam channelFoam.C )
diff --git a/applications/solvers/incompressible/icoFoam/CMakeLists.txt b/applications/solvers/incompressible/icoFoam/CMakeLists.txt
index 8b5e8a531..3d7924f43 100644
--- a/applications/solvers/incompressible/icoFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/icoFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( icoFoam ${SRCS} )
 
 set_target_properties( icoFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}icoFoam
+  OUTPUT_NAME freefoam-ico
   )
 
 target_link_libraries( icoFoam
@@ -45,7 +45,7 @@ target_link_libraries( icoFoam
 install( TARGETS icoFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( icoFoam icoFoam.C )
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt b/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt
index 6a405d670..dfb1be144 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( nonNewtonianIcoFoam ${SRCS} )
 
 set_target_properties( nonNewtonianIcoFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}nonNewtonianIcoFoam
+  OUTPUT_NAME freefoam-nonNewtonianIco
   )
 
 target_link_libraries( nonNewtonianIcoFoam
@@ -46,7 +46,7 @@ target_link_libraries( nonNewtonianIcoFoam
 install( TARGETS nonNewtonianIcoFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( nonNewtonianIcoFoam nonNewtonianIcoFoam.C )
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt b/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt
index 2ab6017e1..8f7262487 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( pimpleDyMFoam ${SRCS} )
 
 set_target_properties( pimpleDyMFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}pimpleDyMFoam
+  OUTPUT_NAME freefoam-pimpleDyM
   )
 
 target_link_libraries( pimpleDyMFoam
@@ -52,7 +52,7 @@ target_link_libraries( pimpleDyMFoam
 install( TARGETS pimpleDyMFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( pimpleDyMFoam pimpleDyMFoam.C )
diff --git a/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt b/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt
index 40a417e05..e2aac8b54 100644
--- a/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( pimpleFoam ${SRCS} )
 
 set_target_properties( pimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}pimpleFoam
+  OUTPUT_NAME freefoam-pimple
   )
 
 target_link_libraries( pimpleFoam
@@ -49,7 +49,7 @@ target_link_libraries( pimpleFoam
 install( TARGETS pimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( pimpleFoam pimpleFoam.C )
diff --git a/applications/solvers/incompressible/pisoFoam/CMakeLists.txt b/applications/solvers/incompressible/pisoFoam/CMakeLists.txt
index 241f0250e..75fa0d25b 100644
--- a/applications/solvers/incompressible/pisoFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/pisoFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( pisoFoam ${SRCS} )
 
 set_target_properties( pisoFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}pisoFoam
+  OUTPUT_NAME freefoam-piso
   )
 
 target_link_libraries( pisoFoam
@@ -49,7 +49,7 @@ target_link_libraries( pisoFoam
 install( TARGETS pisoFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( pisoFoam pisoFoam.C )
diff --git a/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt b/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt
index 2cfb567f2..be9849835 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../simpleFoam )
 add_executable( porousSimpleFoam ${SRCS} )
 
 set_target_properties( porousSimpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}porousSimpleFoam
+  OUTPUT_NAME freefoam-porousSimple
   )
 
 target_link_libraries( porousSimpleFoam
@@ -50,7 +50,7 @@ target_link_libraries( porousSimpleFoam
 install( TARGETS porousSimpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( porousSimpleFoam porousSimpleFoam.C )
diff --git a/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt b/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt
index 5a6315307..6fcc3a03e 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( shallowWaterFoam ${SRCS} )
 
 set_target_properties( shallowWaterFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}shallowWaterFoam
+  OUTPUT_NAME freefoam-shallowWater
   )
 
 target_link_libraries( shallowWaterFoam
@@ -45,7 +45,7 @@ target_link_libraries( shallowWaterFoam
 install( TARGETS shallowWaterFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( shallowWaterFoam shallowWaterFoam.C )
diff --git a/applications/solvers/incompressible/simpleFoam/CMakeLists.txt b/applications/solvers/incompressible/simpleFoam/CMakeLists.txt
index 9d70c4845..2e595b414 100644
--- a/applications/solvers/incompressible/simpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/simpleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( simpleFoam ${SRCS} )
 
 set_target_properties( simpleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}simpleFoam
+  OUTPUT_NAME freefoam-simple
   )
 
 target_link_libraries( simpleFoam
@@ -47,7 +47,7 @@ target_link_libraries( simpleFoam
 install( TARGETS simpleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( simpleFoam simpleFoam.C )
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
index 1a9078082..c0b1d792e 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( coalChemistryFoam ${SRCS} )
 
 set_target_properties( coalChemistryFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}coalChemistryFoam
+  OUTPUT_NAME freefoam-coalChemistry
   )
 
 target_link_libraries( coalChemistryFoam
@@ -62,7 +62,7 @@ target_link_libraries( coalChemistryFoam
 install( TARGETS coalChemistryFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( coalChemistryFoam coalChemistryFoam.C )
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
index 04a6af823..26163fdef 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( porousExplicitSourceReactingParcelFoam ${SRCS} )
 
 set_target_properties( porousExplicitSourceReactingParcelFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}porousExplicitSourceReactingParcelFoam
+  OUTPUT_NAME freefoam-porousExplicitSourceReactingParcel
   )
 
 target_link_libraries( porousExplicitSourceReactingParcelFoam
@@ -61,7 +61,7 @@ target_link_libraries( porousExplicitSourceReactingParcelFoam
 install( TARGETS porousExplicitSourceReactingParcelFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( porousExplicitSourceReactingParcelFoam porousExplicitSourceReactingParcelFoam.C )
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
index cdc0aa550..673f6e1d1 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( reactingParcelFoam ${SRCS} )
 
 set_target_properties( reactingParcelFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}reactingParcelFoam
+  OUTPUT_NAME freefoam-reactingParcel
   )
 
 target_link_libraries( reactingParcelFoam
@@ -61,7 +61,7 @@ target_link_libraries( reactingParcelFoam
 install( TARGETS reactingParcelFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( reactingParcelFoam reactingParcelFoam.C )
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
index 229667d9a..e3a8ecc0a 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( uncoupledKinematicParcelFoam ${SRCS} )
 
 set_target_properties( uncoupledKinematicParcelFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}uncoupledKinematicParcelFoam
+  OUTPUT_NAME freefoam-uncoupledKinematicParcel
   )
 
 target_link_libraries( uncoupledKinematicParcelFoam
@@ -54,7 +54,7 @@ target_link_libraries( uncoupledKinematicParcelFoam
 install( TARGETS uncoupledKinematicParcelFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( uncoupledKinematicParcelFoam uncoupledKinematicParcelFoam.C )
diff --git a/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt b/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
index 558715815..15de2303b 100644
--- a/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( bubbleFoam ${SRCS} )
 
 set_target_properties( bubbleFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}bubbleFoam
+  OUTPUT_NAME freefoam-bubble
   )
 
 target_link_libraries( bubbleFoam
@@ -46,7 +46,7 @@ target_link_libraries( bubbleFoam
 install( TARGETS bubbleFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( bubbleFoam bubbleFoam.C )
diff --git a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
index 7ac0744ef..42508f4f0 100644
--- a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( cavitatingFoam ${SRCS} )
 
 set_target_properties( cavitatingFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}cavitatingFoam
+  OUTPUT_NAME freefoam-cavitating
   )
 
 target_link_libraries( cavitatingFoam
@@ -49,7 +49,7 @@ target_link_libraries( cavitatingFoam
 install( TARGETS cavitatingFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( cavitatingFoam cavitatingFoam.C )
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
index 2caf0e251..e0de2049d 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( compressibleInterDyMFoam ${SRCS} )
 
 set_target_properties( compressibleInterDyMFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}compressibleInterDyMFoam
+  OUTPUT_NAME freefoam-compressibleInterDyM
   )
 
 target_link_libraries( compressibleInterDyMFoam
@@ -52,7 +52,7 @@ target_link_libraries( compressibleInterDyMFoam
 install( TARGETS compressibleInterDyMFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( compressibleInterDyMFoam compressibleInterDyMFoam.C )
diff --git a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
index 900d491c9..0ac36e64c 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( compressibleInterFoam ${SRCS} )
 
 set_target_properties( compressibleInterFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}compressibleInterFoam
+  OUTPUT_NAME freefoam-compressibleInter
   )
 
 target_link_libraries( compressibleInterFoam
@@ -49,7 +49,7 @@ target_link_libraries( compressibleInterFoam
 install( TARGETS compressibleInterFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( compressibleInterFoam compressibleInterFoam.C )
diff --git a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
index 44b051a68..d3278a67d 100644
--- a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(
 add_executable( interDyMFoam ${SRCS} )
 
 set_target_properties( interDyMFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}interDyMFoam
+  OUTPUT_NAME freefoam-interDyM
   )
 
 target_link_libraries( interDyMFoam
@@ -57,7 +57,7 @@ target_link_libraries( interDyMFoam
 install( TARGETS interDyMFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( interDyMFoam interDyMFoam.C )
diff --git a/applications/solvers/multiphase/interFoam/CMakeLists.txt b/applications/solvers/multiphase/interFoam/CMakeLists.txt
index 828abf242..6a33d1a10 100644
--- a/applications/solvers/multiphase/interFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( interFoam ${SRCS} )
 
 set_target_properties( interFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}interFoam
+  OUTPUT_NAME freefoam-inter
   )
 
 target_link_libraries( interFoam
@@ -49,7 +49,7 @@ target_link_libraries( interFoam
 install( TARGETS interFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( interFoam interFoam.C )
diff --git a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
index 01546982b..060e55494 100644
--- a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories(
 add_executable( interMixingFoam ${SRCS} )
 
 set_target_properties( interMixingFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}interMixingFoam
+  OUTPUT_NAME freefoam-interMixing
   )
 
 target_link_libraries( interMixingFoam
@@ -55,7 +55,7 @@ target_link_libraries( interMixingFoam
 install( TARGETS interMixingFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( interMixingFoam interMixingFoam.C )
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
index 5be3dc093..97a3c68b1 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture )
 add_executable( interPhaseChangeFoam ${SRCS} )
 
 set_target_properties( interPhaseChangeFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}interPhaseChangeFoam
+  OUTPUT_NAME freefoam-interPhaseChange
   )
 
 target_link_libraries( interPhaseChangeFoam
@@ -51,7 +51,7 @@ target_link_libraries( interPhaseChangeFoam
 install( TARGETS interPhaseChangeFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( interPhaseChangeFoam interPhaseChangeFoam.C )
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
index 5c48e0553..7c0faf48d 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
@@ -41,7 +41,7 @@ include_directories(
 add_executable( multiphaseInterFoam ${SRCS} )
 
 set_target_properties( multiphaseInterFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}multiphaseInterFoam
+  OUTPUT_NAME freefoam-multiphaseInter
   )
 
 target_link_libraries( multiphaseInterFoam
@@ -56,7 +56,7 @@ target_link_libraries( multiphaseInterFoam
 install( TARGETS multiphaseInterFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( multiphaseInterFoam multiphaseInterFoam.C )
diff --git a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
index f78d55b32..6d1f82778 100644
--- a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ../interFoam )
 add_executable( porousInterFoam ${SRCS} )
 
 set_target_properties( porousInterFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}porousInterFoam
+  OUTPUT_NAME freefoam-porousInter
   )
 
 target_link_libraries( porousInterFoam
@@ -52,7 +52,7 @@ target_link_libraries( porousInterFoam
 install( TARGETS porousInterFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( porousInterFoam porousInterFoam.C )
diff --git a/applications/solvers/multiphase/settlingFoam/CMakeLists.txt b/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
index f7beec0bd..e825ec1ec 100644
--- a/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( settlingFoam ${SRCS} )
 
 set_target_properties( settlingFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}settlingFoam
+  OUTPUT_NAME freefoam-settling
   )
 
 target_link_libraries( settlingFoam
@@ -45,7 +45,7 @@ target_link_libraries( settlingFoam
 install( TARGETS settlingFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( settlingFoam settlingFoam.C )
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
index c62894a75..0b02a508c 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( twoLiquidMixingFoam ${SRCS} )
 
 set_target_properties( twoLiquidMixingFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}twoLiquidMixingFoam
+  OUTPUT_NAME freefoam-twoLiquidMixing
   )
 
 target_link_libraries( twoLiquidMixingFoam
@@ -49,7 +49,7 @@ target_link_libraries( twoLiquidMixingFoam
 install( TARGETS twoLiquidMixingFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( twoLiquidMixingFoam twoLiquidMixingFoam.C )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
index 31a690e64..588307ea7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
@@ -43,7 +43,7 @@ include_directories(
 add_executable( twoPhaseEulerFoam ${SRCS} )
 
 set_target_properties( twoPhaseEulerFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}twoPhaseEulerFoam
+  OUTPUT_NAME freefoam-twoPhaseEuler
   )
 
 target_link_libraries( twoPhaseEulerFoam
@@ -59,7 +59,7 @@ target_link_libraries( twoPhaseEulerFoam
 install( TARGETS twoPhaseEulerFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
 )
 
 ff_add_executable_to_doc_index( twoPhaseEulerFoam twoPhaseEulerFoam.C )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
index 34766c329..018ebb6ea 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS EulerianInterfacialModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/EulerianInterfacialModels COMPONENT dev
   )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
index 054f9b71e..baed3b66b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS kineticTheoryModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/kineticTheoryModel COMPONENT dev
   )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
index 019413b27..43c551090 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS phaseModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/phaseModel COMPONENT dev
   )
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/CMakeLists.txt b/applications/solvers/stressAnalysis/solidDisplacementFoam/CMakeLists.txt
index 199950d4c..f86031035 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/CMakeLists.txt
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( solidDisplacementFoam ${SRCS} )
 
 set_target_properties( solidDisplacementFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}solidDisplacementFoam
+  OUTPUT_NAME freefoam-solidDisplacement
   )
 
 target_link_libraries( solidDisplacementFoam
@@ -45,7 +45,7 @@ target_link_libraries( solidDisplacementFoam
 install( TARGETS solidDisplacementFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( solidDisplacementFoam solidDisplacementFoam.C )
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/CMakeLists.txt b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/CMakeLists.txt
index ff8ea9ad9..4adaa2c46 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/CMakeLists.txt
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/CMakeLists.txt
@@ -39,7 +39,7 @@ include_directories(
 add_executable( solidEquilibriumDisplacementFoam ${SRCS} )
 
 set_target_properties( solidEquilibriumDisplacementFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}solidEquilibriumDisplacementFoam
+  OUTPUT_NAME freefoam-solidEquilibriumDisplacement
   )
 
 target_link_libraries( solidEquilibriumDisplacementFoam
@@ -50,7 +50,7 @@ target_link_libraries( solidEquilibriumDisplacementFoam
 install( TARGETS solidEquilibriumDisplacementFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( solidEquilibriumDisplacementFoam solidEquilibriumDisplacementFoam.C )
diff --git a/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt b/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt
index cb205d5ec..1430a213b 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( estimateScalarError ${SRCS} )
 
 set_target_properties( estimateScalarError PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}estimateScalarError
+  OUTPUT_NAME freefoam-estimateScalarError
   )
 
 target_link_libraries( estimateScalarError
@@ -48,7 +48,7 @@ target_link_libraries( estimateScalarError
 install( TARGETS estimateScalarError
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( estimateScalarError estimateScalarError.C )
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt b/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt
index 9157dbf7f..65b19077d 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( icoErrorEstimate ${SRCS} )
 
 set_target_properties( icoErrorEstimate PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}icoErrorEstimate
+  OUTPUT_NAME freefoam-icoErrorEstimate
   )
 
 target_link_libraries( icoErrorEstimate
@@ -48,7 +48,7 @@ target_link_libraries( icoErrorEstimate
 install( TARGETS icoErrorEstimate
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( icoErrorEstimate icoErrorEstimate.C )
diff --git a/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt b/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt
index cf58a39af..65737d2bd 100644
--- a/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( icoMomentError ${SRCS} )
 
 set_target_properties( icoMomentError PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}icoMomentError
+  OUTPUT_NAME freefoam-icoMomentError
   )
 
 target_link_libraries( icoMomentError
@@ -48,7 +48,7 @@ target_link_libraries( icoMomentError
 install( TARGETS icoMomentError
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( icoMomentError icoMomentError.C )
diff --git a/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt b/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt
index d3ebb72b5..78dddbb61 100644
--- a/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( momentScalarError ${SRCS} )
 
 set_target_properties( momentScalarError PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}momentScalarError
+  OUTPUT_NAME freefoam-momentScalarError
   )
 
 target_link_libraries( momentScalarError
@@ -48,7 +48,7 @@ target_link_libraries( momentScalarError
 install( TARGETS momentScalarError
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( momentScalarError momentScalarError.C )
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt b/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt
index 955c25fd5..988bf8264 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( autoRefineMesh ${SRCS} )
 
 set_target_properties( autoRefineMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}autoRefineMesh
+  OUTPUT_NAME freefoam-autoRefineMesh
   )
 
 target_link_libraries( autoRefineMesh
@@ -48,7 +48,7 @@ target_link_libraries( autoRefineMesh
 install( TARGETS autoRefineMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( autoRefineMesh autoRefineMesh.C )
diff --git a/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt b/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt
index b2b4cf0ed..b218040f1 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( collapseEdges ${SRCS} )
 
 set_target_properties( collapseEdges PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}collapseEdges
+  OUTPUT_NAME freefoam-collapseEdges
   )
 
 target_link_libraries( collapseEdges
@@ -46,7 +46,7 @@ target_link_libraries( collapseEdges
 install( TARGETS collapseEdges
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( collapseEdges collapseEdges.C )
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt b/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt
index 8f2e6f7c3..b79d8f170 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( combinePatchFaces ${SRCS} )
 
 set_target_properties( combinePatchFaces PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}combinePatchFaces
+  OUTPUT_NAME freefoam-combinePatchFaces
   )
 
 target_link_libraries( combinePatchFaces
@@ -46,7 +46,7 @@ target_link_libraries( combinePatchFaces
 install( TARGETS combinePatchFaces
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( combinePatchFaces combinePatchFaces.C )
diff --git a/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt b/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt
index f08e6b377..7fd4b578c 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( modifyMesh ${SRCS} )
 
 set_target_properties( modifyMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}modifyMesh
+  OUTPUT_NAME freefoam-modifyMesh
   )
 
 target_link_libraries( modifyMesh
@@ -47,7 +47,7 @@ target_link_libraries( modifyMesh
 install( TARGETS modifyMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( modifyMesh modifyMesh.C )
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt b/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt
index 0071842bb..fb1197b2e 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( refineHexMesh ${SRCS} )
 
 set_target_properties( refineHexMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}refineHexMesh
+  OUTPUT_NAME freefoam-refineHexMesh
   )
 
 target_link_libraries( refineHexMesh
@@ -47,7 +47,7 @@ target_link_libraries( refineHexMesh
 install( TARGETS refineHexMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( refineHexMesh refineHexMesh.C )
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt b/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt
index b4c32b1c1..93f093af7 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( refineWallLayer ${SRCS} )
 
 set_target_properties( refineWallLayer PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}refineWallLayer
+  OUTPUT_NAME freefoam-refineWallLayer
   )
 
 target_link_libraries( refineWallLayer
@@ -46,7 +46,7 @@ target_link_libraries( refineWallLayer
 install( TARGETS refineWallLayer
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( refineWallLayer refineWallLayer.C )
diff --git a/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt b/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt
index 75e942219..b35ad8c29 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( refinementLevel ${SRCS} )
 
 set_target_properties( refinementLevel PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}refinementLevel
+  OUTPUT_NAME freefoam-refinementLevel
   )
 
 target_link_libraries( refinementLevel
@@ -46,7 +46,7 @@ target_link_libraries( refinementLevel
 install( TARGETS refinementLevel
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( refinementLevel refinementLevel.C )
diff --git a/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt b/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt
index efea17415..e754de799 100644
--- a/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( removeFaces ${SRCS} )
 
 set_target_properties( removeFaces PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}removeFaces
+  OUTPUT_NAME freefoam-removeFaces
   )
 
 target_link_libraries( removeFaces
@@ -47,7 +47,7 @@ target_link_libraries( removeFaces
 install( TARGETS removeFaces
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( removeFaces removeFaces.C )
diff --git a/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt b/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt
index c4d732c9b..21627750c 100644
--- a/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( selectCells ${SRCS} )
 
 set_target_properties( selectCells PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}selectCells
+  OUTPUT_NAME freefoam-selectCells
   )
 
 target_link_libraries( selectCells
@@ -48,7 +48,7 @@ target_link_libraries( selectCells
 install( TARGETS selectCells
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( selectCells selectCells.C )
diff --git a/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt b/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt
index 495bc574c..03b1785df 100644
--- a/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( splitCells ${SRCS} )
 
 set_target_properties( splitCells PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}splitCells
+  OUTPUT_NAME freefoam-splitCells
   )
 
 target_link_libraries( splitCells
@@ -47,7 +47,7 @@ target_link_libraries( splitCells
 install( TARGETS splitCells
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( splitCells splitCells.C )
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt
index af8e9eff2..a70e63f7a 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( ${CCMIO_INCLUDE_DIRS} )
 add_executable( ccm26ToFoam ${SRCS} )
 
 set_target_properties( ccm26ToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}ccm26ToFoam
+  OUTPUT_NAME freefoam-ccm26ToFoam
   )
 
 target_link_libraries( ccm26ToFoam
@@ -49,7 +49,7 @@ target_link_libraries( ccm26ToFoam
 install( TARGETS ccm26ToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( ccm26ToFoam ccm26ToFoam.C )
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt
index fd5924fe6..8c8c11a99 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt
@@ -38,7 +38,7 @@ include( files.cmake )
 add_executable( ansysToFoam ${SRCS} )
 
 set_target_properties( ansysToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}ansysToFoam
+  OUTPUT_NAME freefoam-ansysToFoam
   )
 
 target_link_libraries( ansysToFoam
@@ -48,7 +48,7 @@ target_link_libraries( ansysToFoam
 install( TARGETS ansysToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
 )
 
 ff_add_executable_to_doc_index( ansysToFoam ansysToFoam.L )
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt
index e081da5a5..c69edfb6d 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( cfx4ToFoam ${SRCS} )
 
 set_target_properties( cfx4ToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}cfx4ToFoam
+  OUTPUT_NAME freefoam-cfx4ToFoam
   )
 
 target_link_libraries( cfx4ToFoam
@@ -44,7 +44,7 @@ target_link_libraries( cfx4ToFoam
 install( TARGETS cfx4ToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( cfx4ToFoam cfx4ToFoam.C )
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt
index 911b52c4b..96c2ac3f6 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt
@@ -38,7 +38,7 @@ include( files.cmake )
 add_executable( fluent3DMeshToFoam ${SRCS} )
 
 set_target_properties( fluent3DMeshToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}fluent3DMeshToFoam
+  OUTPUT_NAME freefoam-fluent3DMeshToFoam
   )
 
 target_link_libraries( fluent3DMeshToFoam
@@ -50,7 +50,7 @@ target_link_libraries( fluent3DMeshToFoam
 install( TARGETS fluent3DMeshToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
 )
 
 ff_add_executable_to_doc_index( fluent3DMeshToFoam fluent3DMeshToFoam.L )
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt
index a0f2ad6ca..dcbf6e7bd 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
 add_executable( fluentMeshToFoam ${SRCS} )
 
 set_target_properties( fluentMeshToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}fluentMeshToFoam
+  OUTPUT_NAME freefoam-fluentMeshToFoam
   )
 
 target_link_libraries( fluentMeshToFoam
@@ -52,7 +52,7 @@ target_link_libraries( fluentMeshToFoam
 install( TARGETS fluentMeshToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
 )
 
 ff_add_executable_to_doc_index( fluentMeshToFoam fluentMeshToFoam.L )
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt b/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt
index ab9586454..33507cd9c 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamMeshToFluent ${SRCS} )
 
 set_target_properties( foamMeshToFluent PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamMeshToFluent
+  OUTPUT_NAME freefoam-foamMeshToFluent
   )
 
 target_link_libraries( foamMeshToFluent
@@ -45,7 +45,7 @@ target_link_libraries( foamMeshToFluent
 install( TARGETS foamMeshToFluent
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamMeshToFluent foamMeshToFluent.C )
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt b/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt
index d02a737a9..a5533386c 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamToStarMesh ${SRCS} )
 
 set_target_properties( foamToStarMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamToStarMesh
+  OUTPUT_NAME freefoam-foamToStarMesh
   )
 
 target_link_libraries( foamToStarMesh
@@ -45,7 +45,7 @@ target_link_libraries( foamToStarMesh
 install( TARGETS foamToStarMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamToStarMesh foamToStarMesh.C )
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt
index 58079da7b..5f740cc06 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt
@@ -38,7 +38,7 @@ include( files.cmake )
 add_executable( gambitToFoam ${SRCS} )
 
 set_target_properties( gambitToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}gambitToFoam
+  OUTPUT_NAME freefoam-gambitToFoam
   )
 
 target_link_libraries( gambitToFoam
@@ -48,7 +48,7 @@ target_link_libraries( gambitToFoam
 install( TARGETS gambitToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
 )
 
 ff_add_executable_to_doc_index( gambitToFoam gambitToFoam.L )
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt
index 0fc7e77a7..4c47b7480 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( gmshToFoam ${SRCS} )
 
 set_target_properties( gmshToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}gmshToFoam
+  OUTPUT_NAME freefoam-gmshToFoam
   )
 
 target_link_libraries( gmshToFoam
@@ -46,7 +46,7 @@ target_link_libraries( gmshToFoam
 install( TARGETS gmshToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( gmshToFoam gmshToFoam.C )
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt
index 32001229e..a86dcec40 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( ideasUnvToFoam ${SRCS} )
 
 set_target_properties( ideasUnvToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}ideasUnvToFoam
+  OUTPUT_NAME freefoam-ideasUnvToFoam
   )
 
 target_link_libraries( ideasUnvToFoam
@@ -46,7 +46,7 @@ target_link_libraries( ideasUnvToFoam
 install( TARGETS ideasUnvToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( ideasUnvToFoam ideasUnvToFoam.C )
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt
index e4600ab0f..0d89deb2f 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( kivaToFoam ${SRCS} )
 
 set_target_properties( kivaToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}kivaToFoam
+  OUTPUT_NAME freefoam-kivaToFoam
   )
 
 target_link_libraries( kivaToFoam
@@ -44,7 +44,7 @@ target_link_libraries( kivaToFoam
 install( TARGETS kivaToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( kivaToFoam kivaToFoam.C )
diff --git a/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt
index e8a6de5a7..dce0f63ad 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mshToFoam ${SRCS} )
 
 set_target_properties( mshToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mshToFoam
+  OUTPUT_NAME freefoam-mshToFoam
   )
 
 target_link_libraries( mshToFoam
@@ -44,7 +44,7 @@ target_link_libraries( mshToFoam
 install( TARGETS mshToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mshToFoam mshToFoam.C )
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt
index d7c7e1218..540588f57 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( netgenNeutralToFoam ${SRCS} )
 
 set_target_properties( netgenNeutralToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}netgenNeutralToFoam
+  OUTPUT_NAME freefoam-netgenNeutralToFoam
   )
 
 target_link_libraries( netgenNeutralToFoam
@@ -44,7 +44,7 @@ target_link_libraries( netgenNeutralToFoam
 install( TARGETS netgenNeutralToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( netgenNeutralToFoam netgenNeutralToFoam.C )
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt
index a138ed4bc..620700dc8 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( plot3dToFoam ${SRCS} )
 
 set_target_properties( plot3dToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}plot3dToFoam
+  OUTPUT_NAME freefoam-plot3dToFoam
   )
 
 target_link_libraries( plot3dToFoam
@@ -45,7 +45,7 @@ target_link_libraries( plot3dToFoam
 install( TARGETS plot3dToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( plot3dToFoam plot3dToFoam.C )
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt b/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt
index 3f37f9d17..6b71805d0 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( polyDualMesh ${SRCS} )
 
 set_target_properties( polyDualMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}polyDualMesh
+  OUTPUT_NAME freefoam-polyDualMesh
   )
 
 target_link_libraries( polyDualMesh
@@ -47,7 +47,7 @@ target_link_libraries( polyDualMesh
 install( TARGETS polyDualMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( polyDualMesh polyDualMeshApp.C )
diff --git a/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt
index 04e397ae9..7513ddd75 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( sammToFoam ${SRCS} )
 
 set_target_properties( sammToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}sammToFoam
+  OUTPUT_NAME freefoam-sammToFoam
   )
 
 target_link_libraries( sammToFoam
@@ -44,7 +44,7 @@ target_link_libraries( sammToFoam
 install( TARGETS sammToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( sammToFoam sammToFoam.C )
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt
index d227b193a..2df46c962 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( star4ToFoam ${SRCS} )
 
 set_target_properties( star4ToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}star4ToFoam
+  OUTPUT_NAME freefoam-star4ToFoam
   )
 
 target_link_libraries( star4ToFoam
@@ -45,7 +45,7 @@ target_link_libraries( star4ToFoam
 install( TARGETS star4ToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( star4ToFoam star4ToFoam.C )
diff --git a/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt
index c832a26e4..666aea29e 100644
--- a/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( starToFoam ${SRCS} )
 
 set_target_properties( starToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}starToFoam
+  OUTPUT_NAME freefoam-starToFoam
   )
 
 target_link_libraries( starToFoam
@@ -44,7 +44,7 @@ target_link_libraries( starToFoam
 install( TARGETS starToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( starToFoam starToFoam.C )
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt
index bd4a0168a..6d6758def 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( tetgenToFoam ${SRCS} )
 
 set_target_properties( tetgenToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}tetgenToFoam
+  OUTPUT_NAME freefoam-tetgenToFoam
   )
 
 target_link_libraries( tetgenToFoam
@@ -44,7 +44,7 @@ target_link_libraries( tetgenToFoam
 install( TARGETS tetgenToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( tetgenToFoam tetgenToFoam.C )
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt b/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt
index afb6d9d8d..7d89b4fd3 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( writeMeshObj ${SRCS} )
 
 set_target_properties( writeMeshObj PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}writeMeshObj
+  OUTPUT_NAME freefoam-writeMeshObj
   )
 
 target_link_libraries( writeMeshObj
@@ -45,7 +45,7 @@ target_link_libraries( writeMeshObj
 install( TARGETS writeMeshObj
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( writeMeshObj writeMeshObj.C )
diff --git a/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt b/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt
index 76c016045..cc9090d91 100644
--- a/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories( curvedEdges )
 add_executable( blockMesh ${SRCS} )
 
 set_target_properties( blockMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}blockMesh
+  OUTPUT_NAME freefoam-blockMesh
   )
 
 target_link_libraries( blockMesh
@@ -48,7 +48,7 @@ target_link_libraries( blockMesh
 install( TARGETS blockMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( blockMesh blockMeshApp.C )
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt b/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt
index c6537b008..4bf127060 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( extrude2DMesh ${SRCS} )
 
 set_target_properties( extrude2DMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}extrude2DMesh
+  OUTPUT_NAME freefoam-extrude2DMesh
   )
 
 target_link_libraries( extrude2DMesh
@@ -47,7 +47,7 @@ target_link_libraries( extrude2DMesh
 install( TARGETS extrude2DMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( extrude2DMesh doExtrude2DMesh.C )
diff --git a/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt b/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt
index 444df34c1..d3ad62808 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories( extrudedMesh )
 add_executable( extrudeMesh ${SRCS} )
 
 set_target_properties( extrudeMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}extrudeMesh
+  OUTPUT_NAME freefoam-extrudeMesh
   )
 
 target_link_libraries( extrudeMesh
@@ -51,7 +51,7 @@ target_link_libraries( extrudeMesh
 install( TARGETS extrudeMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
 )
 
 ff_add_executable_to_doc_index( extrudeMesh extrudeMesh.C )
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/CMakeLists.txt b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/CMakeLists.txt
index 8167a470a..36f6f7b2e 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/CMakeLists.txt
@@ -50,7 +50,7 @@ install( TARGETS extrudeModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/extrudeModel COMPONENT dev
   )
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt b/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt
index 976e91799..9154ab196 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( snappyHexMesh ${SRCS} )
 
 set_target_properties( snappyHexMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}snappyHexMesh
+  OUTPUT_NAME freefoam-snappyHexMesh
   )
 
 target_link_libraries( snappyHexMesh
@@ -49,7 +49,7 @@ target_link_libraries( snappyHexMesh
 install( TARGETS snappyHexMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( snappyHexMesh snappyHexMesh.C )
diff --git a/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt
index 7ae2080e5..8d7b77ed5 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( attachMesh ${SRCS} )
 
 set_target_properties( attachMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}attachMesh
+  OUTPUT_NAME freefoam-attachMesh
   )
 
 target_link_libraries( attachMesh
@@ -46,7 +46,7 @@ target_link_libraries( attachMesh
 install( TARGETS attachMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( attachMesh attachMesh.C )
diff --git a/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt b/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt
index 5b354ef0d..8dafb342f 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( autoPatch ${SRCS} )
 
 set_target_properties( autoPatch PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}autoPatch
+  OUTPUT_NAME freefoam-autoPatch
   )
 
 target_link_libraries( autoPatch
@@ -47,7 +47,7 @@ target_link_libraries( autoPatch
 install( TARGETS autoPatch
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( autoPatch autoPatch.C )
diff --git a/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt
index 27859eaa1..5ff23931b 100644
--- a/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( cellSet ${SRCS} )
 
 set_target_properties( cellSet PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}cellSet
+  OUTPUT_NAME freefoam-cellSet
   )
 
 target_link_libraries( cellSet
@@ -45,7 +45,7 @@ target_link_libraries( cellSet
 install( TARGETS cellSet
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( cellSet cellSet.C )
diff --git a/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt
index 024a93d81..07741ed86 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( checkMesh ${SRCS} )
 
 set_target_properties( checkMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}checkMesh
+  OUTPUT_NAME freefoam-checkMesh
   )
 
 target_link_libraries( checkMesh
@@ -45,7 +45,7 @@ target_link_libraries( checkMesh
 install( TARGETS checkMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( checkMesh checkMesh.C )
diff --git a/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt b/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt
index ce50430f3..6aed6e4f7 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( createBaffles ${SRCS} )
 
 set_target_properties( createBaffles PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}createBaffles
+  OUTPUT_NAME freefoam-createBaffles
   )
 
 target_link_libraries( createBaffles
@@ -47,7 +47,7 @@ target_link_libraries( createBaffles
 install( TARGETS createBaffles
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( createBaffles createBaffles.C )
diff --git a/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt b/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt
index 4058e3424..d04482af6 100644
--- a/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( createPatch ${SRCS} )
 
 set_target_properties( createPatch PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}createPatch
+  OUTPUT_NAME freefoam-createPatch
   )
 
 target_link_libraries( createPatch
@@ -46,7 +46,7 @@ target_link_libraries( createPatch
 install( TARGETS createPatch
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( createPatch createPatch.C )
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt b/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt
index 7d8d482f2..d822569d4 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( deformedGeom ${SRCS} )
 
 set_target_properties( deformedGeom PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}deformedGeom
+  OUTPUT_NAME freefoam-deformedGeom
   )
 
 target_link_libraries( deformedGeom
@@ -46,7 +46,7 @@ target_link_libraries( deformedGeom
 install( TARGETS deformedGeom
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( deformedGeom deformedGeom.C )
diff --git a/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt
index 415940805..9aff05042 100644
--- a/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( faceSet ${SRCS} )
 
 set_target_properties( faceSet PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}faceSet
+  OUTPUT_NAME freefoam-faceSet
   )
 
 target_link_libraries( faceSet
@@ -45,7 +45,7 @@ target_link_libraries( faceSet
 install( TARGETS faceSet
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( faceSet faceSet.C )
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt
index d5cbaf2a6..5d413f4fd 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( flattenMesh ${SRCS} )
 
 set_target_properties( flattenMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}flattenMesh
+  OUTPUT_NAME freefoam-flattenMesh
   )
 
 target_link_libraries( flattenMesh
@@ -46,7 +46,7 @@ target_link_libraries( flattenMesh
 install( TARGETS flattenMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( flattenMesh flattenMesh.C )
diff --git a/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt b/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt
index 4133b49e1..d92bd4502 100644
--- a/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( insideCells ${SRCS} )
 
 set_target_properties( insideCells PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}insideCells
+  OUTPUT_NAME freefoam-insideCells
   )
 
 target_link_libraries( insideCells
@@ -46,7 +46,7 @@ target_link_libraries( insideCells
 install( TARGETS insideCells
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( insideCells insideCells.C )
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt b/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt
index ab749df03..e369d52c6 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mergeMeshes ${SRCS} )
 
 set_target_properties( mergeMeshes PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mergeMeshes
+  OUTPUT_NAME freefoam-mergeMeshes
   )
 
 target_link_libraries( mergeMeshes
@@ -46,7 +46,7 @@ target_link_libraries( mergeMeshes
 install( TARGETS mergeMeshes
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mergeMeshes mergeMeshes.C )
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt
index 7cbbe7673..e1d3a5641 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mergeOrSplitBaffles ${SRCS} )
 
 set_target_properties( mergeOrSplitBaffles PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mergeOrSplitBaffles
+  OUTPUT_NAME freefoam-mergeOrSplitBaffles
   )
 
 target_link_libraries( mergeOrSplitBaffles
@@ -47,7 +47,7 @@ target_link_libraries( mergeOrSplitBaffles
 install( TARGETS mergeOrSplitBaffles
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mergeOrSplitBaffles mergeOrSplitBaffles.C )
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt
index 90a6a764e..b3f684c20 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mirrorMesh ${SRCS} )
 
 set_target_properties( mirrorMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mirrorMesh
+  OUTPUT_NAME freefoam-mirrorMesh
   )
 
 target_link_libraries( mirrorMesh
@@ -45,7 +45,7 @@ target_link_libraries( mirrorMesh
 install( TARGETS mirrorMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mirrorMesh mirrorMesh.C )
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt
index fda59e211..69f5001ff 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( moveDynamicMesh ${SRCS} )
 
 set_target_properties( moveDynamicMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}moveDynamicMesh
+  OUTPUT_NAME freefoam-moveDynamicMesh
   )
 
 target_link_libraries( moveDynamicMesh
@@ -47,7 +47,7 @@ target_link_libraries( moveDynamicMesh
 install( TARGETS moveDynamicMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( moveDynamicMesh moveDynamicMesh.C )
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt
index 83a61c1fa..5da184c3e 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( moveEngineMesh ${SRCS} )
 
 set_target_properties( moveEngineMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}moveEngineMesh
+  OUTPUT_NAME freefoam-moveEngineMesh
   )
 
 target_link_libraries( moveEngineMesh
@@ -47,7 +47,7 @@ target_link_libraries( moveEngineMesh
 install( TARGETS moveEngineMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( moveEngineMesh moveEngineMesh.C )
diff --git a/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt
index 12fa73a8a..77f557cac 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( moveMesh ${SRCS} )
 
 set_target_properties( moveMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}moveMesh
+  OUTPUT_NAME freefoam-moveMesh
   )
 
 target_link_libraries( moveMesh
@@ -47,7 +47,7 @@ target_link_libraries( moveMesh
 install( TARGETS moveMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( moveMesh moveMesh.C )
diff --git a/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt b/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt
index eea76d074..3f007edcb 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( objToVTK ${SRCS} )
 
 set_target_properties( objToVTK PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}objToVTK
+  OUTPUT_NAME freefoam-objToVTK
   )
 
 target_link_libraries( objToVTK
@@ -44,7 +44,7 @@ target_link_libraries( objToVTK
 install( TARGETS objToVTK
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( objToVTK objToVTK.C )
diff --git a/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt
index dd7caa047..7f001c3f0 100644
--- a/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( pointSet ${SRCS} )
 
 set_target_properties( pointSet PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}pointSet
+  OUTPUT_NAME freefoam-pointSet
   )
 
 target_link_libraries( pointSet
@@ -45,7 +45,7 @@ target_link_libraries( pointSet
 install( TARGETS pointSet
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( pointSet pointSet.C )
diff --git a/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt
index 1d382bd2b..1a3bb3e18 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( refineMesh ${SRCS} )
 
 set_target_properties( refineMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}refineMesh
+  OUTPUT_NAME freefoam-refineMesh
   )
 
 target_link_libraries( refineMesh
@@ -46,7 +46,7 @@ target_link_libraries( refineMesh
 install( TARGETS refineMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( refineMesh refineMesh.C )
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt
index 27afb39eb..99426dd30 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( renumberMesh ${SRCS} )
 
 set_target_properties( renumberMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}renumberMesh
+  OUTPUT_NAME freefoam-renumberMesh
   )
 
 target_link_libraries( renumberMesh
@@ -48,7 +48,7 @@ target_link_libraries( renumberMesh
 install( TARGETS renumberMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( renumberMesh renumberMesh.C )
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt
index 13247fe0b..0477151a3 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( rotateMesh ${SRCS} )
 
 set_target_properties( rotateMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}rotateMesh
+  OUTPUT_NAME freefoam-rotateMesh
   )
 
 target_link_libraries( rotateMesh
@@ -45,7 +45,7 @@ target_link_libraries( rotateMesh
 install( TARGETS rotateMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( rotateMesh rotateMesh.C )
diff --git a/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt
index ec8ae4c11..a5127771d 100644
--- a/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt
@@ -38,7 +38,7 @@ endif( READLINE_FOUND )
 add_executable( setSet ${SRCS} )
 
 set_target_properties( setSet PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}setSet
+  OUTPUT_NAME freefoam-setSet
   )
 
 target_link_libraries( setSet
@@ -50,7 +50,7 @@ target_link_libraries( setSet
 install( TARGETS setSet
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( setSet setSet.C )
diff --git a/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt b/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt
index 500d56037..c1c7d59ba 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( setsToZones ${SRCS} )
 
 set_target_properties( setsToZones PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}setsToZones
+  OUTPUT_NAME freefoam-setsToZones
   )
 
 target_link_libraries( setsToZones
@@ -45,7 +45,7 @@ target_link_libraries( setsToZones
 install( TARGETS setsToZones
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( setsToZones setsToZones.C )
diff --git a/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt
index d3ee1b303..53aa97deb 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( splitMesh ${SRCS} )
 
 set_target_properties( splitMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}splitMesh
+  OUTPUT_NAME freefoam-splitMesh
   )
 
 target_link_libraries( splitMesh
@@ -46,7 +46,7 @@ target_link_libraries( splitMesh
 install( TARGETS splitMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( splitMesh splitMesh.C )
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt b/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt
index a931c0875..0e2147a83 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( splitMeshRegions ${SRCS} )
 
 set_target_properties( splitMeshRegions PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}splitMeshRegions
+  OUTPUT_NAME freefoam-splitMeshRegions
   )
 
 target_link_libraries( splitMeshRegions
@@ -47,7 +47,7 @@ target_link_libraries( splitMeshRegions
 install( TARGETS splitMeshRegions
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( splitMeshRegions splitMeshRegions.C )
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt
index 978185d05..c457a76e7 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( stitchMesh ${SRCS} )
 
 set_target_properties( stitchMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}stitchMesh
+  OUTPUT_NAME freefoam-stitchMesh
   )
 
 target_link_libraries( stitchMesh
@@ -47,7 +47,7 @@ target_link_libraries( stitchMesh
 install( TARGETS stitchMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( stitchMesh stitchMesh.C )
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt
index 2aeee91de..32887659f 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( subsetMesh ${SRCS} )
 
 set_target_properties( subsetMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}subsetMesh
+  OUTPUT_NAME freefoam-subsetMesh
   )
 
 target_link_libraries( subsetMesh
@@ -46,7 +46,7 @@ target_link_libraries( subsetMesh
 install( TARGETS subsetMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( subsetMesh subsetMesh.C )
diff --git a/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt b/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt
index bf1ad77b8..de870340e 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( transformPoints ${SRCS} )
 
 set_target_properties( transformPoints PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}transformPoints
+  OUTPUT_NAME freefoam-transformPoints
   )
 
 target_link_libraries( transformPoints
@@ -45,7 +45,7 @@ target_link_libraries( transformPoints
 install( TARGETS transformPoints
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( transformPoints transformPoints.C )
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt
index dab1c0a4f..744425c55 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( zipUpMesh ${SRCS} )
 
 set_target_properties( zipUpMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}zipUpMesh
+  OUTPUT_NAME freefoam-zipUpMesh
   )
 
 target_link_libraries( zipUpMesh
@@ -45,7 +45,7 @@ target_link_libraries( zipUpMesh
 install( TARGETS zipUpMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( zipUpMesh zipUpMesh.C )
diff --git a/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt b/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt
index fa43289ea..b9c5233ea 100644
--- a/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( expandDictionary ${SRCS} )
 
 set_target_properties( expandDictionary PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}expandDictionary
+  OUTPUT_NAME freefoam-expandDictionary
   )
 
 target_link_libraries( expandDictionary
@@ -45,7 +45,7 @@ target_link_libraries( expandDictionary
 install( TARGETS expandDictionary
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( expandDictionary expandDictionary.C )
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/CMakeLists.txt b/applications/utilities/miscellaneous/foamDebugSwitches/CMakeLists.txt
index 23d065e84..6653a7069 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamDebugSwitches ${SRCS} )
 
 set_target_properties( foamDebugSwitches PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamDebugSwitches
+  OUTPUT_NAME freefoam-debugSwitches
   )
 
 target_link_libraries( foamDebugSwitches
@@ -84,7 +84,7 @@ target_link_libraries( foamDebugSwitches
 install( TARGETS foamDebugSwitches
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamDebugSwitches foamDebugSwitches.C )
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt b/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt
index 2bf6f98a3..81035594d 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamFormatConvert ${SRCS} )
 
 set_target_properties( foamFormatConvert PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamFormatConvert
+  OUTPUT_NAME freefoam-formatConvert
   )
 
 target_link_libraries( foamFormatConvert
@@ -47,7 +47,7 @@ target_link_libraries( foamFormatConvert
 install( TARGETS foamFormatConvert
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamFormatConvert foamFormatConvert.C )
diff --git a/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt b/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt
index cdda1db47..edb42ec4b 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamInfoExec ${SRCS} )
 
 set_target_properties( foamInfoExec PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamInfoExec
+  OUTPUT_NAME freefoam-infoExec
   )
 
 target_link_libraries( foamInfoExec
@@ -44,7 +44,7 @@ target_link_libraries( foamInfoExec
 install( TARGETS foamInfoExec
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamInfoExec foamInfoExec.C )
diff --git a/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt b/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt
index 24058bda4..2648802aa 100644
--- a/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( patchSummary ${SRCS} )
 
 set_target_properties( patchSummary PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}patchSummary
+  OUTPUT_NAME freefoam-patchSummary
   )
 
 target_link_libraries( patchSummary
@@ -45,7 +45,7 @@ target_link_libraries( patchSummary
 install( TARGETS patchSummary
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( patchSummary patchSummary.C )
diff --git a/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt b/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt
index 98b4d9e01..5a77c120f 100644
--- a/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( decomposePar ${SRCS} )
 
 set_target_properties( decomposePar PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}decomposePar
+  OUTPUT_NAME freefoam-decomposePar
   )
 
 target_link_libraries( decomposePar
@@ -48,7 +48,7 @@ target_link_libraries( decomposePar
 install( TARGETS decomposePar
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( decomposePar decomposePar.C )
diff --git a/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt b/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt
index 9361bc993..46f7b5992 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( reconstructPar ${SRCS} )
 
 set_target_properties( reconstructPar PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}reconstructPar
+  OUTPUT_NAME freefoam-reconstructPar
   )
 
 target_link_libraries( reconstructPar
@@ -47,7 +47,7 @@ target_link_libraries( reconstructPar
 install( TARGETS reconstructPar
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( reconstructPar reconstructPar.C )
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt b/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt
index dfcabea26..66d17bbb8 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( reconstructParMesh ${SRCS} )
 
 set_target_properties( reconstructParMesh PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}reconstructParMesh
+  OUTPUT_NAME freefoam-reconstructParMesh
   )
 
 target_link_libraries( reconstructParMesh
@@ -46,7 +46,7 @@ target_link_libraries( reconstructParMesh
 install( TARGETS reconstructParMesh
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( reconstructParMesh reconstructParMesh.C )
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt b/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt
index 3b3970adb..6ca8f3574 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( redistributeMeshPar ${SRCS} )
 
 set_target_properties( redistributeMeshPar PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}redistributeMeshPar
+  OUTPUT_NAME freefoam-redistributeMeshPar
   )
 
 target_link_libraries( redistributeMeshPar
@@ -48,7 +48,7 @@ target_link_libraries( redistributeMeshPar
 install( TARGETS redistributeMeshPar
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( redistributeMeshPar redistributeMeshPar.C )
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt
index 8bd416646..061290186 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamDataToFluent ${SRCS} )
 
 set_target_properties( foamDataToFluent PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamDataToFluent
+  OUTPUT_NAME freefoam-foamDataToFluent
   )
 
 target_link_libraries( foamDataToFluent
@@ -45,7 +45,7 @@ target_link_libraries( foamDataToFluent
 install( TARGETS foamDataToFluent
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamDataToFluent foamDataToFluent.C )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt
index 9f73cc5fb..cd70b17bb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamToEnsight ${SRCS} )
 
 set_target_properties( foamToEnsight PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamToEnsight
+  OUTPUT_NAME freefoam-foamToEnsight
   )
 
 target_link_libraries( foamToEnsight
@@ -46,7 +46,7 @@ target_link_libraries( foamToEnsight
 install( TARGETS foamToEnsight
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamToEnsight foamToEnsight.C )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt
index d6b48b96d..24e39da27 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamToEnsightParts ${SRCS} )
 
 set_target_properties( foamToEnsightParts PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamToEnsightParts
+  OUTPUT_NAME freefoam-foamToEnsightParts
   )
 
 target_link_libraries( foamToEnsightParts
@@ -47,7 +47,7 @@ target_link_libraries( foamToEnsightParts
 install( TARGETS foamToEnsightParts
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamToEnsightParts foamToEnsightParts.C )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt
index 701308f1f..a5359899c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamToFieldview9 ${SRCS} )
 
 set_target_properties( foamToFieldview9 PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamToFieldview9
+  OUTPUT_NAME freefoam-foamToFieldview9
   )
 
 target_link_libraries( foamToFieldview9
@@ -46,7 +46,7 @@ target_link_libraries( foamToFieldview9
 install( TARGETS foamToFieldview9
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamToFieldview9 foamToFieldview9.C )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt
index 9b3525b24..649608aa7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamToGMV ${SRCS} )
 
 set_target_properties( foamToGMV PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamToGMV
+  OUTPUT_NAME freefoam-foamToGMV
   )
 
 target_link_libraries( foamToGMV
@@ -46,7 +46,7 @@ target_link_libraries( foamToGMV
 install( TARGETS foamToGMV
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamToGMV foamToGMV.C )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt
index d58dc3bcf..922cf1875 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamToVTK ${SRCS} )
 
 set_target_properties( foamToVTK PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamToVTK
+  OUTPUT_NAME freefoam-foamToVTK
   )
 
 target_link_libraries( foamToVTK
@@ -47,7 +47,7 @@ target_link_libraries( foamToVTK
 install( TARGETS foamToVTK
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamToVTK foamToVTK.C )
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt
index dc5013327..9b0c7534f 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( smapToFoam ${SRCS} )
 
 set_target_properties( smapToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}smapToFoam
+  OUTPUT_NAME freefoam-smapToFoam
   )
 
 target_link_libraries( smapToFoam
@@ -45,7 +45,7 @@ target_link_libraries( smapToFoam
 install( TARGETS smapToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( smapToFoam smapToFoam.C )
diff --git a/applications/utilities/postProcessing/foamCalc/CMakeLists.txt b/applications/utilities/postProcessing/foamCalc/CMakeLists.txt
index 1ce8ecc83..78c645eac 100644
--- a/applications/utilities/postProcessing/foamCalc/CMakeLists.txt
+++ b/applications/utilities/postProcessing/foamCalc/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamCalc ${SRCS} )
 
 set_target_properties( foamCalc PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamCalc
+  OUTPUT_NAME freefoam-calc
   )
 
 target_link_libraries( foamCalc
@@ -46,7 +46,7 @@ target_link_libraries( foamCalc
 install( TARGETS foamCalc
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamCalc foamCalc.C )
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt b/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt
index 88049c15f..53f3e0a15 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( particleTracks ${SRCS} )
 
 set_target_properties( particleTracks PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}particleTracks
+  OUTPUT_NAME freefoam-particleTracks
   )
 
 target_link_libraries( particleTracks
@@ -46,7 +46,7 @@ target_link_libraries( particleTracks
 install( TARGETS particleTracks
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( particleTracks particleTracks.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt
index d5cba0b7d..aa60336c4 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( dsmcFieldsCalc ${SRCS} )
 
 set_target_properties( dsmcFieldsCalc PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}dsmcFieldsCalc
+  OUTPUT_NAME freefoam-dsmcFieldsCalc
   )
 
 target_link_libraries( dsmcFieldsCalc
@@ -50,7 +50,7 @@ target_link_libraries( dsmcFieldsCalc
 install( TARGETS dsmcFieldsCalc
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( dsmcFieldsCalc dsmcFieldsCalc.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt
index c903c1342..fe41c7e99 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( engineCompRatio ${SRCS} )
 
 set_target_properties( engineCompRatio PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}engineCompRatio
+  OUTPUT_NAME freefoam-engineCompRatio
   )
 
 target_link_libraries( engineCompRatio
@@ -47,7 +47,7 @@ target_link_libraries( engineCompRatio
 install( TARGETS engineCompRatio
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( engineCompRatio engineCompRatio.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt
index e67a74fb5..542651f62 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( execFlowFunctionObjects ${SRCS} )
 
 set_target_properties( execFlowFunctionObjects PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}execFlowFunctionObjects
+  OUTPUT_NAME freefoam-execFlowFunctionObjects
   )
 
 target_link_libraries( execFlowFunctionObjects
@@ -53,7 +53,7 @@ target_link_libraries( execFlowFunctionObjects
 install( TARGETS execFlowFunctionObjects
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( execFlowFunctionObjects execFlowFunctionObjects.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt
index df9d28bc6..96c5c5f97 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( pdfPlot ${SRCS} )
 
 set_target_properties( pdfPlot PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}pdfPlot
+  OUTPUT_NAME freefoam-pdfPlot
   )
 
 target_link_libraries( pdfPlot
@@ -45,7 +45,7 @@ target_link_libraries( pdfPlot
 install( TARGETS pdfPlot
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( pdfPlot pdfPlot.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt
index bc65660f7..499ac0baa 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( postChannel ${SRCS} )
 
 set_target_properties( postChannel PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}postChannel
+  OUTPUT_NAME freefoam-postChannel
   )
 
 target_link_libraries( postChannel
@@ -47,7 +47,7 @@ target_link_libraries( postChannel
 install( TARGETS postChannel
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( postChannel postChannel.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt
index 12bdbb660..63878c7cd 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( ptot ${SRCS} )
 
 set_target_properties( ptot PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}ptot
+  OUTPUT_NAME freefoam-ptot
   )
 
 target_link_libraries( ptot
@@ -45,7 +45,7 @@ target_link_libraries( ptot
 install( TARGETS ptot
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( ptot ptot.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt
index c398f659f..6316c9a34 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( wdot ${SRCS} )
 
 set_target_properties( wdot PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}wdot
+  OUTPUT_NAME freefoam-wdot
   )
 
 target_link_libraries( wdot
@@ -45,7 +45,7 @@ target_link_libraries( wdot
 install( TARGETS wdot
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( wdot wdot.C )
diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt
index 064c2ff5c..175a937e6 100644
--- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( writeCellCentres ${SRCS} )
 
 set_target_properties( writeCellCentres PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}writeCellCentres
+  OUTPUT_NAME freefoam-writeCellCentres
   )
 
 target_link_libraries( writeCellCentres
@@ -45,7 +45,7 @@ target_link_libraries( writeCellCentres
 install( TARGETS writeCellCentres
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( writeCellCentres writeCellCentres.C )
diff --git a/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt b/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt
index 634f4e2b2..6a0945b7d 100644
--- a/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt
+++ b/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( patchAverage ${SRCS} )
 
 set_target_properties( patchAverage PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}patchAverage
+  OUTPUT_NAME freefoam-patchAverage
   )
 
 target_link_libraries( patchAverage
@@ -45,7 +45,7 @@ target_link_libraries( patchAverage
 install( TARGETS patchAverage
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( patchAverage patchAverage.C )
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt b/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt
index e30341134..4cb211da5 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( patchIntegrate ${SRCS} )
 
 set_target_properties( patchIntegrate PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}patchIntegrate
+  OUTPUT_NAME freefoam-patchIntegrate
   )
 
 target_link_libraries( patchIntegrate
@@ -45,7 +45,7 @@ target_link_libraries( patchIntegrate
 install( TARGETS patchIntegrate
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( patchIntegrate patchIntegrate.C )
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt b/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt
index 152a1a004..1f2027dd8 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt
+++ b/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( probeLocations ${SRCS} )
 
 set_target_properties( probeLocations PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}probeLocations
+  OUTPUT_NAME freefoam-probeLocations
   )
 
 target_link_libraries( probeLocations
@@ -49,7 +49,7 @@ target_link_libraries( probeLocations
 install( TARGETS probeLocations
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( probeLocations probeLocations.C )
diff --git a/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt b/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt
index 0cd433831..d052933bd 100644
--- a/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt
+++ b/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( sample ${SRCS} )
 
 set_target_properties( sample PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}sample
+  OUTPUT_NAME freefoam-sample
   )
 
 target_link_libraries( sample
@@ -50,7 +50,7 @@ target_link_libraries( sample
 install( TARGETS sample
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( sample sample.C )
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt b/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt
index 682676dea..c31f3ac3d 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( pPrime2 ${SRCS} )
 
 set_target_properties( pPrime2 PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}pPrime2
+  OUTPUT_NAME freefoam-pPrime2
   )
 
 target_link_libraries( pPrime2
@@ -45,7 +45,7 @@ target_link_libraries( pPrime2
 install( TARGETS pPrime2
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( pPrime2 pPrime2.C )
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt b/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt
index 912ceb9e7..a2b92ae0b 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt
+++ b/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( stressComponents ${SRCS} )
 
 set_target_properties( stressComponents PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}stressComponents
+  OUTPUT_NAME freefoam-stressComponents
   )
 
 target_link_libraries( stressComponents
@@ -47,7 +47,7 @@ target_link_libraries( stressComponents
 install( TARGETS stressComponents
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( stressComponents stressComponents.C )
diff --git a/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt b/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt
index 3ae43e482..6ccce7120 100644
--- a/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt
+++ b/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( R ${SRCS} )
 
 set_target_properties( R PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}R
+  OUTPUT_NAME freefoam-R
   )
 
 target_link_libraries( R
@@ -47,7 +47,7 @@ target_link_libraries( R
 install( TARGETS R
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( R R.C )
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt
index 7724cc89a..f9c08e795 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( createTurbulenceFields ${SRCS} )
 
 set_target_properties( createTurbulenceFields PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}createTurbulenceFields
+  OUTPUT_NAME freefoam-createTurbulenceFields
   )
 
 target_link_libraries( createTurbulenceFields
@@ -47,7 +47,7 @@ target_link_libraries( createTurbulenceFields
 install( TARGETS createTurbulenceFields
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( createTurbulenceFields createTurbulenceFields.C )
diff --git a/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt
index ed30f5da1..d1e541b2f 100644
--- a/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( Co ${SRCS} )
 
 set_target_properties( Co PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}Co
+  OUTPUT_NAME freefoam-Co
   )
 
 target_link_libraries( Co
@@ -46,7 +46,7 @@ target_link_libraries( Co
 install( TARGETS Co
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( Co Co.C )
diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt
index 51828fb1d..dad3d5c8b 100644
--- a/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( Lambda2 ${SRCS} )
 
 set_target_properties( Lambda2 PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}Lambda2
+  OUTPUT_NAME freefoam-Lambda2
   )
 
 target_link_libraries( Lambda2
@@ -46,7 +46,7 @@ target_link_libraries( Lambda2
 install( TARGETS Lambda2
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( Lambda2 Lambda2.C )
diff --git a/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt
index 4cf0b672c..412bf11d1 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( Mach ${SRCS} )
 
 set_target_properties( Mach PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}Mach
+  OUTPUT_NAME freefoam-Mach
   )
 
 target_link_libraries( Mach
@@ -48,7 +48,7 @@ target_link_libraries( Mach
 install( TARGETS Mach
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( Mach Mach.C )
diff --git a/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt
index 2e52c26e3..1297fbcff 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( Pe ${SRCS} )
 
 set_target_properties( Pe PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}Pe
+  OUTPUT_NAME freefoam-Pe
   )
 
 target_link_libraries( Pe
@@ -54,7 +54,7 @@ target_link_libraries( Pe
 install( TARGETS Pe
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( Pe Pe.C )
diff --git a/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt
index e4e3afba4..4cf78934e 100644
--- a/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( Q ${SRCS} )
 
 set_target_properties( Q PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}Q
+  OUTPUT_NAME freefoam-Q
   )
 
 target_link_libraries( Q
@@ -46,7 +46,7 @@ target_link_libraries( Q
 install( TARGETS Q
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( Q Q.C )
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt
index 20e400e38..5bbeda727 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( enstrophy ${SRCS} )
 
 set_target_properties( enstrophy PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}enstrophy
+  OUTPUT_NAME freefoam-enstrophy
   )
 
 target_link_libraries( enstrophy
@@ -46,7 +46,7 @@ target_link_libraries( enstrophy
 install( TARGETS enstrophy
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( enstrophy enstrophy.C )
diff --git a/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt
index cbb5cb27d..29087a7d3 100644
--- a/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( flowType ${SRCS} )
 
 set_target_properties( flowType PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}flowType
+  OUTPUT_NAME freefoam-flowType
   )
 
 target_link_libraries( flowType
@@ -46,7 +46,7 @@ target_link_libraries( flowType
 install( TARGETS flowType
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( flowType flowType.C )
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt
index fe5e2cd82..64dd6045b 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( streamFunction ${SRCS} )
 
 set_target_properties( streamFunction PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}streamFunction
+  OUTPUT_NAME freefoam-streamFunction
   )
 
 target_link_libraries( streamFunction
@@ -45,7 +45,7 @@ target_link_libraries( streamFunction
 install( TARGETS streamFunction
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( streamFunction streamFunction.C )
diff --git a/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt
index 04752d2c3..cd8a5b065 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( uprime ${SRCS} )
 
 set_target_properties( uprime PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}uprime
+  OUTPUT_NAME freefoam-uprime
   )
 
 target_link_libraries( uprime
@@ -46,7 +46,7 @@ target_link_libraries( uprime
 install( TARGETS uprime
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( uprime uprime.C )
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt
index 16d955af6..171440083 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( vorticity ${SRCS} )
 
 set_target_properties( vorticity PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}vorticity
+  OUTPUT_NAME freefoam-vorticity
   )
 
 target_link_libraries( vorticity
@@ -46,7 +46,7 @@ target_link_libraries( vorticity
 install( TARGETS vorticity
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( vorticity vorticity.C )
diff --git a/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt b/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt
index aaaebd4fe..fbbbc32f3 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( wallGradU ${SRCS} )
 
 set_target_properties( wallGradU PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}wallGradU
+  OUTPUT_NAME freefoam-wallGradU
   )
 
 target_link_libraries( wallGradU
@@ -45,7 +45,7 @@ target_link_libraries( wallGradU
 install( TARGETS wallGradU
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( wallGradU wallGradU.C )
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt b/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt
index 6041dacc3..0ea37e23c 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( wallHeatFlux ${SRCS} )
 
 set_target_properties( wallHeatFlux PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}wallHeatFlux
+  OUTPUT_NAME freefoam-wallHeatFlux
   )
 
 target_link_libraries( wallHeatFlux
@@ -49,7 +49,7 @@ target_link_libraries( wallHeatFlux
 install( TARGETS wallHeatFlux
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( wallHeatFlux wallHeatFlux.C )
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt b/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt
index 90d450efb..fe14aea44 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( wallShearStress ${SRCS} )
 
 set_target_properties( wallShearStress PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}wallShearStress
+  OUTPUT_NAME freefoam-wallShearStress
   )
 
 target_link_libraries( wallShearStress
@@ -47,7 +47,7 @@ target_link_libraries( wallShearStress
 install( TARGETS wallShearStress
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( wallShearStress wallShearStress.C )
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt b/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt
index dd2396451..09d567bf3 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( yPlusLES ${SRCS} )
 
 set_target_properties( yPlusLES PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}yPlusLES
+  OUTPUT_NAME freefoam-yPlusLES
   )
 
 target_link_libraries( yPlusLES
@@ -47,7 +47,7 @@ target_link_libraries( yPlusLES
 install( TARGETS yPlusLES
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( yPlusLES yPlusLES.C )
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt b/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt
index d830081ab..7b70c7839 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( yPlusRAS ${SRCS} )
 
 set_target_properties( yPlusRAS PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}yPlusRAS
+  OUTPUT_NAME freefoam-yPlusRAS
   )
 
 target_link_libraries( yPlusRAS
@@ -52,7 +52,7 @@ target_link_libraries( yPlusRAS
 install( TARGETS yPlusRAS
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( yPlusRAS yPlusRAS.C )
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt b/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt
index 2d1f1f053..0f31cb34f 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( applyBoundaryLayer ${SRCS} )
 
 set_target_properties( applyBoundaryLayer PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}applyBoundaryLayer
+  OUTPUT_NAME freefoam-applyBoundaryLayer
   )
 
 target_link_libraries( applyBoundaryLayer
@@ -46,7 +46,7 @@ target_link_libraries( applyBoundaryLayer
 install( TARGETS applyBoundaryLayer
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( applyBoundaryLayer applyBoundaryLayer.C )
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt
index 8a43bb563..19a6821cf 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( applyWallFunctionBoundaryConditions ${SRCS} )
 
 set_target_properties( applyWallFunctionBoundaryConditions PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}applyWallFunctionBoundaryConditions
+  OUTPUT_NAME freefoam-applyWallFunctionBoundaryConditions
   )
 
 target_link_libraries( applyWallFunctionBoundaryConditions
@@ -49,7 +49,7 @@ target_link_libraries( applyWallFunctionBoundaryConditions
 install( TARGETS applyWallFunctionBoundaryConditions
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( applyWallFunctionBoundaryConditions applyWallFunctionBoundaryConditions.C )
diff --git a/applications/utilities/preProcessing/boxTurb/CMakeLists.txt b/applications/utilities/preProcessing/boxTurb/CMakeLists.txt
index d01e33255..8b8ce50b6 100644
--- a/applications/utilities/preProcessing/boxTurb/CMakeLists.txt
+++ b/applications/utilities/preProcessing/boxTurb/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( boxTurb ${SRCS} )
 
 set_target_properties( boxTurb PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}boxTurb
+  OUTPUT_NAME freefoam-boxTurb
   )
 
 target_link_libraries( boxTurb
@@ -48,7 +48,7 @@ target_link_libraries( boxTurb
 install( TARGETS boxTurb
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( boxTurb boxTurb.C )
diff --git a/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt b/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt
index 09bc4ac9f..8d30b219d 100644
--- a/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt
+++ b/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( changeDictionary ${SRCS} )
 
 set_target_properties( changeDictionary PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}changeDictionary
+  OUTPUT_NAME freefoam-changeDictionary
   )
 
 target_link_libraries( changeDictionary
@@ -47,7 +47,7 @@ target_link_libraries( changeDictionary
 install( TARGETS changeDictionary
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( changeDictionary changeDictionary.C )
diff --git a/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt b/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt
index ea55ea68c..51da6e30a 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt
+++ b/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( dsmcInitialise ${SRCS} )
 
 set_target_properties( dsmcInitialise PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}dsmcInitialise
+  OUTPUT_NAME freefoam-dsmcInitialise
   )
 
 target_link_libraries( dsmcInitialise
@@ -48,7 +48,7 @@ target_link_libraries( dsmcInitialise
 install( TARGETS dsmcInitialise
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( dsmcInitialise dsmcInitialise.C )
diff --git a/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt b/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt
index 9876e8cd0..7600be258 100644
--- a/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt
+++ b/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( engineSwirl ${SRCS} )
 
 set_target_properties( engineSwirl PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}engineSwirl
+  OUTPUT_NAME freefoam-engineSwirl
   )
 
 target_link_libraries( engineSwirl
@@ -45,7 +45,7 @@ target_link_libraries( engineSwirl
 install( TARGETS engineSwirl
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( engineSwirl engineSwirl.C )
diff --git a/applications/utilities/preProcessing/foamUpgradeFvSolution/CMakeLists.txt b/applications/utilities/preProcessing/foamUpgradeFvSolution/CMakeLists.txt
index a8b9c9ceb..ee13b4c3c 100644
--- a/applications/utilities/preProcessing/foamUpgradeFvSolution/CMakeLists.txt
+++ b/applications/utilities/preProcessing/foamUpgradeFvSolution/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( foamUpgradeFvSolution ${SRCS} )
 
 set_target_properties( foamUpgradeFvSolution PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}foamUpgradeFvSolution
+  OUTPUT_NAME freefoam-upgradeFvSolution
   )
 
 target_link_libraries( foamUpgradeFvSolution
@@ -44,7 +44,7 @@ target_link_libraries( foamUpgradeFvSolution
 install( TARGETS foamUpgradeFvSolution
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( foamUpgradeFvSolution foamUpgradeFvSolution.C )
diff --git a/applications/utilities/preProcessing/mapFields/CMakeLists.txt b/applications/utilities/preProcessing/mapFields/CMakeLists.txt
index ff5cef74e..dc3b3f150 100644
--- a/applications/utilities/preProcessing/mapFields/CMakeLists.txt
+++ b/applications/utilities/preProcessing/mapFields/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mapFields ${SRCS} )
 
 set_target_properties( mapFields PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mapFields
+  OUTPUT_NAME freefoam-mapFields
   )
 
 target_link_libraries( mapFields
@@ -48,7 +48,7 @@ target_link_libraries( mapFields
 install( TARGETS mapFields
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mapFields mapFields.C )
diff --git a/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt b/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt
index 33250884b..00da266bf 100644
--- a/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt
+++ b/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mdInitialise ${SRCS} )
 
 set_target_properties( mdInitialise PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mdInitialise
+  OUTPUT_NAME freefoam-mdInitialise
   )
 
 target_link_libraries( mdInitialise
@@ -51,7 +51,7 @@ target_link_libraries( mdInitialise
 install( TARGETS mdInitialise
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mdInitialise mdInitialise.C )
diff --git a/applications/utilities/preProcessing/setFields/CMakeLists.txt b/applications/utilities/preProcessing/setFields/CMakeLists.txt
index b455fd9f7..e0782fcca 100644
--- a/applications/utilities/preProcessing/setFields/CMakeLists.txt
+++ b/applications/utilities/preProcessing/setFields/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( setFields ${SRCS} )
 
 set_target_properties( setFields PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}setFields
+  OUTPUT_NAME freefoam-setFields
   )
 
 target_link_libraries( setFields
@@ -46,7 +46,7 @@ target_link_libraries( setFields
 install( TARGETS setFields
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( setFields setFields.C )
diff --git a/applications/utilities/surface/surfaceAdd/CMakeLists.txt b/applications/utilities/surface/surfaceAdd/CMakeLists.txt
index 45b5d8d6b..df66754f6 100644
--- a/applications/utilities/surface/surfaceAdd/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceAdd/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceAdd ${SRCS} )
 
 set_target_properties( surfaceAdd PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceAdd
+  OUTPUT_NAME freefoam-surfaceAdd
   )
 
 target_link_libraries( surfaceAdd
@@ -46,7 +46,7 @@ target_link_libraries( surfaceAdd
 install( TARGETS surfaceAdd
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceAdd surfaceAdd.C )
diff --git a/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt b/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt
index 51cdded6f..3acafb72b 100644
--- a/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceAutoPatch ${SRCS} )
 
 set_target_properties( surfaceAutoPatch PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceAutoPatch
+  OUTPUT_NAME freefoam-surfaceAutoPatch
   )
 
 target_link_libraries( surfaceAutoPatch
@@ -46,7 +46,7 @@ target_link_libraries( surfaceAutoPatch
 install( TARGETS surfaceAutoPatch
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceAutoPatch surfaceAutoPatch.C )
diff --git a/applications/utilities/surface/surfaceCheck/CMakeLists.txt b/applications/utilities/surface/surfaceCheck/CMakeLists.txt
index 01af06ec7..7f39f7b02 100644
--- a/applications/utilities/surface/surfaceCheck/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceCheck/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceCheck ${SRCS} )
 
 set_target_properties( surfaceCheck PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceCheck
+  OUTPUT_NAME freefoam-surfaceCheck
   )
 
 target_link_libraries( surfaceCheck
@@ -46,7 +46,7 @@ target_link_libraries( surfaceCheck
 install( TARGETS surfaceCheck
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceCheck surfaceCheck.C )
diff --git a/applications/utilities/surface/surfaceClean/CMakeLists.txt b/applications/utilities/surface/surfaceClean/CMakeLists.txt
index 663eb65aa..4969859d1 100644
--- a/applications/utilities/surface/surfaceClean/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceClean/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceClean ${SRCS} )
 
 set_target_properties( surfaceClean PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceClean
+  OUTPUT_NAME freefoam-surfaceClean
   )
 
 target_link_libraries( surfaceClean
@@ -46,7 +46,7 @@ target_link_libraries( surfaceClean
 install( TARGETS surfaceClean
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceClean surfaceClean.C )
diff --git a/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt b/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt
index ab18db482..1467af69e 100644
--- a/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceCoarsen ${SRCS} )
 
 set_target_properties( surfaceCoarsen PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceCoarsen
+  OUTPUT_NAME freefoam-surfaceCoarsen
   )
 
 target_link_libraries( surfaceCoarsen
@@ -46,7 +46,7 @@ target_link_libraries( surfaceCoarsen
 install( TARGETS surfaceCoarsen
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceCoarsen surfaceCoarsen.C )
diff --git a/applications/utilities/surface/surfaceConvert/CMakeLists.txt b/applications/utilities/surface/surfaceConvert/CMakeLists.txt
index 245c5b6b7..95c259013 100644
--- a/applications/utilities/surface/surfaceConvert/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceConvert/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceConvert ${SRCS} )
 
 set_target_properties( surfaceConvert PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceConvert
+  OUTPUT_NAME freefoam-surfaceConvert
   )
 
 target_link_libraries( surfaceConvert
@@ -46,7 +46,7 @@ target_link_libraries( surfaceConvert
 install( TARGETS surfaceConvert
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceConvert surfaceConvert.C )
diff --git a/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt b/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt
index aa3ff89e4..dc23e7de7 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceFeatureConvert ${SRCS} )
 
 set_target_properties( surfaceFeatureConvert PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceFeatureConvert
+  OUTPUT_NAME freefoam-surfaceFeatureConvert
   )
 
 target_link_libraries( surfaceFeatureConvert
@@ -47,7 +47,7 @@ target_link_libraries( surfaceFeatureConvert
 install( TARGETS surfaceFeatureConvert
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceFeatureConvert surfaceFeatureConvert.C )
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt b/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt
index 26ede6865..8a6adaba9 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceFeatureExtract ${SRCS} )
 
 set_target_properties( surfaceFeatureExtract PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceFeatureExtract
+  OUTPUT_NAME freefoam-surfaceFeatureExtract
   )
 
 target_link_libraries( surfaceFeatureExtract
@@ -46,7 +46,7 @@ target_link_libraries( surfaceFeatureExtract
 install( TARGETS surfaceFeatureExtract
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceFeatureExtract surfaceFeatureExtract.C )
diff --git a/applications/utilities/surface/surfaceFind/CMakeLists.txt b/applications/utilities/surface/surfaceFind/CMakeLists.txt
index 5d7840651..79699fd59 100644
--- a/applications/utilities/surface/surfaceFind/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceFind/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceFind ${SRCS} )
 
 set_target_properties( surfaceFind PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceFind
+  OUTPUT_NAME freefoam-surfaceFind
   )
 
 target_link_libraries( surfaceFind
@@ -46,7 +46,7 @@ target_link_libraries( surfaceFind
 install( TARGETS surfaceFind
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceFind surfaceFind.C )
diff --git a/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt b/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt
index e6e536434..d370eabe6 100644
--- a/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceMeshConvert ${SRCS} )
 
 set_target_properties( surfaceMeshConvert PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceMeshConvert
+  OUTPUT_NAME freefoam-surfaceMeshConvert
   )
 
 target_link_libraries( surfaceMeshConvert
@@ -46,7 +46,7 @@ target_link_libraries( surfaceMeshConvert
 install( TARGETS surfaceMeshConvert
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceMeshConvert surfaceMeshConvert.C )
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt b/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt
index 4e3d6b23c..550502765 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceMeshConvertTesting ${SRCS} )
 
 set_target_properties( surfaceMeshConvertTesting PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceMeshConvertTesting
+  OUTPUT_NAME freefoam-surfaceMeshConvertTesting
   )
 
 target_link_libraries( surfaceMeshConvertTesting
@@ -46,7 +46,7 @@ target_link_libraries( surfaceMeshConvertTesting
 install( TARGETS surfaceMeshConvertTesting
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceMeshConvertTesting surfaceMeshConvertTesting.C )
diff --git a/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt b/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt
index b2a38ee2f..45b30a878 100644
--- a/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceMeshExport ${SRCS} )
 
 set_target_properties( surfaceMeshExport PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceMeshExport
+  OUTPUT_NAME freefoam-surfaceMeshExport
   )
 
 target_link_libraries( surfaceMeshExport
@@ -46,7 +46,7 @@ target_link_libraries( surfaceMeshExport
 install( TARGETS surfaceMeshExport
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceMeshExport surfaceMeshExport.C )
diff --git a/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt b/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt
index 16afaa087..6a8ad36ab 100644
--- a/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceMeshImport ${SRCS} )
 
 set_target_properties( surfaceMeshImport PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceMeshImport
+  OUTPUT_NAME freefoam-surfaceMeshImport
   )
 
 target_link_libraries( surfaceMeshImport
@@ -46,7 +46,7 @@ target_link_libraries( surfaceMeshImport
 install( TARGETS surfaceMeshImport
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceMeshImport surfaceMeshImport.C )
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt b/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt
index a27e2153f..55e51f42b 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceMeshTriangulate ${SRCS} )
 
 set_target_properties( surfaceMeshTriangulate PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceMeshTriangulate
+  OUTPUT_NAME freefoam-surfaceMeshTriangulate
   )
 
 target_link_libraries( surfaceMeshTriangulate
@@ -46,7 +46,7 @@ target_link_libraries( surfaceMeshTriangulate
 install( TARGETS surfaceMeshTriangulate
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceMeshTriangulate surfaceMeshTriangulate.C )
diff --git a/applications/utilities/surface/surfaceOrient/CMakeLists.txt b/applications/utilities/surface/surfaceOrient/CMakeLists.txt
index 5ead66bc3..d340ef982 100644
--- a/applications/utilities/surface/surfaceOrient/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceOrient/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceOrient ${SRCS} )
 
 set_target_properties( surfaceOrient PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceOrient
+  OUTPUT_NAME freefoam-surfaceOrient
   )
 
 target_link_libraries( surfaceOrient
@@ -46,7 +46,7 @@ target_link_libraries( surfaceOrient
 install( TARGETS surfaceOrient
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceOrient surfaceOrient.C )
diff --git a/applications/utilities/surface/surfacePointMerge/CMakeLists.txt b/applications/utilities/surface/surfacePointMerge/CMakeLists.txt
index 678cc4ed9..cbdfb965f 100644
--- a/applications/utilities/surface/surfacePointMerge/CMakeLists.txt
+++ b/applications/utilities/surface/surfacePointMerge/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfacePointMerge ${SRCS} )
 
 set_target_properties( surfacePointMerge PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfacePointMerge
+  OUTPUT_NAME freefoam-surfacePointMerge
   )
 
 target_link_libraries( surfacePointMerge
@@ -46,7 +46,7 @@ target_link_libraries( surfacePointMerge
 install( TARGETS surfacePointMerge
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfacePointMerge surfacePointMerge.C )
diff --git a/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt b/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt
index bdad2cf1d..0ea8f3505 100644
--- a/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceRedistributePar ${SRCS} )
 
 set_target_properties( surfaceRedistributePar PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceRedistributePar
+  OUTPUT_NAME freefoam-surfaceRedistributePar
   )
 
 target_link_libraries( surfaceRedistributePar
@@ -46,7 +46,7 @@ target_link_libraries( surfaceRedistributePar
 install( TARGETS surfaceRedistributePar
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceRedistributePar surfaceRedistributePar.C )
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt b/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt
index b2da58d27..cd238e1f7 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceRefineRedGreen ${SRCS} )
 
 set_target_properties( surfaceRefineRedGreen PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceRefineRedGreen
+  OUTPUT_NAME freefoam-surfaceRefineRedGreen
   )
 
 target_link_libraries( surfaceRefineRedGreen
@@ -46,7 +46,7 @@ target_link_libraries( surfaceRefineRedGreen
 install( TARGETS surfaceRefineRedGreen
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceRefineRedGreen surfaceRefineRedGreen.C )
diff --git a/applications/utilities/surface/surfaceSmooth/CMakeLists.txt b/applications/utilities/surface/surfaceSmooth/CMakeLists.txt
index 86d2e9b52..19f563993 100644
--- a/applications/utilities/surface/surfaceSmooth/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSmooth/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceSmooth ${SRCS} )
 
 set_target_properties( surfaceSmooth PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceSmooth
+  OUTPUT_NAME freefoam-surfaceSmooth
   )
 
 target_link_libraries( surfaceSmooth
@@ -46,7 +46,7 @@ target_link_libraries( surfaceSmooth
 install( TARGETS surfaceSmooth
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceSmooth surfaceSmooth.C )
diff --git a/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt b/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt
index 8f149871a..5e356a458 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceSplitByPatch ${SRCS} )
 
 set_target_properties( surfaceSplitByPatch PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceSplitByPatch
+  OUTPUT_NAME freefoam-surfaceSplitByPatch
   )
 
 target_link_libraries( surfaceSplitByPatch
@@ -46,7 +46,7 @@ target_link_libraries( surfaceSplitByPatch
 install( TARGETS surfaceSplitByPatch
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceSplitByPatch surfaceSplitByPatch.C )
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt b/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt
index d88ed5976..152e0afbf 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceSplitNonManifolds ${SRCS} )
 
 set_target_properties( surfaceSplitNonManifolds PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceSplitNonManifolds
+  OUTPUT_NAME freefoam-surfaceSplitNonManifolds
   )
 
 target_link_libraries( surfaceSplitNonManifolds
@@ -46,7 +46,7 @@ target_link_libraries( surfaceSplitNonManifolds
 install( TARGETS surfaceSplitNonManifolds
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceSplitNonManifolds surfaceSplitNonManifolds.C )
diff --git a/applications/utilities/surface/surfaceSubset/CMakeLists.txt b/applications/utilities/surface/surfaceSubset/CMakeLists.txt
index 2d7020175..8b6e8cc61 100644
--- a/applications/utilities/surface/surfaceSubset/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSubset/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceSubset ${SRCS} )
 
 set_target_properties( surfaceSubset PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceSubset
+  OUTPUT_NAME freefoam-surfaceSubset
   )
 
 target_link_libraries( surfaceSubset
@@ -46,7 +46,7 @@ target_link_libraries( surfaceSubset
 install( TARGETS surfaceSubset
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceSubset surfaceSubset.C )
diff --git a/applications/utilities/surface/surfaceToPatch/CMakeLists.txt b/applications/utilities/surface/surfaceToPatch/CMakeLists.txt
index dbfe6bace..52bcc5a3c 100644
--- a/applications/utilities/surface/surfaceToPatch/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceToPatch/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceToPatch ${SRCS} )
 
 set_target_properties( surfaceToPatch PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceToPatch
+  OUTPUT_NAME freefoam-surfaceToPatch
   )
 
 target_link_libraries( surfaceToPatch
@@ -47,7 +47,7 @@ target_link_libraries( surfaceToPatch
 install( TARGETS surfaceToPatch
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceToPatch surfaceToPatch.C )
diff --git a/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt b/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt
index 57b900b17..321cdd94f 100644
--- a/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( surfaceTransformPoints ${SRCS} )
 
 set_target_properties( surfaceTransformPoints PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}surfaceTransformPoints
+  OUTPUT_NAME freefoam-surfaceTransformPoints
   )
 
 target_link_libraries( surfaceTransformPoints
@@ -46,7 +46,7 @@ target_link_libraries( surfaceTransformPoints
 install( TARGETS surfaceTransformPoints
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( surfaceTransformPoints surfaceTransformPoints.C )
diff --git a/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt b/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt
index 055a6b9d0..217bfe11f 100644
--- a/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt
+++ b/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( IFCLookUpTableGen ${SRCS} )
 
 set_target_properties( IFCLookUpTableGen PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}IFCLookUpTableGen
+  OUTPUT_NAME freefoam-IFCLookUpTableGen
   )
 
 target_link_libraries( IFCLookUpTableGen
@@ -47,7 +47,7 @@ target_link_libraries( IFCLookUpTableGen
 install( TARGETS IFCLookUpTableGen
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( IFCLookUpTableGen IFCLookUpTableGen.C )
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt b/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt
index 76488eed3..44a57801e 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt
+++ b/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( adiabaticFlameT ${SRCS} )
 
 set_target_properties( adiabaticFlameT PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}adiabaticFlameT
+  OUTPUT_NAME freefoam-adiabaticFlameT
   )
 
 target_link_libraries( adiabaticFlameT
@@ -45,7 +45,7 @@ target_link_libraries( adiabaticFlameT
 install( TARGETS adiabaticFlameT
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( adiabaticFlameT adiabaticFlameT.C )
diff --git a/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt b/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt
index ebfd1ef08..00bae5abf 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt
+++ b/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( chemkinToFoam ${SRCS} )
 
 set_target_properties( chemkinToFoam PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}chemkinToFoam
+  OUTPUT_NAME freefoam-chemkinToFoam
   )
 
 target_link_libraries( chemkinToFoam
@@ -47,7 +47,7 @@ target_link_libraries( chemkinToFoam
 install( TARGETS chemkinToFoam
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( chemkinToFoam chemkinToFoam.C )
diff --git a/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt b/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt
index 4011602f0..600741ddd 100644
--- a/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt
+++ b/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( equilibriumCO ${SRCS} )
 
 set_target_properties( equilibriumCO PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}equilibriumCO
+  OUTPUT_NAME freefoam-equilibriumCO
   )
 
 target_link_libraries( equilibriumCO
@@ -45,7 +45,7 @@ target_link_libraries( equilibriumCO
 install( TARGETS equilibriumCO
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( equilibriumCO equilibriumCO.C )
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt b/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt
index 219b0a07a..6c7d3650d 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt
+++ b/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( equilibriumFlameT ${SRCS} )
 
 set_target_properties( equilibriumFlameT PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}equilibriumFlameT
+  OUTPUT_NAME freefoam-equilibriumFlameT
   )
 
 target_link_libraries( equilibriumFlameT
@@ -45,7 +45,7 @@ target_link_libraries( equilibriumFlameT
 install( TARGETS equilibriumFlameT
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( equilibriumFlameT equilibriumFlameT.C )
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt
index a17f2e32e..efab9e1c7 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt
@@ -34,7 +34,7 @@ include( files.cmake )
 add_executable( mixtureAdiabaticFlameT ${SRCS} )
 
 set_target_properties( mixtureAdiabaticFlameT PROPERTIES
-  OUTPUT_NAME ${EXECUTABLE_PREFIX}mixtureAdiabaticFlameT
+  OUTPUT_NAME freefoam-mixtureAdiabaticFlameT
   )
 
 target_link_libraries( mixtureAdiabaticFlameT
@@ -45,7 +45,7 @@ target_link_libraries( mixtureAdiabaticFlameT
 install( TARGETS mixtureAdiabaticFlameT
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT bin
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT bin
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT bin
   )
 
 ff_add_executable_to_doc_index( mixtureAdiabaticFlameT mixtureAdiabaticFlameT.C )
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 7021292dc..f69d636c0 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -29,43 +29,44 @@
 #   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #-------------------------------------------------------------------------------
 
-# a little helper variable
-if( "${EXECUTABLE_PREFIX}" STREQUAL "" )
-  set( filePrefix )
-else( "${EXECUTABLE_PREFIX}" STREQUAL "" )
-  set( filePrefix FILEPREFIX ${EXECUTABLE_PREFIX} )
-endif( "${EXECUTABLE_PREFIX}" STREQUAL "" )
+# configure the freefoam script for build and install tree
+ff_configure_files( buildFreefoam installFreefoam bin
+  freefoam.in
+  )
 
 # configure the utility scripts for build tree and the install tree
-ff_configure_files( buildScripts installScripts bin
-  ${filePrefix}
-  foamJob.in
-  foamLog.in
+ff_configure_files( buildScripts installScripts libexec/FreeFOAM/${FF_VERSION_FULL}
+  freefoam-job.in
+  freefoam-log.in
 
   COPYONLY
-  foamClearPolyMesh
-  foamCopySettings
-  foamGraphExecTime
-  foamGraphResKE
-  foamGraphResUVWP
-  foamSolverSweeps
+  freefoam-clearPolyMesh
+  freefoam-copySettings
+  freefoam-graphExecTime
+  freefoam-graphResKE
+  freefoam-graphResUVWP
+  freefoam-solverSweeps
   )
 
 if( FF_BUILD_PARAVIEW_PLUGINS AND FF_PARAVIEW3_APP )
-  ff_configure_files( buildPFScript installPFScript bin
-    ${filePrefix}
-    paraFoam.in
+  ff_configure_files( buildPFScript installPFScript libexec/FreeFOAM/${FF_VERSION_FULL}
+    freefoam-para.in
     )
   list( APPEND buildScripts ${buildPFScript} )
   list( APPEND installScripts ${installPFScript} )
 endif( FF_BUILD_PARAVIEW_PLUGINS AND FF_PARAVIEW3_APP )
 
-# install the utility scripts
+# install the scripts
 install( PROGRAMS
-  ${installScripts}
+  ${installFreefoam}
   DESTINATION ${FF_INSTALL_BIN_PATH}
   COMPONENT bin
   )
 
+install( PROGRAMS
+  ${installScripts}
+  DESTINATION ${FF_INSTALL_LIBEXEC_PATH}
+  COMPONENT bin
+  )
 
 # ------------------------- vim: set sw=2 sts=2 et: --------------- end-of-file
diff --git a/bin/foamClearPolyMesh b/bin/freefoam-clearPolyMesh
similarity index 100%
rename from bin/foamClearPolyMesh
rename to bin/freefoam-clearPolyMesh
diff --git a/bin/foamCopySettings b/bin/freefoam-copySettings
similarity index 100%
rename from bin/foamCopySettings
rename to bin/freefoam-copySettings
diff --git a/bin/foamGraphExecTime b/bin/freefoam-graphExecTime
similarity index 100%
rename from bin/foamGraphExecTime
rename to bin/freefoam-graphExecTime
diff --git a/bin/foamGraphResKE b/bin/freefoam-graphResKE
similarity index 100%
rename from bin/foamGraphResKE
rename to bin/freefoam-graphResKE
diff --git a/bin/foamGraphResUVWP b/bin/freefoam-graphResUVWP
similarity index 100%
rename from bin/foamGraphResUVWP
rename to bin/freefoam-graphResUVWP
diff --git a/bin/foamJob.in b/bin/freefoam-job.in
similarity index 87%
rename from bin/foamJob.in
rename to bin/freefoam-job.in
index 0e4e4da24..1ca65e130 100755
--- a/bin/foamJob.in
+++ b/bin/freefoam-job.in
@@ -132,16 +132,10 @@ if [ -z "$APPNAME" ]; then
    usage "No application specified"
 fi
 
-case "$APPNAME" in
-  */*)
-    APPLICATION=$APPNAME
-    ;;
-  *)
-    APPLICATION=@FF_BIN_DIR@/@EXECUTABLE_PREFIX@$APPNAME
-    ;;
-esac
-if [ ! -x "$APPLICATION" ]; then
-  usage "'$APPLICATION' not found"
+if [ "${APPNAME##*/}" = "$APPNAME" ]; then
+    FOAMEXEC=@FF_BIN_DIR@/freefoam
+else
+    FOAMEXEC=
 fi
 
 if [ "$PARALLEL" = no ]; then
@@ -150,15 +144,15 @@ if [ "$PARALLEL" = no ]; then
 #
     if [ "$SCREEN" = no ]; then
       if [ "$FG" = no ]; then
-        echo "Executing: $APPLICATION $@ > $LOGFILE 2>&1 &"
-        $APPLICATION $@ > $LOGFILE 2>&1 &
+        echo "Executing: $FOAMEXEC $APPNAME $@ > $LOGFILE 2>&1 &"
+        $FOAMEXEC $APPNAME $@ > $LOGFILE 2>&1 &
       else
-        echo "Executing: $APPLICATION $@ > $LOGFILE 2>&1"
-        $APPLICATION $@ > $LOGFILE 2>&1
+        echo "Executing: $FOAMEXEC $APPNAME $@ > $LOGFILE 2>&1"
+        $FOAMEXEC $APPNAME $@ > $LOGFILE 2>&1
       fi
     else
-       echo "Executing: $APPLICATION $@ | tee $LOGFILE &"
-       $APPLICATION $@ | tee $LOGFILE &
+       echo "Executing: $FOAMEXEC $APPNAME $@ | tee $LOGFILE &"
+       $FOAMEXEC $APPNAME $@ | tee $LOGFILE &
        wait $!
     fi
 else
@@ -173,7 +167,7 @@ else
       echo "Case is not currently decomposed"
       if [ -r system/decomposeParDict ] ; then
          echo "system/decomposeParDict exists"
-         echo "Try decomposing with \"@FF_BIN_DIR@/@EXECUTABLE_PREFIX@foamJob decomposePar\""
+         echo "Try decomposing with \"freefoam decomposePar\""
          exit 1
       else
          echo "Cannot find system/decomposeParDict file required to decompose the case for parallel running."
@@ -188,7 +182,7 @@ else
    mpirun=`getEntry $controlDict parRunTemplate`
    mpirun=`echo $mpirun | sed -e "s|\\\${NPROCS}|$NPROCS|g" \
                -e "s|\\\${PAROPTS}|$HOSTFILE|g" \
-               -e "s|\\\${APPLICATION}|$APPLICATION|g" \
+               -e "s|\\\${APPLICATION}|$FOAMEXEC $APPNAME|g" \
                -e "s|\\\${ARGS}|$@|"`
 
 
diff --git a/bin/foamLog.in b/bin/freefoam-log.in
similarity index 100%
rename from bin/foamLog.in
rename to bin/freefoam-log.in
diff --git a/bin/paraFoam.in b/bin/freefoam-para.in
similarity index 100%
rename from bin/paraFoam.in
rename to bin/freefoam-para.in
diff --git a/bin/foamSolverSweeps b/bin/freefoam-solverSweeps
similarity index 100%
rename from bin/foamSolverSweeps
rename to bin/freefoam-solverSweeps
diff --git a/bin/freefoam.in b/bin/freefoam.in
new file mode 100755
index 000000000..5e9d9c55d
--- /dev/null
+++ b/bin/freefoam.in
@@ -0,0 +1,148 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     foamExec
+#
+# Description
+#     Usage: foamExec [-v foamVersion] <foamCommand> ...
+#
+#     Runs the <foamVersion> version of executable <foamCommand>
+#     with the rest of the arguments.
+#
+#     Can also be used for parallel runs e.g.
+#     mpirun -np <nProcs> \
+#         foamExec -v <foamVersion> <foamCommand> ... -parallel
+#
+#------------------------------------------------------------------------------
+
+# this script modifies PATH, but we might need it later on...
+PATH_BAK="$PATH"
+
+# store the path to which (modified PATH)
+WHICH=`which which`
+
+usage() {
+   PATH="$PATH_BAK"
+   export PATH
+   exitStatus=0
+   if [ $# -gt 0 ]; then
+      exitStatus=$1
+      shift
+   fi
+   while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+   cat<<USAGE
+
+usage: ${0##*/} [OPTION] [--] <application> ...
+
+options:
+  -v ver        specify FreeFOAM version (default is @FF_VERSION_FULL@)
+  -b base       specify a different base directory to search for
+                applications (default is @FF_LIBEXEC_BASE_DIR@)
+  -P            also use the system PATH variable
+  --            separates options for this program from the application and
+                its arguments (useful if the application name should start with
+                a -)
+  -V
+  -version      display the FreeFOAM version and exit
+  -h
+  -help         display this usage and exit
+  <application> the short name of the application to run (i.e. for
+                'freefoam-ico', this would be 'ico'.
+
+environment variables:
+  FREEFOAM_PATH specify an alternative path where to search for applications
+
+* run a particular FreeFOAM version of <application>
+
+USAGE
+   exit $exitStatus
+}
+
+# set defaults
+foamInstall="@FF_LIBEXEC_BASE_DIR@"
+unset foamInstallFront
+version="@FF_VERSION_FULL@"
+unset sysPath
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+   case "$1" in
+   -h | -help)
+      usage
+      ;;
+   -v)
+      version=$2
+      shift 2
+      ;;
+   -b)
+      foamInstall=$2
+      shift 2
+      ;;
+   -P)
+      sysPath=":$PATH"
+      shift
+      ;;
+   -V | -version)
+      echo "FreeFOAM version @FF_VERSION_FULL@"
+      exit 0
+      ;;
+   --)
+      shift
+      break
+      ;;
+   -*)
+      usage 1 "invalid option '$1'"
+      ;;
+   *)
+      break
+      ;;
+   esac
+done
+
+if [ "$#" -lt 1 ]; then
+   usage 1 "no application specified"
+fi
+
+app=$1
+shift
+
+# set up path
+PATH="$foamInstall/$version$sysPath"
+if [ -n "$FREEFOAM_PATH" ]; then
+   PATH="$FREEFOAM_PATH:$PATH"
+fi
+
+export PATH
+
+if ! $WHICH freefoam-$app > /dev/null ; then
+   usage 1 "Could not find application '$app'"
+fi
+
+# Pass on the rest of the arguments
+exec freefoam-$app $*
+
+# ------------------------- vim: set sw=3 sts=3 et: --------------- end-of-file
diff --git a/data/shellFunctions/RunFunctions.in b/data/shellFunctions/RunFunctions.in
index d4f191c69..3fc6789e7 100644
--- a/data/shellFunctions/RunFunctions.in
+++ b/data/shellFunctions/RunFunctions.in
@@ -58,7 +58,7 @@ runApplication ()
         echo "$APP_RUN already run on $PWD: remove log file \"$LOG_DIR$LOG_NAME\" to run"
     else
         echo "Running $APP_RUN on $PWD"
-        @FF_BIN_DIR@/@EXECUTABLE_PREFIX@foamJob -fg -log $LOG_DIR$LOG_NAME $APP_RUN $*
+        @FF_LIBEXEC_DIR@/freefoam-job -fg -log $LOG_DIR$LOG_NAME $APP_RUN $*
     fi
 }
 
@@ -92,7 +92,7 @@ runParallel ()
         echo "$APP_RUN already run on $PWD: remove log file to run"
     else
         echo "Running $APP_RUN in parallel on $PWD"
-        ( @FF_BIN_DIR@/@EXECUTABLE_PREFIX@foamJob -fg -p -log $LOG_DIR$LOG_NAME $APP_RUN < /dev/null )
+        ( @FF_LIBEXEC_DIR@/freefoam-job -fg -p -log $LOG_DIR$LOG_NAME $APP_RUN < /dev/null )
     fi
 }
 
diff --git a/data/shellFunctions/doxyToAsciidoc.awk b/data/shellFunctions/doxyToAsciidoc.awk
index 80990b9fb..64dc70023 100644
--- a/data/shellFunctions/doxyToAsciidoc.awk
+++ b/data/shellFunctions/doxyToAsciidoc.awk
@@ -365,7 +365,7 @@ END {
    print name " -" text[section_indices["Brief"]] "\n";
    print "SYNOPSIS";
    print "--------";
-   print "*" name "*" options " [-help] [-doc] [-srcDoc]\n";
+   print "*" gensub(/^(freefoam)-/,"\\1 ",1,name) "*" options " [-help] [-doc] [-srcDoc]\n";
    print "DESCRIPTION";
    print "-----------";
    print text[section_indices["Description"]];
diff --git a/src/ODE/CMakeLists.txt b/src/ODE/CMakeLists.txt
index ccf30dd74..9c6f733c7 100644
--- a/src/ODE/CMakeLists.txt
+++ b/src/ODE/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS ODE
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/ODE COMPONENT dev
   )
diff --git a/src/OSspecific/POSIX/CMakeLists.txt b/src/OSspecific/POSIX/CMakeLists.txt
index 03645871a..9f3c341b6 100644
--- a/src/OSspecific/POSIX/CMakeLists.txt
+++ b/src/OSspecific/POSIX/CMakeLists.txt
@@ -67,7 +67,7 @@ install( TARGETS OSspecific
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/OSspecific COMPONENT dev
   )
diff --git a/src/OpenFOAM/CMakeLists.txt b/src/OpenFOAM/CMakeLists.txt
index 95ddff74c..85cac5509 100644
--- a/src/OpenFOAM/CMakeLists.txt
+++ b/src/OpenFOAM/CMakeLists.txt
@@ -56,7 +56,7 @@ install( TARGETS OpenFOAM
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/OpenFOAM COMPONENT dev
   )
diff --git a/src/Pstream/dummy/CMakeLists.txt b/src/Pstream/dummy/CMakeLists.txt
index 76d46f3f9..9eb6ad340 100644
--- a/src/Pstream/dummy/CMakeLists.txt
+++ b/src/Pstream/dummy/CMakeLists.txt
@@ -50,7 +50,7 @@ install( TARGETS dummyPstream
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   )
 
 # ------------------------- vim: set sw=2 sts=2 et: --------------- end-of-file
diff --git a/src/Pstream/mpi/CMakeLists.txt b/src/Pstream/mpi/CMakeLists.txt
index 9d64b64d6..e3f591120 100644
--- a/src/Pstream/mpi/CMakeLists.txt
+++ b/src/Pstream/mpi/CMakeLists.txt
@@ -69,7 +69,7 @@ install( TARGETS mpiPstream
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   )
 
 # ------------------------- vim: set sw=2 sts=2 et: --------------- end-of-file
diff --git a/src/autoMesh/CMakeLists.txt b/src/autoMesh/CMakeLists.txt
index c5f16aa60..0eea706a2 100644
--- a/src/autoMesh/CMakeLists.txt
+++ b/src/autoMesh/CMakeLists.txt
@@ -57,7 +57,7 @@ install( TARGETS autoMesh
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/autoMesh COMPONENT dev
   )
diff --git a/src/conversion/CMakeLists.txt b/src/conversion/CMakeLists.txt
index 0cd47d10e..0866a7e29 100644
--- a/src/conversion/CMakeLists.txt
+++ b/src/conversion/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS conversion
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/conversion COMPONENT dev
   )
diff --git a/src/decompositionMethods/decompositionMethods/CMakeLists.txt b/src/decompositionMethods/decompositionMethods/CMakeLists.txt
index 0ba29d128..8d5c2633f 100644
--- a/src/decompositionMethods/decompositionMethods/CMakeLists.txt
+++ b/src/decompositionMethods/decompositionMethods/CMakeLists.txt
@@ -50,7 +50,7 @@ install( TARGETS decompositionMethods
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/decompositionMethods COMPONENT dev
   )
diff --git a/src/decompositionMethods/parMetisDecomp/CMakeLists.txt b/src/decompositionMethods/parMetisDecomp/CMakeLists.txt
index 69c30051c..cf97983c7 100644
--- a/src/decompositionMethods/parMetisDecomp/CMakeLists.txt
+++ b/src/decompositionMethods/parMetisDecomp/CMakeLists.txt
@@ -66,7 +66,7 @@ install( TARGETS parMetisDecomp
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/parMetisDecomp COMPONENT dev
   )
diff --git a/src/dynamicFvMesh/CMakeLists.txt b/src/dynamicFvMesh/CMakeLists.txt
index 5eb0b6896..ab0b9bae9 100644
--- a/src/dynamicFvMesh/CMakeLists.txt
+++ b/src/dynamicFvMesh/CMakeLists.txt
@@ -54,7 +54,7 @@ install( TARGETS dynamicFvMesh
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/dynamicFvMesh COMPONENT dev
   )
diff --git a/src/dynamicMesh/CMakeLists.txt b/src/dynamicMesh/CMakeLists.txt
index 070b974f6..fd3c2682e 100644
--- a/src/dynamicMesh/CMakeLists.txt
+++ b/src/dynamicMesh/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS dynamicMesh
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/dynamicMesh COMPONENT dev
   )
diff --git a/src/edgeMesh/CMakeLists.txt b/src/edgeMesh/CMakeLists.txt
index 7c64dc740..a49f36781 100644
--- a/src/edgeMesh/CMakeLists.txt
+++ b/src/edgeMesh/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS edgeMesh
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/edgeMesh COMPONENT dev
   )
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index 0a5843333..1bb038b95 100644
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS engine
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/engine COMPONENT dev
   )
diff --git a/src/errorEstimation/CMakeLists.txt b/src/errorEstimation/CMakeLists.txt
index a6d79deb5..deb16effb 100644
--- a/src/errorEstimation/CMakeLists.txt
+++ b/src/errorEstimation/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS errorEstimation
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/errorEstimation COMPONENT dev
   )
diff --git a/src/finiteVolume/CMakeLists.txt b/src/finiteVolume/CMakeLists.txt
index c21af6dc6..1480a0f93 100644
--- a/src/finiteVolume/CMakeLists.txt
+++ b/src/finiteVolume/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS finiteVolume
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/finiteVolume COMPONENT dev
   )
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt
index ce6f59ba7..bd608a087 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS MGridGenGAMGAgglomeration
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/MGridGenGAMGAgglomeration COMPONENT dev
   )
diff --git a/src/fvMotionSolver/CMakeLists.txt b/src/fvMotionSolver/CMakeLists.txt
index 8bf8f00ae..5f25eed53 100644
--- a/src/fvMotionSolver/CMakeLists.txt
+++ b/src/fvMotionSolver/CMakeLists.txt
@@ -54,7 +54,7 @@ install( TARGETS fvMotionSolvers
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/fvMotionSolvers COMPONENT dev
   )
diff --git a/src/lagrangian/basic/CMakeLists.txt b/src/lagrangian/basic/CMakeLists.txt
index 4bc76ad5f..f57048bd5 100644
--- a/src/lagrangian/basic/CMakeLists.txt
+++ b/src/lagrangian/basic/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS lagrangian
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/lagrangian COMPONENT dev
   )
diff --git a/src/lagrangian/coalCombustion/CMakeLists.txt b/src/lagrangian/coalCombustion/CMakeLists.txt
index b067a62d6..9be1f094f 100644
--- a/src/lagrangian/coalCombustion/CMakeLists.txt
+++ b/src/lagrangian/coalCombustion/CMakeLists.txt
@@ -64,7 +64,7 @@ install( TARGETS coalCombustion
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/coalCombustion COMPONENT dev
   )
diff --git a/src/lagrangian/dieselSpray/CMakeLists.txt b/src/lagrangian/dieselSpray/CMakeLists.txt
index 9dc831021..ca66dc52e 100644
--- a/src/lagrangian/dieselSpray/CMakeLists.txt
+++ b/src/lagrangian/dieselSpray/CMakeLists.txt
@@ -60,7 +60,7 @@ install( TARGETS dieselSpray
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/dieselSpray COMPONENT dev
   )
diff --git a/src/lagrangian/dsmc/CMakeLists.txt b/src/lagrangian/dsmc/CMakeLists.txt
index 8b33782a9..beb30ef29 100644
--- a/src/lagrangian/dsmc/CMakeLists.txt
+++ b/src/lagrangian/dsmc/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS dsmc
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/dsmc COMPONENT dev
   )
diff --git a/src/lagrangian/intermediate/CMakeLists.txt b/src/lagrangian/intermediate/CMakeLists.txt
index aa90c950d..b847c3aee 100644
--- a/src/lagrangian/intermediate/CMakeLists.txt
+++ b/src/lagrangian/intermediate/CMakeLists.txt
@@ -64,7 +64,7 @@ install( TARGETS lagrangianIntermediate
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/lagrangianIntermediate COMPONENT dev
   )
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt b/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt
index a1527f455..4f5b09a1c 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt
@@ -50,7 +50,7 @@ install( TARGETS molecularMeasurements
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/molecularMeasurements COMPONENT dev
   )
diff --git a/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt b/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt
index d4eba9716..174c36465 100644
--- a/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS molecule
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/molecule COMPONENT dev
   )
diff --git a/src/lagrangian/molecularDynamics/potential/CMakeLists.txt b/src/lagrangian/molecularDynamics/potential/CMakeLists.txt
index 359a8a74b..eff05f63a 100644
--- a/src/lagrangian/molecularDynamics/potential/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/potential/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS potential
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/potential COMPONENT dev
   )
diff --git a/src/lagrangian/solidParticle/CMakeLists.txt b/src/lagrangian/solidParticle/CMakeLists.txt
index 4926acde5..0b2c86625 100644
--- a/src/lagrangian/solidParticle/CMakeLists.txt
+++ b/src/lagrangian/solidParticle/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS solidParticle
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/solidParticle COMPONENT dev
   )
diff --git a/src/meshTools/CMakeLists.txt b/src/meshTools/CMakeLists.txt
index 050d0d92d..a0fbc1471 100644
--- a/src/meshTools/CMakeLists.txt
+++ b/src/meshTools/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS meshTools
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/meshTools COMPONENT dev
   )
diff --git a/src/postProcessing/foamCalcFunctions/CMakeLists.txt b/src/postProcessing/foamCalcFunctions/CMakeLists.txt
index 940a89b69..10c3165c2 100644
--- a/src/postProcessing/foamCalcFunctions/CMakeLists.txt
+++ b/src/postProcessing/foamCalcFunctions/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS foamCalcFunctions
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/foamCalcFunctions COMPONENT dev
   )
diff --git a/src/postProcessing/functionObjects/IO/CMakeLists.txt b/src/postProcessing/functionObjects/IO/CMakeLists.txt
index 530b09950..b16c66eef 100644
--- a/src/postProcessing/functionObjects/IO/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/IO/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS IOFunctionObjects
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/IOFunctionObjects COMPONENT dev
   )
diff --git a/src/postProcessing/functionObjects/field/CMakeLists.txt b/src/postProcessing/functionObjects/field/CMakeLists.txt
index 70bd7743f..3402a7dfe 100644
--- a/src/postProcessing/functionObjects/field/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/field/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS fieldFunctionObjects
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/fieldFunctionObjects COMPONENT dev
   )
diff --git a/src/postProcessing/functionObjects/forces/CMakeLists.txt b/src/postProcessing/functionObjects/forces/CMakeLists.txt
index 07a6506c2..5da12ee99 100644
--- a/src/postProcessing/functionObjects/forces/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/forces/CMakeLists.txt
@@ -60,7 +60,7 @@ install( TARGETS forces
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/forces COMPONENT dev
   )
diff --git a/src/postProcessing/functionObjects/systemCall/CMakeLists.txt b/src/postProcessing/functionObjects/systemCall/CMakeLists.txt
index 8bf417b6c..c3464a036 100644
--- a/src/postProcessing/functionObjects/systemCall/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/systemCall/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS systemCall
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/systemCall COMPONENT dev
   )
diff --git a/src/postProcessing/functionObjects/utilities/CMakeLists.txt b/src/postProcessing/functionObjects/utilities/CMakeLists.txt
index f2b99614e..e801cf66a 100644
--- a/src/postProcessing/functionObjects/utilities/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/utilities/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS utilityFunctionObjects
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/utilityFunctionObjects COMPONENT dev
   )
diff --git a/src/postProcessing/postCalc/CMakeLists.txt b/src/postProcessing/postCalc/CMakeLists.txt
index 3eaf5e3a3..d85b3511e 100644
--- a/src/postProcessing/postCalc/CMakeLists.txt
+++ b/src/postProcessing/postCalc/CMakeLists.txt
@@ -56,7 +56,7 @@ install( TARGETS postCalc
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/postCalc COMPONENT dev
   )
diff --git a/src/randomProcesses/CMakeLists.txt b/src/randomProcesses/CMakeLists.txt
index 4d55a14b8..3ea5de9b1 100644
--- a/src/randomProcesses/CMakeLists.txt
+++ b/src/randomProcesses/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS randomProcesses
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/randomProcesses COMPONENT dev
   )
diff --git a/src/sampling/CMakeLists.txt b/src/sampling/CMakeLists.txt
index 66f11ad2d..3ed46b09a 100644
--- a/src/sampling/CMakeLists.txt
+++ b/src/sampling/CMakeLists.txt
@@ -54,7 +54,7 @@ install( TARGETS sampling
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/sampling COMPONENT dev
   )
diff --git a/src/surfMesh/CMakeLists.txt b/src/surfMesh/CMakeLists.txt
index 7efa614e2..087301590 100644
--- a/src/surfMesh/CMakeLists.txt
+++ b/src/surfMesh/CMakeLists.txt
@@ -54,7 +54,7 @@ install( TARGETS surfMesh
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/surfMesh COMPONENT dev
   )
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt b/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt
index fe6dff837..1ca543cf5 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS barotropicCompressibilityModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/barotropicCompressibilityModel COMPONENT dev
   )
diff --git a/src/thermophysicalModels/basic/CMakeLists.txt b/src/thermophysicalModels/basic/CMakeLists.txt
index f7438e891..325407b4f 100644
--- a/src/thermophysicalModels/basic/CMakeLists.txt
+++ b/src/thermophysicalModels/basic/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS basicThermophysicalModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/basicThermophysicalModels COMPONENT dev
   )
diff --git a/src/thermophysicalModels/chemistryModel/CMakeLists.txt b/src/thermophysicalModels/chemistryModel/CMakeLists.txt
index 336129f92..64c83c359 100644
--- a/src/thermophysicalModels/chemistryModel/CMakeLists.txt
+++ b/src/thermophysicalModels/chemistryModel/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS chemistryModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/chemistryModel COMPONENT dev
   )
diff --git a/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt b/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt
index ec4ea12f2..ba7fa24d1 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt
+++ b/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS laminarFlameSpeedModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/laminarFlameSpeedModels COMPONENT dev
   )
diff --git a/src/thermophysicalModels/liquidMixture/CMakeLists.txt b/src/thermophysicalModels/liquidMixture/CMakeLists.txt
index 4e9ea7cc9..2c602f315 100644
--- a/src/thermophysicalModels/liquidMixture/CMakeLists.txt
+++ b/src/thermophysicalModels/liquidMixture/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS liquidMixture
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/liquidMixture COMPONENT dev
   )
diff --git a/src/thermophysicalModels/liquids/CMakeLists.txt b/src/thermophysicalModels/liquids/CMakeLists.txt
index 463ec695b..feba27298 100644
--- a/src/thermophysicalModels/liquids/CMakeLists.txt
+++ b/src/thermophysicalModels/liquids/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS liquids
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/liquids COMPONENT dev
   )
diff --git a/src/thermophysicalModels/pdfs/CMakeLists.txt b/src/thermophysicalModels/pdfs/CMakeLists.txt
index 3b9914ce8..a7c845949 100644
--- a/src/thermophysicalModels/pdfs/CMakeLists.txt
+++ b/src/thermophysicalModels/pdfs/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS pdf
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/pdf COMPONENT dev
   )
diff --git a/src/thermophysicalModels/radiation/CMakeLists.txt b/src/thermophysicalModels/radiation/CMakeLists.txt
index e1f11d51b..628cdb7b7 100644
--- a/src/thermophysicalModels/radiation/CMakeLists.txt
+++ b/src/thermophysicalModels/radiation/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS radiation
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/radiation COMPONENT dev
   )
diff --git a/src/thermophysicalModels/reactionThermo/CMakeLists.txt b/src/thermophysicalModels/reactionThermo/CMakeLists.txt
index 98b3d1947..ac3c2678b 100644
--- a/src/thermophysicalModels/reactionThermo/CMakeLists.txt
+++ b/src/thermophysicalModels/reactionThermo/CMakeLists.txt
@@ -56,7 +56,7 @@ install( TARGETS reactionThermophysicalModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/reactionThermophysicalModels COMPONENT dev
   )
diff --git a/src/thermophysicalModels/solidMixture/CMakeLists.txt b/src/thermophysicalModels/solidMixture/CMakeLists.txt
index 3970d56f4..3c68cf096 100644
--- a/src/thermophysicalModels/solidMixture/CMakeLists.txt
+++ b/src/thermophysicalModels/solidMixture/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS solidMixture
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/solidMixture COMPONENT dev
   )
diff --git a/src/thermophysicalModels/solids/CMakeLists.txt b/src/thermophysicalModels/solids/CMakeLists.txt
index 6974988a5..1e5be6618 100644
--- a/src/thermophysicalModels/solids/CMakeLists.txt
+++ b/src/thermophysicalModels/solids/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS solids
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/solids COMPONENT dev
   )
diff --git a/src/thermophysicalModels/specie/CMakeLists.txt b/src/thermophysicalModels/specie/CMakeLists.txt
index 201e2541f..baffd1cca 100644
--- a/src/thermophysicalModels/specie/CMakeLists.txt
+++ b/src/thermophysicalModels/specie/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS specie
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/specie COMPONENT dev
   )
diff --git a/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt b/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt
index 0048c1fcf..ad2f081d8 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt
+++ b/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt
@@ -48,7 +48,7 @@ install( TARGETS thermophysicalFunctions
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/thermophysicalFunctions COMPONENT dev
   )
diff --git a/src/topoChangerFvMesh/CMakeLists.txt b/src/topoChangerFvMesh/CMakeLists.txt
index e156be5f4..17504a45a 100644
--- a/src/topoChangerFvMesh/CMakeLists.txt
+++ b/src/topoChangerFvMesh/CMakeLists.txt
@@ -54,7 +54,7 @@ install( TARGETS topoChangerFvMesh
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/topoChangerFvMesh COMPONENT dev
   )
diff --git a/src/transportModels/incompressible/CMakeLists.txt b/src/transportModels/incompressible/CMakeLists.txt
index 39e011aaf..2849e6bd0 100644
--- a/src/transportModels/incompressible/CMakeLists.txt
+++ b/src/transportModels/incompressible/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS incompressibleTransportModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/incompressibleTransportModels COMPONENT dev
   )
diff --git a/src/transportModels/interfaceProperties/CMakeLists.txt b/src/transportModels/interfaceProperties/CMakeLists.txt
index e2410d641..4bca3a088 100644
--- a/src/transportModels/interfaceProperties/CMakeLists.txt
+++ b/src/transportModels/interfaceProperties/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS interfaceProperties
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/interfaceProperties COMPONENT dev
   )
diff --git a/src/triSurface/CMakeLists.txt b/src/triSurface/CMakeLists.txt
index 226e1e858..0718ae199 100644
--- a/src/triSurface/CMakeLists.txt
+++ b/src/triSurface/CMakeLists.txt
@@ -57,7 +57,7 @@ install( TARGETS triSurface
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/triSurface COMPONENT dev
   )
diff --git a/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt b/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt
index b214a40f6..493e5c272 100644
--- a/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt
+++ b/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt
@@ -52,7 +52,7 @@ install( TARGETS LESdeltas
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/LESdeltas COMPONENT dev
   )
diff --git a/src/turbulenceModels/LES/LESfilters/CMakeLists.txt b/src/turbulenceModels/LES/LESfilters/CMakeLists.txt
index cf80df72e..f24a533e8 100644
--- a/src/turbulenceModels/LES/LESfilters/CMakeLists.txt
+++ b/src/turbulenceModels/LES/LESfilters/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS LESfilters
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/LESfilters COMPONENT dev
   )
diff --git a/src/turbulenceModels/compressible/LES/CMakeLists.txt b/src/turbulenceModels/compressible/LES/CMakeLists.txt
index 018590677..945455a03 100644
--- a/src/turbulenceModels/compressible/LES/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/LES/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS compressibleLESModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/compressibleLESModels COMPONENT dev
   )
diff --git a/src/turbulenceModels/compressible/RAS/CMakeLists.txt b/src/turbulenceModels/compressible/RAS/CMakeLists.txt
index b80af3ff3..4a81da72c 100644
--- a/src/turbulenceModels/compressible/RAS/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/RAS/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS compressibleRASModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/compressibleRASModels COMPONENT dev
   )
diff --git a/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt b/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt
index fcc5b7efe..6c15800f2 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS compressibleTurbulenceModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/compressibleTurbulenceModel COMPONENT dev
   )
diff --git a/src/turbulenceModels/incompressible/LES/CMakeLists.txt b/src/turbulenceModels/incompressible/LES/CMakeLists.txt
index a4e297c76..772de4408 100644
--- a/src/turbulenceModels/incompressible/LES/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/LES/CMakeLists.txt
@@ -55,7 +55,7 @@ install( TARGETS incompressibleLESModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/incompressibleLESModels COMPONENT dev
   )
diff --git a/src/turbulenceModels/incompressible/RAS/CMakeLists.txt b/src/turbulenceModels/incompressible/RAS/CMakeLists.txt
index cbee590de..fd9601c19 100644
--- a/src/turbulenceModels/incompressible/RAS/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/RAS/CMakeLists.txt
@@ -53,7 +53,7 @@ install( TARGETS incompressibleRASModels
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/incompressibleRASModels COMPONENT dev
   )
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt b/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt
index b747e7344..66b01c382 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt
@@ -51,7 +51,7 @@ install( TARGETS incompressibleTurbulenceModel
   EXPORT FreeFOAMLibraryDepends
   LIBRARY DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
   ARCHIVE DESTINATION ${FF_INSTALL_LIB_PATH} COMPONENT shlibs
-  RUNTIME DESTINATION ${FF_INSTALL_BIN_PATH} COMPONENT shlibs
+  RUNTIME DESTINATION ${FF_INSTALL_LIBEXEC_PATH} COMPONENT shlibs
   FRAMEWORK DESTINATION ${FF_INSTALL_FRAMEWORK_PATH} COMPONENT shlibs
   PUBLIC_HEADER DESTINATION ${FF_INSTALL_HEADER_PATH}/incompressibleTurbulenceModel COMPONENT dev
   )
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun.in b/tutorials/DNS/dnsFoam/boxTurb16/Allrun.in
index 2f769c371..62fda8b0c 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun.in
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="dnsFoam"
+application="dns"
 
 runApplication blockMesh
 runApplication boxTurb
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/Allrun.in b/tutorials/XiFoam/moriyoshiHomogeneous/Allrun.in
new file mode 100755
index 000000000..60f20b04b
--- /dev/null
+++ b/tutorials/XiFoam/moriyoshiHomogeneous/Allrun.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Source tutorial run functions
+. @FF_DATA_DIR@/shellFunctions/RunFunctions
+
+application="Xi"
+
+runApplication blockMesh
+runApplication $application
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun.in b/tutorials/basic/laplacianFoam/flange/Allrun.in
index 9b42146a1..a36d73f8b 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun.in
+++ b/tutorials/basic/laplacianFoam/flange/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application directory
-application="laplacianFoam"
+application="laplacian"
 
 echo "ansysToFoam: converting mesh flange.ans"
 runApplication ansysToFoam flange.ans -scale 0.001
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun.in b/tutorials/basic/potentialFoam/cylinder/Allrun.in
index 4af2a39ae..ec4702322 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun.in
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="potentialFoam"
+application="potential"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun.in b/tutorials/basic/potentialFoam/pitzDaily/Allrun.in
index d9a5d4ab1..d30bcbeec 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun.in
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="potentialFoam"
+application="potential"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/Allrun.in b/tutorials/basic/scalarTransportFoam/pitzDaily/Allrun.in
index 2ba083e11..993a47909 100755
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/Allrun.in
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="scalarTransportFoam"
+application="scalarTransport"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/Allrun.in b/tutorials/combustion/XiFoam/les/pitzDaily/Allrun.in
index 54f8c9880..3fffdac48 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily/Allrun.in
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="Xi"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
index 54f8c9880..3fffdac48 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="Xi"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/ras/Allrun.in b/tutorials/combustion/XiFoam/ras/Allrun.in
index 0a3352767..133e7e4eb 100755
--- a/tutorials/combustion/XiFoam/ras/Allrun.in
+++ b/tutorials/combustion/XiFoam/ras/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="Xi"
 
 setControlDict () {
     controlDict="system/controlDict"
@@ -26,12 +26,12 @@ setControlDict () {
 (cd moriyoshiHomogeneous && @FF_DATA_DIR@/utilities/foamRunTutorials)
 
 if [ "$FREEFOAM_TEST_MODE" == "no" ]; then
-  # Clone case
-  cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
-  # Modify and execute
-  cd moriyoshiHomogeneousPart2
-  cp -r ../moriyoshiHomogeneous/0.005 .
-  setControlDict
-  runApplication $application
-  cd ..
+# Clone case
+cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
+# Modify and execute
+cd moriyoshiHomogeneousPart2
+    cp -r ../moriyoshiHomogeneous/0.005 .
+    setControlDict
+    runApplication $application
+cd ..
 fi
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/Allrun.in b/tutorials/combustion/dieselFoam/aachenBomb/Allrun.in
index bf684000d..153e3c6b5 100755
--- a/tutorials/combustion/dieselFoam/aachenBomb/Allrun.in
+++ b/tutorials/combustion/dieselFoam/aachenBomb/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="dieselFoam"
+application="diesel"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun.in b/tutorials/combustion/engineFoam/kivaTest/Allrun.in
index 7586860ba..271c26316 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun.in
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="engineFoam"
+application="engine"
 
 runKivaToFoam ()
 {
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun.in b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun.in
index 9ff729295..891c21e59 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun.in
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun.in
@@ -15,6 +15,6 @@ runApplication setSet -batch makeFaceSet.setSet
 runApplication createPatch -overwrite
 
 # Run
-runApplication fireFoam
+runApplication fire
 
 # -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun.in b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun.in
index cae97ab27..7aaff024c 100755
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun.in
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="reactingFoam"
+application="reacting"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoCentralFoam/Allrun.in b/tutorials/compressible/rhoCentralFoam/Allrun.in
index 8d6e6331e..099f4729f 100755
--- a/tutorials/compressible/rhoCentralFoam/Allrun.in
+++ b/tutorials/compressible/rhoCentralFoam/Allrun.in
@@ -11,7 +11,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application=`basename $PWD`
+application="rhoCentral"
 
 cases=" \
 shockTube \
@@ -23,13 +23,14 @@ biconic25-55Run35 \
 "
 
 moveTimeMeshToConstant () {
-DT=`@FF_BIN_DIR@/@EXECUTABLE_PREFIX@foamInfoExec -times | tail -1`
+DT=`runApplication infoExec -times | tail -1`
 if [ $DT != 0 ] ; then
     mv ${DT}/polyMesh/* constant/polyMesh
     rm -rf ${DT}
 fi
 }
 
+compileApplication datToFoam
 for case in $cases
 do
     (cd $case && runApplication blockMesh)
@@ -41,7 +42,6 @@ do
     if [ "$case" = "biconic25-55Run35" ] ; then
         cd $case
 
-        compileApplication datToFoam
         runApplication datToFoam-build/datToFoam grid256.dat
 
         CONST="constant"
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/compressible/rhoCentralFoam/obliqueShock/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/compressible/rhoCentralFoam/obliqueShock/Allrun.in
index 54f8c9880..27ffc3c8f 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="rhoCentral"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/compressible/rhoCentralFoam/shockTube/Allrun.in
index 54f8c9880..27ffc3c8f 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="rhoCentral"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/compressible/rhoCentralFoam/wedge15Ma5/Allrun.in
index 54f8c9880..27ffc3c8f 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="rhoCentral"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/Allrun.in b/tutorials/compressible/rhoPimpleFoam/angledDuct/Allrun.in
index 8544b7f5d..51735ea62 100755
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/Allrun.in
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoPimpleFoam"
+application="rhoPimple"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun.in b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun.in
index d898c0c86..0c0d20156 100755
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun.in
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoPisoFoam"
+application="rhoPiso"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/Allrun.in b/tutorials/compressible/rhoPisoFoam/ras/cavity/Allrun.in
index d898c0c86..0c0d20156 100755
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/Allrun.in
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoPisoFoam"
+application="rhoPiso"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/Allrun.in b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/Allrun.in
index 6d6d263a7..9836b22fc 100755
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/Allrun.in
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/Allrun.in
@@ -11,7 +11,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoPorousMRFPimpleFoam"
+application="rhoPorousMRFPimple"
 
 ./makeMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun.in b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun.in
index b26075239..dab5621a5 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun.in
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoPorousSimpleFoam"
+application="rhoPorousSimple"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun.in b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun.in
index b26075239..dab5621a5 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun.in
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoPorousSimpleFoam"
+application="rhoPorousSimple"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/Allrun.in b/tutorials/compressible/rhoSonicFoam/forwardStep/Allrun.in
index c11073374..8af50f21d 100755
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/Allrun.in
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoSonicFoam"
+application="rhoSonic"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun.in b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun.in
index 930de13bf..0a2771e81 100755
--- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun.in
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhoSonicFoam"
+application="rhoSonic"
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun.in b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun.in
index d29cbb572..ba043b7fb 100755
--- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun.in
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="rhopSonicFoam"
+application="rhopSonic"
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/Allrun.in b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/Allrun.in
index 879266b15..4e67e2359 100755
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/Allrun.in
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="rhopSonicFoam"
+application="rhopSonic"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/Allrun.in b/tutorials/compressible/sonicFoam/laminar/forwardStep/Allrun.in
index 6d47e0891..929937de7 100755
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/Allrun.in
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="sonicFoam"
+application="sonic"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun.in b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun.in
index 09546c26c..94acf8546 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun.in
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun.in
@@ -9,10 +9,10 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="sonicFoam"
+application="sonic"
 
 runApplication blockMesh
 runApplication setFields
 runApplication $application
-runApplication foamCalc mag U
+runApplication calc mag U
 runApplication sample
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun.in b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun.in
index 3a9e69a05..a496ffc41 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun.in
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name
-application=sonicFoam
+application="sonic"
 
 runStarToFoam ()
 {
diff --git a/tutorials/compressible/sonicFoam/ras/prism/Allrun.in b/tutorials/compressible/sonicFoam/ras/prism/Allrun.in
index 6d47e0891..929937de7 100755
--- a/tutorials/compressible/sonicFoam/ras/prism/Allrun.in
+++ b/tutorials/compressible/sonicFoam/ras/prism/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="sonicFoam"
+application="sonic"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun.in b/tutorials/compressible/sonicLiquidFoam/Allrun.in
index 476133131..4a39724a0 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun.in
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="sonicLiquidFoam"
+application="sonicLiquid"
 
 setDecompressionTankFine ()
 {
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/Allrun.in b/tutorials/compressible/sonicLiquidFoam/decompressionTank/Allrun.in
similarity index 93%
copy from tutorials/combustion/dieselFoam/aachenBomb/Allrun.in
copy to tutorials/compressible/sonicLiquidFoam/decompressionTank/Allrun.in
index bf684000d..ed63d6951 100755
--- a/tutorials/combustion/dieselFoam/aachenBomb/Allrun.in
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="dieselFoam"
+application="sonicLiquid"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun.in b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun.in
index d8f236aef..07b1bcfb3 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun.in
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun.in
@@ -11,4 +11,4 @@ fi
 
 runApplication blockMesh
 runApplication dsmcInitialise
-runApplication dsmcFoam
+runApplication dsmc
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun.in b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun.in
index d8f236aef..07b1bcfb3 100755
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun.in
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun.in
@@ -11,4 +11,4 @@ fi
 
 runApplication blockMesh
 runApplication dsmcInitialise
-runApplication dsmcFoam
+runApplication dsmc
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun.in b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun.in
index 16f5d466c..16341d0d7 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun.in
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun.in
@@ -12,6 +12,6 @@ fi
 runApplication blockMesh
 runApplication decomposePar
 runParallel dsmcInitialise 4
-runParallel dsmcFoam 4
+runParallel dsmc 4
 runApplication reconstructPar -noLagrangian
 
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun.in b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun.in
index 16f5d466c..16341d0d7 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun.in
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun.in
@@ -12,6 +12,6 @@ fi
 runApplication blockMesh
 runApplication decomposePar
 runParallel dsmcInitialise 4
-runParallel dsmcFoam 4
+runParallel dsmc 4
 runApplication reconstructPar -noLagrangian
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun.in b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun.in
index 514231669..8efc0c4d7 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun.in
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="mdEquilibrationFoam"
+application="mdEquilibration"
 
 cd periodicCubeArgon
     runApplication blockMesh
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun.in b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun.in
index a210d5270..cf01860ca 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun.in
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application=mdFoam
+application="md"
 
 runApplication blockMesh
 
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/Allrun.in b/tutorials/electromagnetics/electrostaticFoam/chargedWire/Allrun.in
index 1feeaa8f8..778a4a80e 100755
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/Allrun.in
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="electrostaticFoam"
+application="electrostatic"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/electromagnetics/mhdFoam/Allrun.in b/tutorials/electromagnetics/mhdFoam/Allrun.in
index c1a41ad9a..e765cffa1 100755
--- a/tutorials/electromagnetics/mhdFoam/Allrun.in
+++ b/tutorials/electromagnetics/mhdFoam/Allrun.in
@@ -10,9 +10,9 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="mhdFoam"
+application="mhd"
 
 (cd hartmann && runApplication blockMesh)
 (cd hartmann && runApplication $application)
-(cd hartmann && runApplication foamCalc components U)
+(cd hartmann && runApplication calc components U)
 (cd hartmann && runApplication sample)
diff --git a/tutorials/financial/financialFoam/europeanCall/Allrun.in b/tutorials/financial/financialFoam/europeanCall/Allrun.in
index 452d5f06a..96375cabf 100755
--- a/tutorials/financial/financialFoam/europeanCall/Allrun.in
+++ b/tutorials/financial/financialFoam/europeanCall/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="financialFoam"
+application="financial"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun.in b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun.in
index 549af6764..6d5ea471a 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun.in
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application=buoyantBoussinesqPisoFoam
+application="buoyantBoussinesqPiso"
 
 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun.in b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun.in
index 6e8aaa898..47511eb37 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun.in
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application=buoyantBoussinesqSimpleFoam
+application="buoyantBoussinesqSimple"
 
 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun.in b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun.in
index fb2cb2159..84e3d0da0 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun.in
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun.in
@@ -11,5 +11,5 @@ fi
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication buoyantBoussinesqSimpleFoam
+runApplication buoyantBoussinesqSimple
 
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun.in b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun.in
index 55161dac7..37cb5de8f 100755
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun.in
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="buoyantPisoFoam"
+application="buoyantPiso"
 
 compileApplication setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun.in b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun.in
index d0ea0d393..dae80d0a7 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun.in
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="buoyantSimpleFoam"
+application="buoyantSimple"
 
 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/Allrun.in b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/Allrun.in
index f0e80ba7c..5ec93287d 100755
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/Allrun.in
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="buoyantSimpleRadiationFoam"
+application="buoyantSimpleRadiation"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/Allrun.in b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/Allrun.in
index f0e80ba7c..5ec93287d 100755
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/Allrun.in
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="buoyantSimpleRadiationFoam"
+application="buoyantSimpleRadiation"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.in b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.in
index 8b8ff2133..d5cf709df 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.in
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun.in
@@ -35,7 +35,7 @@ done
 
 
 #-- Run on single processor
-#runApplication chtMultiRegionFoam
+#runApplication chtMultiRegion
 
 # Decompose
 for i in bottomAir topAir heater leftSolid rightSolid
@@ -44,7 +44,7 @@ do
 done
 
 # Run
-runParallel chtMultiRegionFoam 4
+runParallel chtMultiRegion 4
 
 # Reconstruct
 for i in bottomAir topAir heater leftSolid rightSolid
@@ -59,7 +59,7 @@ echo
 for i in bottomAir topAir heater leftSolid rightSolid
 do
    touch "multiRegionHeater{$i}.OpenFOAM"
-   echo "created multiRegionHeater{$i}.OpenFOAM" > log.paraFoam.$i
+   echo "created multiRegionHeater{$i}.OpenFOAM" > log.para.$i
 done
 
 # -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun.in b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun.in
index c620c6119..f7fdb70cd 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun.in
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun.in
@@ -35,7 +35,7 @@ done
 
 
 #-- Run on single processor
-runApplication chtMultiRegionFoam
+runApplication chtMultiRegion
 
 
 ## Decompose
@@ -45,7 +45,7 @@ runApplication chtMultiRegionFoam
 #done
 #
 ## Run
-#runParallel chtMultiRegionFoam 4
+#runParallel chtMultiRegion 4
 #
 ## Reconstruct
 #for i in bottomAir topAir heater leftSolid rightSolid
@@ -60,7 +60,7 @@ echo
 for i in bottomAir topAir heater leftSolid rightSolid
 do
    touch "snappyMultiRegionHeater{$i}.OpenFOAM"
-   echo "created snappyMultiRegionHeater{$i}.OpenFOAM" > log.paraFoam.$i
+   echo "created snappyMultiRegionHeater{$i}.OpenFOAM" > log.para.$i
 done
 
 # -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun.in b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun.in
index 61fac30d0..6528bfa82 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun.in
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun.in
@@ -41,7 +41,7 @@ done
 
 
 #-- Run on single processor
-runApplication chtMultiRegionSimpleFoam
+runApplication chtMultiRegionSimple
 
 ## Decompose
 #for i in bottomAir topAir heater leftSolid rightSolid
@@ -50,7 +50,7 @@ runApplication chtMultiRegionSimpleFoam
 #done
 #
 ## Run
-#runParallel chtMultiRegionSimpleFoam 4
+#runParallel chtMultiRegionSimple 4
 #
 ## Reconstruct
 #for i in bottomAir topAir heater leftSolid rightSolid
@@ -65,7 +65,7 @@ echo
 for i in bottomAir topAir heater leftSolid rightSolid
 do
    touch "multiRegionHeater{$i}.OpenFOAM"
-   runApplication -l log.paraFoam.$i paraFoam -touch -region $i
+   runApplication -l log.para.$i para -touch -region $i
 done
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/CMakeLists.txt.in b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/CMakeLists.txt.in
index 33dfda87a..1fe89a85e 100644
--- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/CMakeLists.txt.in
+++ b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/CMakeLists.txt.in
@@ -43,9 +43,9 @@ set( SRCS
   MRFSimpleFoam.C
   )
 
-add_executable( MRFSimpleFoam ${SRCS} )
+add_executable( MRFSimple ${SRCS} )
 
-target_link_libraries( MRFSimpleFoam
+target_link_libraries( MRFSimple
   FF_OpenFOAM
   FF_incompressibleRASModels
   FF_incompressibleTransportModels
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun.in b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun.in
index 2ddc5d3d5..5459a6a4e 100755
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun.in
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun.in
@@ -10,7 +10,8 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application=../MRFSimpleFoam-build/MRFSimpleFoam
+application="../MRFSimpleFoam-build/MRFSimple"
 
+compileApplication ../MRFSimpleFoam
 ./makeMesh
 runApplication $application
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/Allrun.in b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/Allrun.in
index c71a36b30..61fe607c9 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/Allrun.in
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="boundaryFoam"
+application="boundary"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/Allrun.in b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/Allrun.in
index c71a36b30..61fe607c9 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/Allrun.in
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="boundaryFoam"
+application="boundary"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/channelFoam/channel395/Allrun.in b/tutorials/incompressible/channelFoam/channel395/Allrun.in
index b9f1589a3..2283e07b3 100755
--- a/tutorials/incompressible/channelFoam/channel395/Allrun.in
+++ b/tutorials/incompressible/channelFoam/channel395/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application directory
-application="channelFoam"
+application="channel"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/icoFoam/Allrun.in b/tutorials/incompressible/icoFoam/Allrun.in
index db0b7c24e..f21f21e4e 100755
--- a/tutorials/incompressible/icoFoam/Allrun.in
+++ b/tutorials/incompressible/icoFoam/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="icoFoam"
+application="ico"
 
 cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/incompressible/icoFoam/cavityGrade/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/incompressible/icoFoam/cavityGrade/Allrun.in
index 54f8c9880..02ec7343e 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/incompressible/icoFoam/cavityGrade/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="ico"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/incompressible/icoFoam/elbow/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/incompressible/icoFoam/elbow/Allrun.in
index 54f8c9880..02ec7343e 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/incompressible/icoFoam/elbow/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="ico"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/Allrun.in b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/Allrun.in
index 2335636b6..0b9369dc4 100755
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/Allrun.in
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="nonNewtonianIcoFoam"
+application="nonNewtonianIco"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/Allrun.in b/tutorials/incompressible/pimpleDyMFoam/movingCone/Allrun.in
index 31de9c535..baa72ac5a 100755
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/Allrun.in
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="pimpleDyMFoam"
+application="pimpleDyM"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun.in b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun.in
index f302e1299..c5c615ebb 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun.in
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun.in
@@ -21,7 +21,7 @@ cd ../wingMotion2D_simpleFoam
 runApplication extrudeMesh
 runApplication autoPatch 90 -overwrite
 runApplication createPatch -overwrite
-runApplication simpleFoam
+runApplication simple
 
 # Copy the mesh from the steady state case and map the results to a
 # mesh motion case, then solve transient.
@@ -31,7 +31,7 @@ cp -r 0.org 0
 runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
 mv 0/pointDisplacement.unmapped 0/pointDisplacement
 runApplication decomposePar
-runParallel pimpleDyMFoam 3
+runParallel pimpleDyM 3
 runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/Allrun.in b/tutorials/incompressible/pimpleFoam/t-junction/Allrun.in
index 2d9b6607d..4a9739a05 100755
--- a/tutorials/incompressible/pimpleFoam/t-junction/Allrun.in
+++ b/tutorials/incompressible/pimpleFoam/t-junction/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="pimpleFoam"
+application="pimple"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/Allrun.in b/tutorials/incompressible/pisoFoam/les/pitzDaily/Allrun.in
index 1988d8106..d65d76374 100755
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/Allrun.in
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="pisoFoam"
+application="piso"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun.in b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun.in
index 027a24d9a..2ad81e2b4 100755
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun.in
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="pisoFoam"
+application="piso"
 
 runApplication blockMesh
 runApplication changeDictionary
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/Allrun.in b/tutorials/incompressible/pisoFoam/ras/cavity/Allrun.in
index 1988d8106..d65d76374 100755
--- a/tutorials/incompressible/pisoFoam/ras/cavity/Allrun.in
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="pisoFoam"
+application="piso"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun.in b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun.in
index 731c27fbd..ead23f927 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun.in
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun.in
@@ -10,4 +10,4 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 runApplication blockMesh
-runApplication porousSimpleFoam
+runApplication porousSimple
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun.in b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun.in
index 731c27fbd..ead23f927 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun.in
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun.in
@@ -10,4 +10,4 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 runApplication blockMesh
-runApplication porousSimpleFoam
+runApplication porousSimple
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/Allrun.in b/tutorials/incompressible/shallowWaterFoam/squareBump/Allrun.in
index a1005c6c2..4586180f8 100755
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/Allrun.in
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="shallowWaterFoam"
+application="shallowWater"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun.in b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun.in
index 4241ce088..fd08c572a 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun.in
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun.in
@@ -10,6 +10,6 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="simpleFoam"
+application="simple"
 
 runApplication $application
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun.in b/tutorials/incompressible/simpleFoam/motorBike/Allrun.in
index bc705d5a3..3dde6cf40 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun.in
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun.in
@@ -11,5 +11,5 @@ fi
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication simpleFoam
+runApplication simple
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/Allrun.in b/tutorials/incompressible/simpleFoam/pitzDaily/Allrun.in
index 59e7e325b..a1f4a04f1 100755
--- a/tutorials/incompressible/simpleFoam/pitzDaily/Allrun.in
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="simpleFoam"
+application="simple"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/Allrun.in b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/Allrun.in
index 59e7e325b..a1f4a04f1 100755
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/Allrun.in
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="simpleFoam"
+application="simple"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/Allrun.in b/tutorials/incompressible/simpleSRFFoam/mixer/Allrun.in
index 8b1efa371..19c90f716 100755
--- a/tutorials/incompressible/simpleSRFFoam/mixer/Allrun.in
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/Allrun.in
@@ -10,7 +10,8 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="simpleSRFFoam"
+application="../simpleSRFFoam-build/simpleSRF"
 
+compileApplication ../simpleSRFFoam
 runApplication blockMesh
-runApplication ../$application-build/$application
+runApplication $application
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/CMakeLists.txt.in b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/CMakeLists.txt.in
index 07286db1e..3d30e5577 100644
--- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/CMakeLists.txt.in
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/CMakeLists.txt.in
@@ -43,9 +43,9 @@ set( SRCS
   simpleSRFFoam.C
   )
 
-add_executable( simpleSRFFoam ${SRCS} )
+add_executable( simpleSRF ${SRCS} )
 
-target_link_libraries( simpleSRFFoam
+target_link_libraries( simpleSRF
   FF_OpenFOAM
   FF_incompressibleRASModels
   FF_incompressibleTransportModels
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun.in b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun.in
index 42e27cc08..9adc06069 100755
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun.in
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun.in
@@ -11,7 +11,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="coalChemistryFoam"
+application="coalChemistry"
 
 # create mesh
 runApplication blockMesh
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun.in b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun.in
index dc6a4b466..73b42eae9 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun.in
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application=porousExplicitSourceReactingParcelFoam
+application="porousExplicitSourceReactingParcel"
 
 # create mesh
 runApplication blockMesh
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/Allrun.in b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/Allrun.in
index da6faedcc..303069dad 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/Allrun.in
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application=porousExplicitSourceReactingParcelFoam
+application=porousExplicitSourceReactingParcel
 
 # create mesh
 runApplication blockMesh
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun.in b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun.in
index af25d0ee8..b2ab3cb13 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun.in
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/Allrun.in
@@ -12,9 +12,9 @@ fi
 # create mesh
 runApplication blockMesh
 
-# initialise with potentialFoam solution
-runApplication potentialFoam
+# initialise with potential solution
+runApplication potential
 rm -f 0/phi
 
 # run the solver
-runApplication porousExplicitSourceReactingParcelFoam
+runApplication porousExplicitSourceReactingParcel
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/Allrun.in b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/Allrun.in
index dbfdba6d7..d6f82c04e 100755
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/Allrun.in
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="reactingParcelFoam"
+application="reactingParcel"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt.in b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt.in
index 4fc4b5507..eaaf45589 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt.in
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt.in
@@ -43,9 +43,9 @@ set( SRCS
   rhoPisoTwinParcelFoam.C
   )
 
-add_executable( rhoPisoTwinParcelFoam ${SRCS} )
+add_executable( rhoPisoTwinParcel ${SRCS} )
 
-target_link_libraries( rhoPisoTwinParcelFoam
+target_link_libraries( rhoPisoTwinParcel
   FF_OpenFOAM
   FF_lagrangian
   FF_lagrangianIntermediate
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun.in b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun.in
index 4fde7554f..9095cfeec 100755
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun.in
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun.in
@@ -10,7 +10,8 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="rhoPisoTwinParcelFoam"
+application="../rhoPisoTwinParcelFoam-build/rhoPisoTwinParcel"
 
+compileApplication ../rhoPisoTwinParcelFoam
 runApplication blockMesh
-runApplication ../$application-build/$application
+runApplication $application
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/Allrun.in b/tutorials/multiphase/bubbleFoam/bubbleColumn/Allrun.in
index 39230d6bc..e168bb090 100755
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/Allrun.in
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="bubbleFoam"
+application="bubble"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun.in b/tutorials/multiphase/cavitatingFoam/les/Allrun.in
index 6d9887fd6..7153eb9e3 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun.in
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="cavitatingFoam"
+application="cavitating"
 
 refineMeshByCellSet()
 {
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/multiphase/cavitatingFoam/les/throttle/Allrun.in
index 54f8c9880..6ec7f6235 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="cavitating"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun.in
index 54f8c9880..6ec7f6235 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="cavitating"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun.in b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun.in
index ad08d7cb9..34c32d984 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun.in
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="cavitatingFoam"
+application="cavitating"
 
 refineMeshByCellSet()
 {
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun.in b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun.in
index 222ee3dda..ab3d9fc1f 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun.in
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="compressibleInterFoam"
+application="compressibleInter"
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun.in b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun.in
index 62c1ec69e..b7aa73cef 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun.in
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="compressibleInterFoam"
+application="compressibleInter"
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun.in
index 763dc8a7a..bc0fbb9da 100755
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun.in
@@ -13,4 +13,4 @@ runApplication blockMesh
 runApplication setSet -batch createObstacle.setSet
 runApplication subsetMesh c0 -patch walls
 runApplication setFields
-runApplication interDyMFoam
+runApplication interDyM
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun.in
index c43313b13..b732528b7 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun.in
@@ -11,7 +11,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Set application name
-application="interDyMFoam"
+application="interDyM"
 
 makeMeshByCellSet()
 {
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun.in
index 4c2c78d72..a2dbf71db 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun.in
@@ -13,4 +13,4 @@ fi
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
-runApplication interDyMFoam
+runApplication interDyM
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun.in
index 4c2c78d72..a2dbf71db 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun.in
@@ -13,4 +13,4 @@ fi
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
-runApplication interDyMFoam
+runApplication interDyM
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun.in
index 4c2c78d72..a2dbf71db 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun.in
@@ -13,4 +13,4 @@ fi
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
-runApplication interDyMFoam
+runApplication interDyM
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun.in
index 4c2c78d72..a2dbf71db 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun.in
@@ -13,4 +13,4 @@ fi
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
-runApplication interDyMFoam
+runApplication interDyM
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun.in b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun.in
index 4c2c78d72..a2dbf71db 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun.in
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun.in
@@ -13,4 +13,4 @@ fi
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
-runApplication interDyMFoam
+runApplication interDyM
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/CMakeLists.txt.in b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/CMakeLists.txt.in
index 0d67209de..cab787936 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/CMakeLists.txt.in
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/CMakeLists.txt.in
@@ -43,14 +43,13 @@ set( SRCS
   MRFInterFoam.C
   )
 
-message( "WARNING: Check include_directories in ${CMAKE_CURRENT_LIST_FILE}" )
 include_directories(
   ${CMAKE_SOURCE_DIR}/applications/solvers/multiphase/interFoam
   )
 
-add_executable( MRFInterFoam ${SRCS} )
+add_executable( MRFInter ${SRCS} )
 
-target_link_libraries( MRFInterFoam
+target_link_libraries( MRFInter
   FF_OpenFOAM
   FF_interfaceProperties
   FF_incompressibleTransportModels
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun.in b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun.in
index d9be0d481..cd41736e8 100755
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun.in
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun.in
@@ -10,7 +10,8 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="MRFInterFoam"
+application="../MRFInterFoam-build/MRFInter"
 
+compileApplication ../MRFInterFoam
 ./makeMesh
-runApplication ../$application-build/$application
+runApplication $application
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun.in b/tutorials/multiphase/interFoam/laminar/Allrun.in
index c4cbfce7a..519558b55 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun.in
+++ b/tutorials/multiphase/interFoam/laminar/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="interFoam"
+application="inter"
 
 setDamBreakFine ()
 {
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun.in
similarity index 94%
copy from tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
copy to tutorials/multiphase/interFoam/laminar/damBreak/Allrun.in
index 54f8c9880..41b3a17d2 100755
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/Allrun.in
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="XiFoam"
+application="inter"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun.in b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun.in
index 04f1567f6..29ef3740e 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun.in
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="interFoam"
+application="inter"
 
 runRefineMesh ()
 {
diff --git a/tutorials/multiphase/interFoam/ras/Allrun.in b/tutorials/multiphase/interFoam/ras/Allrun.in
index fc40f7741..f8eeaf41d 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun.in
+++ b/tutorials/multiphase/interFoam/ras/Allrun.in
@@ -9,7 +9,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="interFoam"
+application="inter"
 
 setDamBreakFine ()
 {
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun.in b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun.in
index a206fe0a4..cd4b6dc3e 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun.in
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allrun.in
@@ -14,4 +14,4 @@ cp 0/alpha1.org 0/alpha1
 cp 0/alpha2.org 0/alpha2
 cp 0/alpha3.org 0/alpha3
 runApplication setFields
-runApplication interMixingFoam
+runApplication interMixing
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun.in b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun.in
index 0565b99f5..fd48d4afc 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun.in
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun.in
@@ -17,5 +17,5 @@ runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 
 # Run the solver
-runApplication interPhaseChangeFoam
+runApplication interPhaseChange
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun.in b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun.in
index df3a9d33b..8e0f42e7d 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun.in
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="multiphaseInterFoam"
+application="multiphaseInter"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun.in b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun.in
index df3a9d33b..8e0f42e7d 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun.in
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="multiphaseInterFoam"
+application="multiphaseInter"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/Allrun.in b/tutorials/multiphase/settlingFoam/ras/dahl/Allrun.in
index a95291101..c0b1c4ab9 100755
--- a/tutorials/multiphase/settlingFoam/ras/dahl/Allrun.in
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="settlingFoam"
+application="settling"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun.in b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun.in
index b7c6b9cb2..a3b580f3d 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun.in
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun.in
@@ -9,6 +9,6 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
   export FREEFOAM_CONFIG_DIR='${TEST_CONFIG_DIR}'
 fi
 
-application="settlingFoam"
+application="settling"
 
 runApplication $application
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/Allrun.in b/tutorials/multiphase/twoPhaseEulerFoam/bed/Allrun.in
index eb4bb3106..46d90ed93 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/Allrun.in
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="twoPhaseEulerFoam"
+application="twoPhaseEuler"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/Allrun.in b/tutorials/multiphase/twoPhaseEulerFoam/bed2/Allrun.in
index eb4bb3106..46d90ed93 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/Allrun.in
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="twoPhaseEulerFoam"
+application="twoPhaseEuler"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/Allrun.in b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/Allrun.in
index eb4bb3106..46d90ed93 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/Allrun.in
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="twoPhaseEulerFoam"
+application="twoPhaseEuler"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun.in b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun.in
index e7a1da33d..70808850f 100755
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun.in
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="solidDisplacementFoam"
+application="solidDisplacement"
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/Allrun.in b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/Allrun.in
index 0d4828586..c080eb888 100755
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/Allrun.in
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/Allrun.in
@@ -10,7 +10,7 @@ if [ "$FREEFOAM_TEST_MODE" == "yes" ]; then
 fi
 
 # Get application name from directory
-application="solidEquilibriumDisplacementFoam"
+application="solidEquilibriumDisplacement"
 
 runApplication blockMesh
 runApplication $application
-- 
2.11.4.GIT