aregtech · aregtech · Aug 23, 2023 · Aug 21, 2023 · Aug 22, 2023 · Aug 22, 2023
diff --git a/areg-sdk.sln b/areg-sdk.sln
@@ -8,7 +8,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mcrouter", "framework\mcrouter.vcxproj", "{24A4F250-C09B-40BF-A6F2-25BD8ABBED6F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5} = {2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5}
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E} = {A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3} = {FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FD549A95-E734-4E26-A5B2-2330FC310C8D}"
@@ -302,14 +302,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "14_pubclient", "examples\14
 	ProjectSection(ProjectDependencies) = postProject
 		{2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5} = {2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5}
 		{5B38C49F-3C26-43CD-B457-75806BFE69EC} = {5B38C49F-3C26-43CD-B457-75806BFE69EC}
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E} = {A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "14_pubservice", "examples\14_pubtraffic\14_pubservice.vcxproj", "{2BE2FB7A-E258-4AE1-A744-D52BD7ACC548}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5} = {2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5}
 		{5B38C49F-3C26-43CD-B457-75806BFE69EC} = {5B38C49F-3C26-43CD-B457-75806BFE69EC}
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E} = {A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "15_pubworker", "15_pubworker", "{5EE61717-AD86-46E4-B4D0-5AA9280B0E09}"
@@ -447,14 +445,12 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "20_pubclient", "examples\20_pubdatarate\20_pubclient.vcxproj", "{70307B6F-61D5-4015-8578-E0E3549B7AB9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5} = {2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5}
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E} = {A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}
 		{B8900569-8956-47AF-A2E7-50EB1DD788DD} = {B8900569-8956-47AF-A2E7-50EB1DD788DD}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "20_pubservice", "examples\20_pubdatarate\20_pubservice.vcxproj", "{2F18E4B1-966E-4A8D-B91E-8F216186A6E3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5} = {2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5}
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E} = {A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}
 		{B8900569-8956-47AF-A2E7-50EB1DD788DD} = {B8900569-8956-47AF-A2E7-50EB1DD788DD}
 	EndProjectSection
 EndProject
@@ -516,7 +512,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "thirdparty\gt
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "areg-unit-tests", "tests\areg-unit-tests.vcxproj", "{E8BD18E5-EF07-42A0-BB98-461F3D9BCDE1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E} = {A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3} = {FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "res", "res", "{C485A89F-A149-4893-A023-253593403974}"
@@ -526,8 +522,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "res", "res", "{C485A89F-A14
 		examples\21_pubunblock\res\HelloUnblock.siml = examples\21_pubunblock\res\HelloUnblock.siml
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "areg-extensions", "framework\areg-extensions.vcxproj", "{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wiki", "wiki", "{D2A3A8BC-F3AC-499C-AE2C-19AC78F5EAFB}"
 	ProjectSection(SolutionItems) = preProject
 		docs\wiki\01.-Clone-source-codes.md = docs\wiki\01.-Clone-source-codes.md
@@ -546,8 +540,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "framework\logger.vcxproj", "{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5} = {2DF8165C-EDE2-4F76-8D2C-2FFE82CB6CE5}
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3} = {FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "areg-extend", "framework\areg-extend.vcxproj", "{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -988,14 +985,6 @@ Global
 		{E8BD18E5-EF07-42A0-BB98-461F3D9BCDE1}.Release|Win32.Build.0 = Release|Win32
 		{E8BD18E5-EF07-42A0-BB98-461F3D9BCDE1}.Release|x64.ActiveCfg = Release|x64
 		{E8BD18E5-EF07-42A0-BB98-461F3D9BCDE1}.Release|x64.Build.0 = Release|x64
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Debug|Win32.Build.0 = Debug|Win32
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Debug|x64.ActiveCfg = Debug|x64
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Debug|x64.Build.0 = Debug|x64
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Release|Win32.ActiveCfg = Release|Win32
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Release|Win32.Build.0 = Release|Win32
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Release|x64.ActiveCfg = Release|x64
-		{A3E5EE71-6F14-43FD-A80F-C7791FD64E9E}.Release|x64.Build.0 = Release|x64
 		{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}.Debug|Win32.Build.0 = Debug|Win32
 		{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}.Debug|x64.ActiveCfg = Debug|x64
@@ -1004,6 +993,14 @@ Global
 		{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}.Release|Win32.Build.0 = Release|Win32
 		{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}.Release|x64.ActiveCfg = Release|x64
 		{0A2D4D13-6AC2-4602-BF8F-DA73133C1974}.Release|x64.Build.0 = Release|x64
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Debug|Win32.Build.0 = Debug|Win32
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Debug|x64.ActiveCfg = Debug|x64
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Debug|x64.Build.0 = Debug|x64
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Release|Win32.ActiveCfg = Release|Win32
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Release|Win32.Build.0 = Release|Win32
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Release|x64.ActiveCfg = Release|x64
+		{FBC5BEAE-01B9-4943-A5CB-0D3DE2067EB3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/conf/cmake/common.cmake b/conf/cmake/common.cmake
@@ -33,7 +33,7 @@ set(AREG_DEVELOP_ENV)
 set(AREG_LDFLAGS)
 # The compiler options
 set(AREG_COMPILER_OPTIONS)
-#set areg extensions library dependencies
+#set areg extended static library dependencies
 set(AREG_EXTENDED_LIBS)
 
 # Adding common definition
@@ -231,5 +231,5 @@ message(STATUS "-------------------- CMakeLists Status Report Begin ------------
 message(STATUS ">>> Build for '${CMAKE_SYSTEM_NAME}' '${AREG_BITNESS}'-bit platform '${AREG_PROCESSOR}' with compiler '${CMAKE_CXX_COMPILER}', ID '${AREG_COMPILER_FAMILY}', and build type '${CMAKE_BUILD_TYPE}'")
 message(STATUS ">>> Binary output folder '${AREG_OUTPUT_BIN}', executable extensions '${CMAKE_EXECUTABLE_SUFFIX}'")
 message(STATUS ">>> Generated files are in '${AREG_GENERATE_DIR}', library output folder '${AREG_OUTPUT_LIB}'")
-message(STATUS ">>> Build examples is '${AREG_BUILD_EXAMPLES}', build tests is '${AREG_BUILD_TESTS}', AREG Extensions is '${AREG_EXTENDED}', compile with logs '${AREG_LOGS}'")
+message(STATUS ">>> Build examples is '${AREG_BUILD_EXAMPLES}', build tests is '${AREG_BUILD_TESTS}', AREG extended features are '${AREG_EXTENDED}', compile with logs '${AREG_LOGS}'")
 message(STATUS "-------------------- CMakeLists Status Report End ----------------------")
diff --git a/conf/cmake/functions.cmake b/conf/cmake/functions.cmake
@@ -15,7 +15,7 @@ function(setAppOptions item library_list)
     endif()
 
     # Linking flags
-    target_link_libraries(${item} areg-extensions ${library_list} areg ${AREG_EXTENDED_LIBS} ${AREG_LDFLAGS})
+    target_link_libraries(${item} areg-extend ${library_list} areg ${AREG_EXTENDED_LIBS} ${AREG_LDFLAGS})
 
     # Adjusting CPP standard for target
     set_target_properties(${item} PROPERTIES CXX_STANDARD ${AREG_CXX_STANDARD} CXX_STANDARD_REQUIRED ON )

diff --git a/conf/cmake/user.cmake b/conf/cmake/user.cmake
@@ -11,7 +11,7 @@
 #   4. AREG_BUILD_TYPE      -- build configurations ('Debug' or 'Release')
 #   5. AREG_BUILD_TESTS     -- Build AREG engine unit tests
 #   6. AREG_BUILD_EXAMPLES  -- Build AREG engine examples
-#   7. AREG_EXTENDED        -- Enables or disables the extensions, which might require additional libraries.
+#   7. AREG_EXTENDED        -- Enabled or disable extensions in AREG extended static library and it may require additional dependencies.
 #   8. AREG_LOGS            -- Enable or disable compilation with logs.
 #   9. AREG_BUILD_ROOT      -- The root directory for project(s) to build. By default is the "product" directory of areg-sdk root.
 #  10. AREG_OUTPUT_DIR      -- The output directory of build binaries
@@ -143,7 +143,11 @@ endif()
 
 # Set build configuration. Set "Debug" for debug build, and "Release" for release build.
 if (NOT DEFINED AREG_BUILD_TYPE OR NOT ${AREG_BUILD_TYPE} STREQUAL "Debug")
-    set(AREG_BUILD_TYPE "Release")
+    if (DEFINED CMAKE_BUILD_TYPE AND NOT ${CMAKE_BUILD_TYPE} STREQUAL "")
+        set(AREG_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+    else()
+        set(AREG_BUILD_TYPE "Release")
+    endif()
 endif()
 
 # Set the AREG binary library type to compile. Set "shared" if not "static"

diff --git a/conf/make/common.mk b/conf/make/common.mk
@@ -157,7 +157,7 @@ endif
 
 AREG_EXTENDED_LIBS    :=
 ifneq ($(AREG_EXTENDED),0)
-$(info Compile AREG with enabled extensions)
+$(info Compile AREG extended library with enabled extensions)
 	AREG_EXTENDED_LIBS    := -lncurses
     ifneq ($(AREG_OS), Cygwin)
 		AREG_EXTENDED_LIBS+= -ltinfo
@@ -173,7 +173,7 @@ $(info -------------------- Makefile Status Report Begin --------------------)
 $(info >>> Build for '$(AREG_OS)' '$(AREG_BITNESS)'-bit platform '$(AREG_PLATFORM)' with compiler '$(AREG_CXX_COMPILER)', ID '$(AREG_COMPILER_FAMILY)', and build type '$(AREG_BUILD_TYPE)')
 $(info >>> Binary output folder '$(AREG_OUTPUT_BIN)', executable extensions '$(AREG_BIN_EXT)')
 $(info >>> Generated files are in '$(AREG_GENERATE_DIR)', library output folder '$(AREG_OUTPUT_LIB)')
-$(info >>> Build AREG Extensions is '$(AREG_EXTENDED)', compile with logs '$(AREG_LOGS)')
+$(info >>> Build AREG Extensions are '$(AREG_EXTENDED)', compile with logs '$(AREG_LOGS)')
 $(info "-------------------- Makefile Status Report End ----------------------")
 
 define AREG_HELP_MSG

diff --git a/conf/make/user.mk b/conf/make/user.mk
@@ -16,7 +16,7 @@
 # AREG_BINARY			-- The binary type of AREG library. Possible values: 'shared' or 'static'. The default is 'shared'.
 # AREG_BUILD_ROOT		-- The root directory for project(s) to build. By default is the "product" directory of areg-sdk root.
 # AREG_BUILD_TYPE		-- 'Debug' or 'Release' build types of codes. The default is 'Release'. The default is 'Release'
-# AREG_EXTENDED			-- Enabled or disable AREG extensions, which may create additional library dependencies. By default is OFF.
+# AREG_EXTENDED			-- Enabled or disable extensions in AREG extended static library and it may require additional dependencies. By default is OFF.
 # AREG_LOGS				-- Enable or disable compilation with logs.
 #
 # The following is a list of preprocessor directives, depending on the settings above:
@@ -129,7 +129,7 @@ AREG_BINARY := $(if $(AREG_BINARY),$(AREG_BINARY),shared)
 AREG_BUILD_TYPE := $(if $(AREG_BUILD_TYPE),$(AREG_BUILD_TYPE),Release)
 
 # Compile AREG extended features if set 1. By default, it is 0.
-# Otherwise, disable extensions by setting 1
+# Otherwise, enable extensions by setting 1.
 AREG_EXTENDED := $(if $(AREG_EXTENDED),$(AREG_EXTENDED),0)
 
 # Modify 'AREG_LOGS' to enable or disable compilation with logs.

diff --git a/conf/msvc/user.props b/conf/msvc/user.props
@@ -54,7 +54,7 @@
         <!-- Add preprocessor defines here to set for all projects.                                                                         -->
         <!-- ****************************************************************************************************************************** -->
         <!-- AREG_LOGS 	        : enable compilation with logging; remove if no logging required.                                           -->
-        <!-- AREG_EXTENDED      : enable AREG extensions, which contain additional features.                                                -->
+        <!-- AREG_EXTENDED      : enable or disable extensions in AREG extended static library, which contain additional features.          -->
         <AregCommonDefines>AREG_LOGS=$(AregLogs);AREG_EXTENDED=$(AregExtended);$(AregCommonDefines)</AregCommonDefines>
 
         <!-- ****************************************************************************************************************************** -->

diff --git a/docs/DEVELOP.md b/docs/DEVELOP.md
@@ -17,7 +17,7 @@ Brief description of AREG SDK file structure:
 2. The high level subdirectories of [framework/areg](https://github.com/aregtech/areg-sdk/tree/master/framework/areg/) contain declarations of classes, structures and types that can be used by developers to create an application.
 3. All objects in `private` subdirectories contain codes for internal use and should not be used  by developers.
 4. The [framework/mcrouter](https://github.com/aregtech/areg-sdk/tree/master/framework/mcrouter/) directory contains implementation of Multicast Router (or _mcrouter_).
-5. The [framework/extensions](https://github.com/aregtech/areg-sdk/tree/master/framework/extensions/) directory contains extended objects of _AREG framework_ and may require extra library dependency (configurable).
+5. The [framework/extend](https://github.com/aregtech/areg-sdk/tree/master/framework/extend/) directory contains extended objects of _AREG framework_ and may require extra library dependency (configurable).
 6. The [thirdparty](https://github.com/aregtech/areg-sdk/tree/master/thirdparty) directory contains third-party modules that SDK has dependencies.
 7 The [examples](https://github.com/aregtech/areg-sdk/tree/master/examples/) directory contains working examples to demonstrate _AREG_ features.
 8. The [tests](https://github.com/aregtech/areg-sdk/tree/master/tests/) directory contains _Unit Tests_ (planned to have benchmark tests).

diff --git a/examples/14_pubtraffic/pubclient/src/main.cpp b/examples/14_pubtraffic/pubclient/src/main.cpp
@@ -19,14 +19,14 @@
 #include "areg/component/ComponentLoader.hpp"
 #include "areg/trace/GETrace.h"
 #include "areg/base/NEUtilities.hpp"
-#include "extensions/console/Console.hpp"
+#include "extend/console/Console.hpp"
 
 #include "generated/src/NECommon.hpp"
 #include "pubclient/src/TrafficLightClient.hpp"
 
 #ifdef WIN32
     #pragma comment(lib, "areg.lib")
-    #pragma comment(lib, "areg-extensions.lib")
+    #pragma comment(lib, "areg-extend.lib")
     #pragma comment(lib, "14_generated.lib")
 #endif // WIN32
 

diff --git a/examples/14_pubtraffic/pubservice/src/main.cpp b/examples/14_pubtraffic/pubservice/src/main.cpp
@@ -19,14 +19,14 @@
 #include "areg/appbase/Application.hpp"
 #include "areg/component/ComponentLoader.hpp"
 #include "areg/trace/GETrace.h"
-#include "extensions/console/Console.hpp"
+#include "extend/console/Console.hpp"
 
 #include "generated/src/NECommon.hpp"
 #include "pubservice/src/TrafficLightService.hpp"
 
 #ifdef WINDOWS
     #pragma comment(lib, "areg.lib")
-    #pragma comment(lib, "areg-extensions.lib")
+    #pragma comment(lib, "areg-extend.lib")
     #pragma comment(lib, "14_generated.lib")
 #endif // WINDOWS
 

diff --git a/examples/17_winchat/chatter/services/ConnectionHandler.hpp b/examples/17_winchat/chatter/services/ConnectionHandler.hpp
@@ -75,12 +75,12 @@ class ConnectionHandler
 private:
     NECommon::ListConnections mListConnections;
     String        mNickName;
-    uint32_t        mCookie;
-    uint32_t        mConnectCookie;
+    uint32_t      mCookie;
+    uint32_t      mConnectCookie;
     DateTime      mTimeConnect;
     DateTime      mTimeConnected;
-    bool            mIsRegistered;
-    bool            mIsConnected;
+    bool          mIsRegistered;
+    bool          mIsConnected;
     mutable Mutex mLock;
 
 private:

diff --git a/examples/20_pubdatarate/pubclient/src/ServiceClient.cpp b/examples/20_pubdatarate/pubclient/src/ServiceClient.cpp
@@ -12,7 +12,7 @@
 #include "pubclient/src/ServiceClient.hpp"
 #include "areg/trace/GETrace.h"
 #include "areg/appbase/Application.hpp"
-#include "extensions/console/Console.hpp"
+#include "extend/console/Console.hpp"
 
 DEF_TRACE_SCOPE(examples_20_clientdatarate_ServiceClient_startupComponent);
 DEF_TRACE_SCOPE(examples_20_clientdatarate_ServiceClient_serviceConnected);

diff --git a/examples/20_pubdatarate/pubclient/src/ServiceClient.hpp b/examples/20_pubdatarate/pubclient/src/ServiceClient.hpp
@@ -18,7 +18,7 @@
 #include "areg/component/IETimerConsumer.hpp"
 
 #include "areg/component/Timer.hpp"
-#include "extensions/console/Console.hpp"
+#include "extend/console/Console.hpp"
 
 #include "common/NELargeData.hpp"
 #include "common/SimpleBitmap.hpp"

diff --git a/examples/20_pubdatarate/pubclient/src/main.cpp b/examples/20_pubdatarate/pubclient/src/main.cpp
@@ -22,7 +22,7 @@
 #ifdef WINDOWS
 
     #pragma comment(lib, "areg.lib")
-    #pragma comment(lib, "areg-extensions.lib")
+    #pragma comment(lib, "areg-extend.lib")
     #pragma comment(lib, "20_generated.lib")
 
 #endif // WINDOWS

diff --git a/examples/20_pubdatarate/pubservice/src/ServicingComponent.cpp b/examples/20_pubdatarate/pubservice/src/ServicingComponent.cpp
@@ -14,7 +14,7 @@
 #include "areg/appbase/Application.hpp"
 #include "areg/component/ComponentThread.hpp"
 #include "areg/trace/GETrace.h"
-#include "extensions/console/Console.hpp"
+#include "extend/console/Console.hpp"
 
 #include <chrono>
 

diff --git a/examples/20_pubdatarate/pubservice/src/ServicingComponent.hpp b/examples/20_pubdatarate/pubservice/src/ServicingComponent.hpp
@@ -22,7 +22,7 @@
 #include "areg/base/SynchObjects.hpp"
 #include "areg/base/Thread.hpp"
 #include "areg/component/Timer.hpp"
-#include "extensions/console/Console.hpp"
+#include "extend/console/Console.hpp"
 
 #include "common/SimpleBitmap.hpp"
 #include "common/NELargeData.hpp"

diff --git a/examples/20_pubdatarate/pubservice/src/main.cpp b/examples/20_pubdatarate/pubservice/src/main.cpp
@@ -16,7 +16,7 @@
 
 #ifdef WIN32
     #pragma comment(lib, "areg.lib")
-    #pragma comment(lib, "areg-extensions.lib")
+    #pragma comment(lib, "areg-extend.lib")
     #pragma comment(lib, "20_generated.lib")
 #endif // WINDOWS
 

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
@@ -3,7 +3,7 @@
 # User sepcific settings
 # ###########################################################################
 include("${AREG_BASE}/areg/CMakeLists.txt")
-include("${AREG_BASE}/extensions/CMakeLists.txt")
+include("${AREG_BASE}/extend/CMakeLists.txt")
 include("${AREG_BASE}/mcrouter/CMakeLists.txt")
 include("${AREG_BASE}/logger/CMakeLists.txt")
 
@@ -39,8 +39,8 @@ target_link_libraries(areg PRIVATE ${AREG_LDFLAGS})
 # Library configuration
 set_target_properties(areg PROPERTIES CXX_STANDARD ${AREG_CXX_STANDARD} CXX_STANDARD_REQUIRED ON )
 
-# build areg extensions static library
-addStaticLib(areg-extensions "${extensions_SRC}")
+# build areg extended static library
+addStaticLib(areg-extend "${extend_SRC}")
 
 # build mcrouter executable
 addExecutable(mcrouter "${mcrouter_SRC}")

diff --git a/framework/Makefile b/framework/Makefile
@@ -1,9 +1,9 @@
 include $(AREG_BASE)/areg/Makefile
-include $(AREG_BASE)/extensions/Makefile
+include $(AREG_BASE)/extend/Makefile
 include $(AREG_BASE)/mcrouter/Makefile
 include $(AREG_BASE)/logger/Makefile
 
 
-framework: areg extensions mcrouter logger
+framework: areg extend mcrouter logger
 
 .PHONY: framework