diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 0eb650222f8b4bba331d5e5f8f161a77f6a044a9..91351597fe5ce6c85a93dbd28c6fa81917e479a5 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES( ogs-gui
 	#MSHGEOTOOLS
 	QtBase
 	QtDataView
-	StratView
+	QtStratView
 	VtkVis
 	VtkAct
 	${Boost_LIBRARIES}
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index eb1566eb452f84f054f3ee18b0751753301222c4..748d2425b7eca9d7df3286dc0e01b7fdf4365b66 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -179,8 +179,8 @@ target_link_libraries( QtDataView
 	GeoLib
 	MeshLib
 	QtBase
-	DiagramView
-	StratView
+	QtDiagramView
+	QtStratView
 	shp
 )
 
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 10bfe2b0fc1df0d1a30aeb4eeb4b13e597b7d1e0..a0ab870c4369fcbbfa6956e87ac4f8b63cfaa513 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -55,8 +55,7 @@ INCLUDE_DIRECTORIES(
 SOURCE_GROUP("Moc Files" REGULAR_EXPRESSION moc_*)
 
 # Create the library
-#add_executable( DiagramView
-ADD_LIBRARY( DiagramView STATIC
+ADD_LIBRARY( QtDiagramView STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
@@ -65,9 +64,9 @@ ADD_LIBRARY( DiagramView STATIC
 )
 
 # Link Qt library
-TARGET_LINK_LIBRARIES( DiagramView
+TARGET_LINK_LIBRARIES( QtDiagramView
 	${QT_LIBRARIES}
 	GeoLib
 )
 
-SET_PROPERTY(TARGET DiagramView PROPERTY FOLDER "DataExplorer")
+SET_PROPERTY(TARGET QtDiagramView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 05ef44cec747018deb2441c6d8943656f20da65e..8b655b18f1c3eb4a93938fee1be31a24ce6b3efb 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -47,7 +47,7 @@ source_group("Moc Files" REGULAR_EXPRESSION moc_*)
 
 # Create the library
 #add_executable( StratView
-add_library( StratView STATIC
+add_library( QtStratView STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
@@ -56,11 +56,11 @@ add_library( StratView STATIC
 )
 
 # Link Qt library
-target_link_libraries( StratView
+target_link_libraries( QtStratView
 	${QT_LIBRARIES}
 	BaseLib
 	GeoLib
 	MathLib
 )
 
-set_property(TARGET StratView PROPERTY FOLDER "DataExplorer")
+set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")