diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 3a6e3b141f..312f103f21 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -33,8 +33,8 @@ include_directories(
     ${ResInsight_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common/
     ${custom-opm-parser_SOURCE_DIR}/opm-parser/
     ${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/
-    ${custom-opm-flowdiagnostics-applications_SOURCE_DIR}/opm-flowdiagnostics-applications/
-    ${custom-opm-flowdiagnostics-applications_SOURCE_DIR}/opmCore
+    ${custom-opm-flowdiag-app_SOURCE_DIR}/opm-flowdiagnostics-applications/
+    ${custom-opm-flowdiag-app_SOURCE_DIR}/opmCore
 
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/Adm
@@ -286,7 +286,7 @@ endif()
 set( LINK_LIBRARIES
     custom-opm-parser
     custom-opm-flowdiagnostics
-    custom-opm-flowdiagnostics-applications
+    custom-opm-flowdiag-app
         
     WellPathImportSsihub
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a14fb334a7..d1e40d0efe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,7 @@ endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
 add_subdirectory(ThirdParty/custom-opm-parser)
 add_subdirectory(ThirdParty/custom-opm-parser/custom-opm-parser-tests)
 add_subdirectory(ThirdParty/custom-opm-flowdiagnostics)
-add_subdirectory(ThirdParty/custom-opm-flowdiagnostics-applications)
+add_subdirectory(ThirdParty/custom-opm-flowdiag-app)
 
 ################################################################################
 # NRLib
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/CMakeLists.txt b/ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt
similarity index 84%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/CMakeLists.txt
rename to ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt
index 894140eeb5..b925ff2ca5 100644
--- a/ThirdParty/custom-opm-flowdiagnostics-applications/CMakeLists.txt
+++ b/ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 
-project (custom-opm-flowdiagnostics-applications)
+project (custom-opm-flowdiag-app)
 
 include_directories(
     ../custom-opm-flowdiagnostics/opm-flowdiagnostics
@@ -21,7 +21,7 @@ foreach (file ${project_source_files} )
     list(APPEND project_source_files_complete_path1 "opm-flowdiagnostics-applications/${file}" )
 endforeach()
 
-add_library(custom-opm-flowdiagnostics-applications
+add_library(custom-opm-flowdiag-app
     ${project_source_files_complete_path1} 
 )
 
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/.gitignore b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/.gitignore
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/.gitignore
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/.gitignore
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/CMakeLists.txt b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists.txt
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/CMakeLists.txt
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists.txt
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/CMakeLists_files.cmake b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists_files.cmake
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/CMakeLists_files.cmake
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/CMakeLists_files.cmake
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/LICENSE b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/LICENSE
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/LICENSE
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/LICENSE
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/README.md b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/README.md
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/README.md
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/README.md
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/dune.module b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/dune.module
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/dune.module
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/dune.module
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/computeToFandTracers.cpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/examples/exampleSetup.hpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/exampleSetup.hpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/examples/exampleSetup.hpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/examples/exampleSetup.hpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLGraph.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLGraph.cpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLGraph.cpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLGraph.cpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLGraph.hpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLGraph.hpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLGraph.hpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLGraph.hpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLResultData.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLResultData.cpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLResultData.cpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLResultData.cpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLResultData.hpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLResultData.hpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLResultData.hpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLResultData.hpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.cpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.hpp b/ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.hpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.hpp
rename to ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLWellSolution.hpp
diff --git a/ThirdParty/custom-opm-flowdiagnostics-applications/opmCore/opm/parser/eclipse/Units/Units.hpp b/ThirdParty/custom-opm-flowdiag-app/opmCore/opm/parser/eclipse/Units/Units.hpp
similarity index 100%
rename from ThirdParty/custom-opm-flowdiagnostics-applications/opmCore/opm/parser/eclipse/Units/Units.hpp
rename to ThirdParty/custom-opm-flowdiag-app/opmCore/opm/parser/eclipse/Units/Units.hpp