diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38a4f15..1ffd973 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 if (POLICY CMP0054)
 	cmake_policy(SET CMP0054 NEW)
 endif()
-project(qglengine)
+project(QGLEngine)
 find_package(QAD REQUIRED)
 shstk_qt_founded(QtVersions)
 set(_qgl_ok 0)
@@ -23,18 +23,18 @@ else()
 	find_package(OpenGL REQUIRED)
 	include(SHSTKQtMacros)
 	
-	set(qglengine_MAJOR    1)
-	set(qglengine_MINOR    0)
-	set(qglengine_REVISION 0)
-	set(qglengine_SUFFIX   "rc")
-	set(qglengine_COMPANY  SHS)
-	set(qglengine_DOMAIN   org.SHS)
+	set(QGLEngine_MAJOR    1)
+	set(QGLEngine_MINOR    0)
+	set(QGLEngine_REVISION 0)
+	set(QGLEngine_SUFFIX   "rc")
+	set(QGLEngine_COMPANY  SHS)
+	set(QGLEngine_DOMAIN   org.SHS)
 
 	if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
 		set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 	endif()
 
-	shstk_begin_project(qglengine QGLENGINE)
+	shstk_begin_project(QGLEngine)
 
 	qad_sources(SRC)
 	qad_sources(FSRC DIR "formats")
@@ -44,20 +44,20 @@ else()
 	qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 	file(GLOB PHS "*_p.h" "formats/*_p.h" "core/*_p.h")
 	list(REMOVE_ITEM out_HDR "${PHS}")
-	import_version(qglengine_core qglengine)
-	set_deploy_property(qglengine_core ${qglengine_LIB_TYPE}
+	import_version(qglengine_core QGLEngine)
+	set_deploy_property(qglengine_core ${QGLEngine_LIB_TYPE}
 		LABEL "QGLEngine core library"
-		FULLNAME "${qglengine_DOMAIN}.qglengine_core"
-		COMPANY "${qglengine_COMPANY}"
+		FULLNAME "${QGLEngine_DOMAIN}.qglengine_core"
+		COMPANY  "${QGLEngine_COMPANY}"
 		INFO "QGLEngine core library")
 	make_rc(qglengine_core _RC)
-	qad_add_library(qglengine_core ${qglengine_LIB_TYPE} out_CPP ${_RC})
+	qad_add_library(qglengine_core ${QGLEngine_LIB_TYPE} out_CPP ${_RC})
 	qad_generate_export_header(qglengine_core)
 	list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/qglengine_core_export.h")
-	list(APPEND out_HDR "${qglengine_VERSION_FILE}")
+	list(APPEND out_HDR "${QGLEngine_VERSION_FILE}")
 	qad_target_include_directories(qglengine_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core")
 	qad_target_link_libraries(qglengine_core QAD::Widgets assimp ${OPENGL_LIBRARIES})
-	message(STATUS "Building QGLEngine version ${qglengine_VERSION} (${qglengine_LIB_TYPE_MSG}) for ${QtVersions}")
+	message(STATUS "Building QGLEngine version ${QGLEngine_VERSION} (${QGLEngine_LIB_TYPE_MSG}) for ${QtVersions}")
 	list(APPEND QT_MULTILIB_LIST qglengine_core)
 	add_subdirectory(widgets)
 	shstk_copy_to_parent()
diff --git a/cmake/FindQGLEngine.cmake b/cmake/FindQGLEngine.cmake
index 055823c..7c070fc 100644
--- a/cmake/FindQGLEngine.cmake
+++ b/cmake/FindQGLEngine.cmake
@@ -17,16 +17,14 @@ include(SHSTKMacros)
 
 shstk_is_parent_exists(hasParent PARENT_DIRECTORY)
 
-shstk_set_find_dirs(qglengine QGLEngine)
-set(_SEARCH_DIR ${qglengine_LIBDIR})
+shstk_set_find_dirs(QGLEngine)
 
-if (NOT BUILDING_qglengine)
-	list(APPEND _SEARCH_DIR $ENV{SMSDK_DIR}/lib)
-	shstk_find_header(qglengine QGLENGINE "qglengine_version.h" "")
+if (NOT BUILDING_QGLEngine)
+	shstk_find_header(QGLEngine "qglengine_version.h" ${QGLEngine_INCDIR})
 endif()
 
-if(QGLENGINE_FIND_VERSION VERSION_GREATER QGLENGINE_VERSION)
-	message(FATAL_ERROR "QGLENGINE version ${QGLENGINE_VERSION} is available, but ${QGLENGINE_FIND_VERSION} requested!")
+if(QGLEngine_FIND_VERSION VERSION_GREATER QGLEngine_VERSION)
+	message(FATAL_ERROR "QGLEngine version ${QGLEngine_VERSION} is available, but ${QGLEngine_FIND_VERSION} requested!")
 endif()
 
 set(__libs "core;widgets")
@@ -43,12 +41,12 @@ endforeach()
 set(__deps_core    "QAD::Widgets")
 set(__deps_widgets "QGLEngine::Core")
 
-#message("find QGLEngine ${BUILDING_qglengine}")
+#message("find QGLEngine ${BUILDING_QGLEngine}")
 
-if (BUILDING_qglengine)
+if (BUILDING_QGLEngine)
 
-	if (NOT SET_TARGETS_qglengine)
-		set(SET_TARGETS_qglengine ON CACHE BOOL "")
+	if (NOT SET_TARGETS_QGLEngine)
+		set(SET_TARGETS_QGLEngine ON CACHE BOOL "")
 		#message("create aliases")
 		foreach(_l ${__libs})
 			foreach(_v ${_QT_VERSIONS_})
@@ -71,7 +69,7 @@ else()
 	foreach(_l ${__libs})
 		foreach(_v ${_QT_VERSIONS_})
 			set(_m ${__module_${_l}})
-			find_library(QGLENGINE_LIBRARY_${_l}${_v} qglengine_${_l}${_v} HINTS ${_SEARCH_DIR})
+			find_library(QGLENGINE_LIBRARY_${_l}${_v} qglengine_${_l}${_v} HINTS ${QGLEngine_LIBDIR})
 			#message("found ${_l}${_v} = ${QGLENGINE_LIBRARY_${_l}${_v}} (${qglengine_INCLUDES})")
 			if((NOT TARGET QGLEngine::${_m}${_v}) AND QGLENGINE_LIBRARY_${_l}${_v})
 				#message("imported QGLEngine::${_m}${_v} = ${QGLENGINE_LIBRARY_${_l}${_v}}")
@@ -87,7 +85,7 @@ else()
 				endforeach()
 				set_target_properties(QGLEngine::${_m}${_v} PROPERTIES
 					IMPORTED_LOCATION "${QGLENGINE_LIBRARY_${_l}${_v}}"
-					INTERFACE_INCLUDE_DIRECTORIES "${qglengine_INCLUDES}"
+					INTERFACE_INCLUDE_DIRECTORIES "${QGLEngine_INCLUDES}"
 					INTERFACE_LINK_LIBRARIES "${_deps}")
 			endif()
 		endforeach()
diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index 52ef500..d9a46c3 100644
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -8,14 +8,14 @@ qad_sources(SRC)
 qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 file(GLOB PHS "*_p.h")
 list(REMOVE_ITEM out_HDR "${PHS}")
-import_version(${PROJECT_NAME} qglengine)
-set_deploy_property(${PROJECT_NAME} ${qglengine_LIB_TYPE}
+import_version(${PROJECT_NAME} QGLEngine)
+set_deploy_property(${PROJECT_NAME} ${QGLEngine_LIB_TYPE}
 	LABEL "QGLEngine widgets library"
-	FULLNAME "${qglengine_DOMAIN}.${PROJECT_NAME}"
-	COMPANY "${qglengine_COMPANY}"
+	FULLNAME "${QGLEngine_DOMAIN}.${PROJECT_NAME}"
+	COMPANY  "${QGLEngine_COMPANY}"
 	INFO "QGLEngine widgets library")
 make_rc(${PROJECT_NAME} _RC)
-qad_add_library(${PROJECT_NAME} ${qglengine_LIB_TYPE} out_CPP ${_RC})
+qad_add_library(${PROJECT_NAME} ${QGLEngine_LIB_TYPE} out_CPP ${_RC})
 qad_generate_export_header(${PROJECT_NAME})
 list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h")
 qad_target_link_libraries(${PROJECT_NAME} QAD::Widgets qglengine_core)