diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 57be6dfe8..81ee2e7c2 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -120,7 +120,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER)
 	ENDIF()
 
 	#########################################################################################
-	# megaglest G3D Model Viewer
+	# zetaglest G3D Model Viewer
 
 	SET(DIRS_WITH_SRC
 	    .
@@ -200,7 +200,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER)
 		TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
 	ENDIF()
 
-	TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
+	TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest)
 	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
 
 	IF(EXISTS ${HELP2MAN} AND NOT APPLE)
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index b4b2d343b..17104e116 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -175,7 +175,7 @@ IF(BUILD_ZETAGLEST)
     ENDIF()
 
 	#########################################################################################
-	# megaglest game
+	# zetaglest game
 
 	SET(DIRS_WITH_SRC
 	   	ai
@@ -289,14 +289,14 @@ IF(BUILD_ZETAGLEST)
 	endif()
 
 	IF(WIN32)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${ZG_STREFLOP} libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32)
+		TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${ZG_STREFLOP} libzetaglest stdc++ moldname mingwex msvcrt user32 kernel32)
 	ENDIF()
 
 	IF(NOT WIN32)
 		IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
 			TARGET_LINK_LIBRARIES(${TARGET_NAME} ${ZG_STREFLOP})
 		ENDIF()
-		TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
+		TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest)
 	ENDIF()
 	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
 
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 8121abf74..6bb778468 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -182,14 +182,14 @@ IF(BUILD_ZETAGLEST_MAP_EDITOR)
 	ENDIF()
 
 	IF(WIN32)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${MG_STREFLOP} libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32)
+		TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${MG_STREFLOP} libzetaglest stdc++ moldname mingwex msvcrt user32 kernel32)
 	ENDIF()
 
 	IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
 		TARGET_LINK_LIBRARIES(${TARGET_NAME} ${MG_STREFLOP})
 	ENDIF()
 
-	TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
+	TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest)
 	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
 
 	IF(EXISTS ${HELP2MAN} AND NOT APPLE)
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 6ae34ba88..cbf847354 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -43,10 +43,10 @@ ENDIF()
 # common libraries
 
 SET(EXTERNAL_LIBS "")
-SET(TARGET_NAME "libmegaglest")
+SET(TARGET_NAME "libzetaglest")
 
 IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_MAP_EDITOR OR BUILD_ZETAGLEST)
-	MESSAGE(STATUS "Will try to build MegaGlest shared library")
+	MESSAGE(STATUS "Building ZetaGlest shared library...")
 
 	INCLUDE (CheckIncludeFiles)
 
@@ -258,7 +258,7 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_MAP_EDITOR OR BUILD_ZETAGLEST
 	endif()
 
 	#########################################################################################
-	# megaglest lib
+	# zetaglest lib
 
 	SET(DIRS_WITH_SRC
         compression
@@ -488,10 +488,10 @@ IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_MAP_EDITOR OR BUILD_ZETAGLEST
 
 	MESSAGE(STATUS "EXTERNAL_LIBS = [${EXTERNAL_LIBS}]")
 
-	OPTION(MINIUPNP_DEBUG_BUILD "Build MegaGlest with UPNP DEBUG enabled" OFF)
+	OPTION(MINIUPNP_DEBUG_BUILD "Build ZetaGlest with UPNP DEBUG enabled" OFF)
 	MARK_AS_ADVANCED(MINIUPNP_DEBUG_BUILD)
 	IF(MINIUPNP_DEBUG_BUILD)
-		MESSAGE(STATUS "Will try to build MegaGlest shared library with DEBUG info for UPNP")
+		MESSAGE(STATUS "Building ZetaGlest shared library with DEBUG info for UPNP...")
 		ADD_DEFINITIONS("-DDEBUG")
 	ENDIF()
 
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
index 360a77e2d..51e44a553 100644
--- a/source/tests/CMakeLists.txt
+++ b/source/tests/CMakeLists.txt
@@ -196,7 +196,7 @@ IF(BUILD_ZETAGLEST_TESTS)
 		IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
 			TARGET_LINK_LIBRARIES(${TARGET_NAME} ${MG_STREFLOP})
 		ENDIF()
-		TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
+		TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest)
 	ENDIF()
 
         TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})