5 files changed, 33 insertions, 32 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 46c9d5e16f..13d123bf4b 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -35,8 +35,8 @@ CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE")
 set("AC_SCRIPTS_INCLUDES" "")
 set("AC_MODULE_LIST" "")
 set("AC_SCRIPTS_LIST" "")
-set(MOD_ELUNA_FOUND 0)
-set(MOD_ELUNA_PATH "")
+set(MOD_ALE_FOUND 0)
+set(MOD_ALE_PATH "")
 
 foreach(include ${AC_ADD_SCRIPTS_INCLUDE})
   set("AC_SCRIPTS_INCLUDES" "#include \"${include}\"\n${AC_SCRIPTS_INCLUDES}")
@@ -50,12 +50,12 @@ foreach(scriptName ${AC_ADD_SCRIPTS_LIST})
   set("AC_SCRIPTS_LIST" "    ${scriptName};\n${AC_SCRIPTS_LIST}")
 endforeach()
 
-function(ConfigureElunaModule moduleName)
-  set(MOD_ELUNA_FOUND 1 PARENT_SCOPE)
+function(ConfigureALEModule moduleName)
+  set(MOD_ALE_FOUND 1 PARENT_SCOPE)
   GetPathToModuleSource(${SOURCE_MODULE} MODULE_SOURCE_PATH)
-  set(MOD_ELUNA_PATH ${MODULE_SOURCE_PATH} PARENT_SCOPE)
+  set(MOD_ALE_PATH ${MODULE_SOURCE_PATH} PARENT_SCOPE)
 
-  # Define eluna compile options
+  # Define ALE compile options
   target_compile_options(game-interface
     INTERFACE
       -DAZEROTHCORE
@@ -76,9 +76,9 @@ foreach(SOURCE_MODULE ${MODULES_MODULE_LIST})
     set(${MODULE_MODULE_VARIABLE} "static")
   endif()
 
-  # Use only static for mod-eluna
-  if (SOURCE_MODULE MATCHES "mod-eluna")
-    ConfigureElunaModule(${SOURCE_MODULE})
+  # Use only static for mod-ALE
+  if (SOURCE_MODULE MATCHES "mod-ale")
+    ConfigureALEModule(${SOURCE_MODULE})
   endif()
 
   # Build the Graph values
@@ -267,9 +267,9 @@ ConfigureScriptLoader("static" SCRIPT_MODULE_PRIVATE_SCRIPTLOADER OFF ${STATIC_S
 
 list(REMOVE_DUPLICATES SCRIPT_MODULE_PRIVATE_SCRIPTLOADER)
 
-if (MOD_ELUNA_FOUND)
-  list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ELUNA_PATH}/lualib/lua.c)
-  list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ELUNA_PATH}/lualib/luac.c)
+if (MOD_ALE_FOUND)
+  list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ALE_PATH}/lualib/lua.c)
+  list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ALE_PATH}/lualib/luac.c)
 endif()
 
 add_library(modules STATIC
@@ -277,7 +277,7 @@ add_library(modules STATIC
     ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}
     ${PRIVATE_SOURCES_MODULES})
 
-if (MOD_ELUNA_FOUND)
+if (MOD_ALE_FOUND)
     target_link_libraries(modules PUBLIC lualib)
 endif()
 
@@ -342,6 +342,7 @@ foreach(ModuleName ${MODULE_LIST__})
 
   foreach(configFileName ${MODULE_CONFIG_LIST})
     CopyModuleConfig("${MODULE_CONFIG_PATH}/${configFileName}")
+    string(REGEX REPLACE "\.dist$" "" configFileName ${configFileName})
     set(CONFIG_LIST ${CONFIG_LIST}${configFileName},)
     message(STATUS "  |  * ${configFileName}")
   endforeach()
@@ -357,7 +358,7 @@ target_compile_options(modules
   INTERFACE
     -DCONFIG_FILE_LIST=$<1:"${CONFIG_LIST}">)
 
-if (MOD_ELUNA_FOUND)
+if (MOD_ALE_FOUND)
   if (APPLE)
     target_compile_definitions(modules
       PUBLIC
@@ -376,10 +377,10 @@ if (MOD_ELUNA_FOUND)
     add_custom_command(TARGET modules
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/${MSVC_CONFIGURATION_NAME}lua_scripts/extensions/"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${MOD_ELUNA_PATH}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/${MSVC_CONFIGURATION_NAME}lua_scripts/extensions/")
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${MOD_ALE_PATH}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/${MSVC_CONFIGURATION_NAME}lua_scripts/extensions/")
   endif()
 
-  install(DIRECTORY "${MOD_ELUNA_PATH}/LuaEngine/extensions" DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/lua_scripts/")
+  install(DIRECTORY "${MOD_ALE_PATH}/LuaEngine/extensions" DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/lua_scripts/")
 endif()
 
 message("")
diff --git a/modules/ModulesLoader.cpp.in.cmake b/modules/ModulesLoader.cpp.in.cmake
index ec542a4bc7..0df08a1cc5 100644
--- a/modules/ModulesLoader.cpp.in.cmake
+++ b/modules/ModulesLoader.cpp.in.cmake
@@ -1,14 +1,14 @@
 /*
  * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by the
- * Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along
diff --git a/modules/ModulesPCH.h b/modules/ModulesPCH.h
index 305faa88f9..f278206a6c 100644
--- a/modules/ModulesPCH.h
+++ b/modules/ModulesPCH.h
@@ -1,14 +1,14 @@
 /*
  * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by the
- * Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along
diff --git a/modules/ModulesScriptLoader.h b/modules/ModulesScriptLoader.h
index 4117882202..ec59e9b309 100644
--- a/modules/ModulesScriptLoader.h
+++ b/modules/ModulesScriptLoader.h
@@ -1,14 +1,14 @@
 /*
  * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by the
- * Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along
diff --git a/modules/create_module.sh b/modules/create_module.sh
index 51e9de479a..8a7b12823d 100644
--- a/modules/create_module.sh
+++ b/modules/create_module.sh
@@ -5,7 +5,7 @@
 ##------------------------------- VARIABLES ---------------------------------##
 
 MODULE_TEMPLATE_URL="https://github.com/azerothcore/skeleton-module/"
-GIT_COMMIT_MSG_SETUP="setup_git_commit_template.sh"
+GIT_COMMIT_MSG_SETUP="../../apps/git_tools/setup_git_commit_template.sh"
 
 ##------------------------------- CODE ---------------------------------##