diff --git a/AI/Nullkiller2/AIGateway.cpp b/AI/Nullkiller2/AIGateway.cpp
index 1e28d8b59..88986f7a2 100644
--- a/AI/Nullkiller2/AIGateway.cpp
+++ b/AI/Nullkiller2/AIGateway.cpp
@@ -36,7 +36,7 @@
 #include "AIGateway.h"
 #include "Goals/Goals.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 //one thread may be turn of AI and another will be handling a side effect for AI2
diff --git a/AI/Nullkiller2/AIGateway.h b/AI/Nullkiller2/AIGateway.h
index 637c5d1fd..a8979794a 100644
--- a/AI/Nullkiller2/AIGateway.h
+++ b/AI/Nullkiller2/AIGateway.h
@@ -25,7 +25,7 @@ VCMI_LIB_NAMESPACE_BEGIN
 class AsyncRunner;
 VCMI_LIB_NAMESPACE_END
 
-namespace NKAI
+namespace NK2AI
 {
 
 class AIStatus
diff --git a/AI/Nullkiller2/AIUtility.cpp b/AI/Nullkiller2/AIUtility.cpp
index 6b2c389d4..2a18b4b05 100644
--- a/AI/Nullkiller2/AIUtility.cpp
+++ b/AI/Nullkiller2/AIUtility.cpp
@@ -25,7 +25,7 @@
 
 #include <vcmi/CreatureService.h>
 
-namespace NKAI
+namespace NK2AI
 {
 
 const CGObjectInstance * ObjectIdRef::operator->() const
diff --git a/AI/Nullkiller2/AIUtility.h b/AI/Nullkiller2/AIUtility.h
index a6f85fe22..8729a67b3 100644
--- a/AI/Nullkiller2/AIUtility.h
+++ b/AI/Nullkiller2/AIUtility.h
@@ -51,7 +51,7 @@
 
 using dwellingContent = std::pair<ui32, std::vector<CreatureID>>;
 
-namespace NKAI
+namespace NK2AI
 {
 struct creInfo;
 class AIGateway;
diff --git a/AI/Nullkiller2/Analyzers/ArmyManager.cpp b/AI/Nullkiller2/Analyzers/ArmyManager.cpp
index 418a64cd8..b4b50d4b5 100644
--- a/AI/Nullkiller2/Analyzers/ArmyManager.cpp
+++ b/AI/Nullkiller2/Analyzers/ArmyManager.cpp
@@ -17,7 +17,7 @@
 #include "../../../lib/GameConstants.h"
 #include "../../../lib/TerrainHandler.h"
 
-namespace NKAI
+namespace NK2AI
 {
 class StackUpgradeInfo
 {
diff --git a/AI/Nullkiller2/Analyzers/ArmyManager.h b/AI/Nullkiller2/Analyzers/ArmyManager.h
index b65a92821..5cdafe8a6 100644
--- a/AI/Nullkiller2/Analyzers/ArmyManager.h
+++ b/AI/Nullkiller2/Analyzers/ArmyManager.h
@@ -15,7 +15,7 @@
 #include "../../../lib/GameConstants.h"
 #include "../../../lib/GameLibrary.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Analyzers/BuildAnalyzer.cpp b/AI/Nullkiller2/Analyzers/BuildAnalyzer.cpp
index 50632095d..3d48d7690 100644
--- a/AI/Nullkiller2/Analyzers/BuildAnalyzer.cpp
+++ b/AI/Nullkiller2/Analyzers/BuildAnalyzer.cpp
@@ -13,7 +13,7 @@
 #include "../../../lib/entities/building/CBuilding.h"
 #include "../../../lib/IGameSettings.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 void BuildAnalyzer::updateTownDwellings(TownDevelopmentInfo & developmentInfo)
diff --git a/AI/Nullkiller2/Analyzers/BuildAnalyzer.h b/AI/Nullkiller2/Analyzers/BuildAnalyzer.h
index 9625b9591..ad4b35dfe 100644
--- a/AI/Nullkiller2/Analyzers/BuildAnalyzer.h
+++ b/AI/Nullkiller2/Analyzers/BuildAnalyzer.h
@@ -12,7 +12,7 @@
 #include "../AIUtility.h"
 #include "../../../lib/ResourceSet.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.cpp b/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.cpp
index 2076640ed..25d2349f3 100644
--- a/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.cpp
+++ b/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.cpp
@@ -15,7 +15,7 @@
 #include "../../../lib/callback/GameRandomizer.h"
 #include "../../../lib/logging/VisualLogger.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 const HitMapInfo HitMapInfo::NoThreat;
diff --git a/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.h b/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.h
index 7e9a66c8a..c47399848 100644
--- a/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.h
+++ b/AI/Nullkiller2/Analyzers/DangerHitMapAnalyzer.h
@@ -11,7 +11,7 @@
 
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct AIPath;
diff --git a/AI/Nullkiller2/Analyzers/HeroManager.cpp b/AI/Nullkiller2/Analyzers/HeroManager.cpp
index d4a8a7971..129cc8e0c 100644
--- a/AI/Nullkiller2/Analyzers/HeroManager.cpp
+++ b/AI/Nullkiller2/Analyzers/HeroManager.cpp
@@ -15,7 +15,7 @@
 #include "../../../lib/spells/ISpellMechanics.h"
 #include "../../../lib/spells/adventure/TownPortalEffect.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 const SecondarySkillEvaluator HeroManager::wariorSkillsScores = SecondarySkillEvaluator(
diff --git a/AI/Nullkiller2/Analyzers/HeroManager.h b/AI/Nullkiller2/Analyzers/HeroManager.h
index 0b4799ba4..d6d94dc83 100644
--- a/AI/Nullkiller2/Analyzers/HeroManager.h
+++ b/AI/Nullkiller2/Analyzers/HeroManager.h
@@ -15,7 +15,7 @@
 #include "../../../lib/GameConstants.h"
 #include "../../../lib/GameLibrary.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class DLL_EXPORT ISecondarySkillRule
diff --git a/AI/Nullkiller2/Analyzers/ObjectClusterizer.cpp b/AI/Nullkiller2/Analyzers/ObjectClusterizer.cpp
index 701a145bb..61d8037ad 100644
--- a/AI/Nullkiller2/Analyzers/ObjectClusterizer.cpp
+++ b/AI/Nullkiller2/Analyzers/ObjectClusterizer.cpp
@@ -13,7 +13,7 @@
 #include "../AIGateway.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 void ObjectCluster::addObject(const CGObjectInstance * obj, const AIPath & path, float priority)
@@ -220,7 +220,7 @@ void ObjectClusterizer::onObjectRemoved(ObjectInstanceID id)
 
 	vstd::erase_if_present(invalidated, id);
 
-	NKAI::ClusterMap::accessor cluster;
+	NK2AI::ClusterMap::accessor cluster;
 	
 	if(blockedObjects.find(cluster, id))
 	{
diff --git a/AI/Nullkiller2/Analyzers/ObjectClusterizer.h b/AI/Nullkiller2/Analyzers/ObjectClusterizer.h
index b7f174934..4bc80ed28 100644
--- a/AI/Nullkiller2/Analyzers/ObjectClusterizer.h
+++ b/AI/Nullkiller2/Analyzers/ObjectClusterizer.h
@@ -12,7 +12,7 @@
 #include "../Pathfinding/AINodeStorage.h"
 #include "../Engine/PriorityEvaluator.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct ClusterObjectInfo
diff --git a/AI/Nullkiller2/Behaviors/BuildingBehavior.cpp b/AI/Nullkiller2/Behaviors/BuildingBehavior.cpp
index 8642765fa..9040efac7 100644
--- a/AI/Nullkiller2/Behaviors/BuildingBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/BuildingBehavior.cpp
@@ -17,7 +17,7 @@
 #include "../Goals/SaveResources.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/BuildingBehavior.h b/AI/Nullkiller2/Behaviors/BuildingBehavior.h
index 7762b7209..a660cad74 100644
--- a/AI/Nullkiller2/Behaviors/BuildingBehavior.h
+++ b/AI/Nullkiller2/Behaviors/BuildingBehavior.h
@@ -13,7 +13,7 @@
 #include "../AIUtility.h"
 #include "../Goals/CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/BuyArmyBehavior.cpp b/AI/Nullkiller2/Behaviors/BuyArmyBehavior.cpp
index 8dcb851e6..d12711d82 100644
--- a/AI/Nullkiller2/Behaviors/BuyArmyBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/BuyArmyBehavior.cpp
@@ -14,7 +14,7 @@
 #include "../Goals/BuyArmy.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/BuyArmyBehavior.h b/AI/Nullkiller2/Behaviors/BuyArmyBehavior.h
index 21efd9a94..127449d2e 100644
--- a/AI/Nullkiller2/Behaviors/BuyArmyBehavior.h
+++ b/AI/Nullkiller2/Behaviors/BuyArmyBehavior.h
@@ -13,7 +13,7 @@
 #include "../AIUtility.h"
 #include "../Goals/CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.cpp b/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.cpp
index 38e71b675..af2ba8891 100644
--- a/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.cpp
@@ -16,7 +16,7 @@
 #include "CaptureObjectsBehavior.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.h b/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.h
index 3de4a08e7..cea1bd89e 100644
--- a/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.h
+++ b/AI/Nullkiller2/Behaviors/CaptureObjectsBehavior.h
@@ -14,7 +14,7 @@
 #include "../Goals/CGoal.h"
 #include "../Pathfinding/AINodeStorage.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/ClusterBehavior.cpp b/AI/Nullkiller2/Behaviors/ClusterBehavior.cpp
index 75913798a..0d690d254 100644
--- a/AI/Nullkiller2/Behaviors/ClusterBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/ClusterBehavior.cpp
@@ -16,7 +16,7 @@
 #include "../Goals/Composition.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/ClusterBehavior.h b/AI/Nullkiller2/Behaviors/ClusterBehavior.h
index 271b91838..f9c0fe2a6 100644
--- a/AI/Nullkiller2/Behaviors/ClusterBehavior.h
+++ b/AI/Nullkiller2/Behaviors/ClusterBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct ObjectCluster;
diff --git a/AI/Nullkiller2/Behaviors/DefenceBehavior.cpp b/AI/Nullkiller2/Behaviors/DefenceBehavior.cpp
index e3431add4..8a2ecada5 100644
--- a/AI/Nullkiller2/Behaviors/DefenceBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/DefenceBehavior.cpp
@@ -22,7 +22,7 @@
 #include "../Markers/DefendTown.h"
 #include "../Goals/ExchangeSwapTownHeroes.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 const float THREAT_IGNORE_RATIO = 2;
diff --git a/AI/Nullkiller2/Behaviors/DefenceBehavior.h b/AI/Nullkiller2/Behaviors/DefenceBehavior.h
index e2953c4d4..f5e9b8d4e 100644
--- a/AI/Nullkiller2/Behaviors/DefenceBehavior.h
+++ b/AI/Nullkiller2/Behaviors/DefenceBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HitMapInfo;
diff --git a/AI/Nullkiller2/Behaviors/ExplorationBehavior.cpp b/AI/Nullkiller2/Behaviors/ExplorationBehavior.cpp
index b9c6e568d..9b86a37b0 100644
--- a/AI/Nullkiller2/Behaviors/ExplorationBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/ExplorationBehavior.cpp
@@ -19,7 +19,7 @@
 #include "../Goals/ExploreNeighbourTile.h"
 #include "../Helpers/ExplorationHelper.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/ExplorationBehavior.h b/AI/Nullkiller2/Behaviors/ExplorationBehavior.h
index 29bde6174..a13fdaa32 100644
--- a/AI/Nullkiller2/Behaviors/ExplorationBehavior.h
+++ b/AI/Nullkiller2/Behaviors/ExplorationBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/GatherArmyBehavior.cpp b/AI/Nullkiller2/Behaviors/GatherArmyBehavior.cpp
index 08dc4a146..2c174436b 100644
--- a/AI/Nullkiller2/Behaviors/GatherArmyBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/GatherArmyBehavior.cpp
@@ -20,7 +20,7 @@
 #include "../AIUtility.h"
 #include "../Goals/ExchangeSwapTownHeroes.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/GatherArmyBehavior.h b/AI/Nullkiller2/Behaviors/GatherArmyBehavior.h
index f28785c49..06a86f892 100644
--- a/AI/Nullkiller2/Behaviors/GatherArmyBehavior.h
+++ b/AI/Nullkiller2/Behaviors/GatherArmyBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.cpp b/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.cpp
index 90410b9cf..b048f476e 100644
--- a/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.cpp
@@ -14,7 +14,7 @@
 #include "../Goals/RecruitHero.h"
 #include "../Goals/ExecuteHeroChain.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.h b/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.h
index 21c1a0c9f..e93049afd 100644
--- a/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.h
+++ b/AI/Nullkiller2/Behaviors/RecruitHeroBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/StartupBehavior.cpp b/AI/Nullkiller2/Behaviors/StartupBehavior.cpp
index ad04f0a67..dbe7d80e5 100644
--- a/AI/Nullkiller2/Behaviors/StartupBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/StartupBehavior.cpp
@@ -18,7 +18,7 @@
 #include "../../../lib/mapObjects/CGResource.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/StartupBehavior.h b/AI/Nullkiller2/Behaviors/StartupBehavior.h
index fcae58335..24dccc58e 100644
--- a/AI/Nullkiller2/Behaviors/StartupBehavior.h
+++ b/AI/Nullkiller2/Behaviors/StartupBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Behaviors/StayAtTownBehavior.cpp b/AI/Nullkiller2/Behaviors/StayAtTownBehavior.cpp
index 106043540..a17ea3870 100644
--- a/AI/Nullkiller2/Behaviors/StayAtTownBehavior.cpp
+++ b/AI/Nullkiller2/Behaviors/StayAtTownBehavior.cpp
@@ -17,7 +17,7 @@
 #include "lib/mapObjects/MapObjects.h" //for victory conditions
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Behaviors/StayAtTownBehavior.h b/AI/Nullkiller2/Behaviors/StayAtTownBehavior.h
index 053ce3d40..80a01a447 100644
--- a/AI/Nullkiller2/Behaviors/StayAtTownBehavior.h
+++ b/AI/Nullkiller2/Behaviors/StayAtTownBehavior.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Engine/AIMemory.cpp b/AI/Nullkiller2/Engine/AIMemory.cpp
index 68701f8bf..45d546fe3 100644
--- a/AI/Nullkiller2/Engine/AIMemory.cpp
+++ b/AI/Nullkiller2/Engine/AIMemory.cpp
@@ -10,7 +10,7 @@
 #include "../StdInc.h"
 #include "AIMemory.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 void AIMemory::removeFromMemory(const CGObjectInstance * obj)
diff --git a/AI/Nullkiller2/Engine/AIMemory.h b/AI/Nullkiller2/Engine/AIMemory.h
index c3596726c..4d6a01346 100644
--- a/AI/Nullkiller2/Engine/AIMemory.h
+++ b/AI/Nullkiller2/Engine/AIMemory.h
@@ -12,7 +12,7 @@
 #include "../AIUtility.h"
 #include "../../../lib/mapObjects/MapObjects.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class AIMemory
diff --git a/AI/Nullkiller2/Engine/DeepDecomposer.cpp b/AI/Nullkiller2/Engine/DeepDecomposer.cpp
index 85625ecc5..2f5872373 100644
--- a/AI/Nullkiller2/Engine/DeepDecomposer.cpp
+++ b/AI/Nullkiller2/Engine/DeepDecomposer.cpp
@@ -21,7 +21,7 @@
 #include "../Goals/Invalid.h"
 #include "../Goals/Composition.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Engine/DeepDecomposer.h b/AI/Nullkiller2/Engine/DeepDecomposer.h
index 7a30d99ee..4d56640fe 100644
--- a/AI/Nullkiller2/Engine/DeepDecomposer.h
+++ b/AI/Nullkiller2/Engine/DeepDecomposer.h
@@ -11,7 +11,7 @@
 
 #include "../Goals/AbstractGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct GoalHash
diff --git a/AI/Nullkiller2/Engine/FuzzyEngines.cpp b/AI/Nullkiller2/Engine/FuzzyEngines.cpp
index 3fa8750b7..d70387975 100644
--- a/AI/Nullkiller2/Engine/FuzzyEngines.cpp
+++ b/AI/Nullkiller2/Engine/FuzzyEngines.cpp
@@ -14,7 +14,7 @@
 #include "../../../lib/mapObjects/MapObjects.h"
 #include "../AIGateway.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 constexpr float MIN_AI_STRENGTH = 0.5f; //lower when combat AI gets smarter
diff --git a/AI/Nullkiller2/Engine/FuzzyEngines.h b/AI/Nullkiller2/Engine/FuzzyEngines.h
index d57a4a6c6..b1dbc7ec7 100644
--- a/AI/Nullkiller2/Engine/FuzzyEngines.h
+++ b/AI/Nullkiller2/Engine/FuzzyEngines.h
@@ -21,7 +21,7 @@ class CArmedInstance;
 
 VCMI_LIB_NAMESPACE_END
 
-namespace NKAI
+namespace NK2AI
 {
 
 class engineBase //subclasses create fuzzylite variables with "new" that are not freed - this is desired as fl::Engine wants to destroy these...
diff --git a/AI/Nullkiller2/Engine/FuzzyHelper.cpp b/AI/Nullkiller2/Engine/FuzzyHelper.cpp
index f3dd29bfb..9b813bbe9 100644
--- a/AI/Nullkiller2/Engine/FuzzyHelper.cpp
+++ b/AI/Nullkiller2/Engine/FuzzyHelper.cpp
@@ -16,7 +16,7 @@
 #include "../../../lib/mapObjectConstructors/AObjectTypeHandler.h"
 #include "../../../lib/mapObjectConstructors/CObjectClassesHandler.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 ui64 FuzzyHelper::evaluateDanger(const int3 & tile, const CGHeroInstance * visitor, bool checkGuards)
diff --git a/AI/Nullkiller2/Engine/FuzzyHelper.h b/AI/Nullkiller2/Engine/FuzzyHelper.h
index 455da61e6..a9c096839 100644
--- a/AI/Nullkiller2/Engine/FuzzyHelper.h
+++ b/AI/Nullkiller2/Engine/FuzzyHelper.h
@@ -10,7 +10,7 @@
 #pragma once
 #include "FuzzyEngines.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Engine/Nullkiller.cpp b/AI/Nullkiller2/Engine/Nullkiller.cpp
index be301eba4..071591500 100644
--- a/AI/Nullkiller2/Engine/Nullkiller.cpp
+++ b/AI/Nullkiller2/Engine/Nullkiller.cpp
@@ -27,7 +27,7 @@
 #include "../../lib/pathfinder/PathfinderCache.h"
 #include "../../lib/pathfinder/PathfinderOptions.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Engine/Nullkiller.h b/AI/Nullkiller2/Engine/Nullkiller.h
index 810e9c904..92506add8 100644
--- a/AI/Nullkiller2/Engine/Nullkiller.h
+++ b/AI/Nullkiller2/Engine/Nullkiller.h
@@ -29,7 +29,7 @@ class PathfinderCache;
 
 VCMI_LIB_NAMESPACE_END
 
-namespace NKAI
+namespace NK2AI
 {
 
 const float MIN_PRIORITY = 0.01f;
diff --git a/AI/Nullkiller2/Engine/PriorityEvaluator.cpp b/AI/Nullkiller2/Engine/PriorityEvaluator.cpp
index 047688632..968adc136 100644
--- a/AI/Nullkiller2/Engine/PriorityEvaluator.cpp
+++ b/AI/Nullkiller2/Engine/PriorityEvaluator.cpp
@@ -32,7 +32,7 @@
 #include "../Markers/ArmyUpgrade.h"
 #include "../Markers/DefendTown.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 constexpr float MIN_CRITICAL_VALUE = 2.0f;
diff --git a/AI/Nullkiller2/Engine/PriorityEvaluator.h b/AI/Nullkiller2/Engine/PriorityEvaluator.h
index dc3ed4a9d..bf0726746 100644
--- a/AI/Nullkiller2/Engine/PriorityEvaluator.h
+++ b/AI/Nullkiller2/Engine/PriorityEvaluator.h
@@ -20,7 +20,7 @@ VCMI_LIB_NAMESPACE_BEGIN
 
 VCMI_LIB_NAMESPACE_END
 
-namespace NKAI
+namespace NK2AI
 {
 
 class BuildingInfo;
diff --git a/AI/Nullkiller2/Engine/Settings.cpp b/AI/Nullkiller2/Engine/Settings.cpp
index b523bc57e..38c183850 100644
--- a/AI/Nullkiller2/Engine/Settings.cpp
+++ b/AI/Nullkiller2/Engine/Settings.cpp
@@ -21,7 +21,7 @@
 #include "../../../lib/filesystem/Filesystem.h"
 #include "../../../lib/json/JsonUtils.h"
 
-namespace NKAI
+namespace NK2AI
 {
 	Settings::Settings(int difficultyLevel)
 		: maxRoamingHeroes(8),
diff --git a/AI/Nullkiller2/Engine/Settings.h b/AI/Nullkiller2/Engine/Settings.h
index f7947762e..83d6bbdff 100644
--- a/AI/Nullkiller2/Engine/Settings.h
+++ b/AI/Nullkiller2/Engine/Settings.h
@@ -16,7 +16,7 @@ class ResourcePath;
 
 VCMI_LIB_NAMESPACE_END
 
-namespace NKAI
+namespace NK2AI
 {
 	class Settings
 	{
diff --git a/AI/Nullkiller2/Goals/AbstractGoal.cpp b/AI/Nullkiller2/Goals/AbstractGoal.cpp
index 9adee7f96..206506b81 100644
--- a/AI/Nullkiller2/Goals/AbstractGoal.cpp
+++ b/AI/Nullkiller2/Goals/AbstractGoal.cpp
@@ -13,7 +13,7 @@
 #include "../../../lib/constants/StringConstants.h"
 #include "../../../lib/entities/artifact/CArtifact.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/AbstractGoal.h b/AI/Nullkiller2/Goals/AbstractGoal.h
index d42a40a45..5150c00ce 100644
--- a/AI/Nullkiller2/Goals/AbstractGoal.h
+++ b/AI/Nullkiller2/Goals/AbstractGoal.h
@@ -14,7 +14,7 @@
 #include "../../../lib/mapObjects/CGHeroInstance.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/AdventureSpellCast.cpp b/AI/Nullkiller2/Goals/AdventureSpellCast.cpp
index 35b632058..0496922d4 100644
--- a/AI/Nullkiller2/Goals/AdventureSpellCast.cpp
+++ b/AI/Nullkiller2/Goals/AdventureSpellCast.cpp
@@ -13,7 +13,7 @@
 #include "../../../lib/spells/ISpellMechanics.h"
 #include "../../../lib/spells/adventure/TownPortalEffect.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/AdventureSpellCast.h b/AI/Nullkiller2/Goals/AdventureSpellCast.h
index febb43662..e0a2df69e 100644
--- a/AI/Nullkiller2/Goals/AdventureSpellCast.h
+++ b/AI/Nullkiller2/Goals/AdventureSpellCast.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace Goals
diff --git a/AI/Nullkiller2/Goals/BuildBoat.cpp b/AI/Nullkiller2/Goals/BuildBoat.cpp
index 86b274f5f..012e5cc6f 100644
--- a/AI/Nullkiller2/Goals/BuildBoat.cpp
+++ b/AI/Nullkiller2/Goals/BuildBoat.cpp
@@ -12,7 +12,7 @@
 #include "../AIGateway.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/BuildBoat.h b/AI/Nullkiller2/Goals/BuildBoat.h
index 1a2432081..c788fe98c 100644
--- a/AI/Nullkiller2/Goals/BuildBoat.h
+++ b/AI/Nullkiller2/Goals/BuildBoat.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace Goals
diff --git a/AI/Nullkiller2/Goals/BuildThis.cpp b/AI/Nullkiller2/Goals/BuildThis.cpp
index 2a1b0d474..3515bf71f 100644
--- a/AI/Nullkiller2/Goals/BuildThis.cpp
+++ b/AI/Nullkiller2/Goals/BuildThis.cpp
@@ -14,7 +14,7 @@
 #include "../../../lib/constants/StringConstants.h"
 #include "../../../lib/entities/building/CBuilding.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/BuildThis.h b/AI/Nullkiller2/Goals/BuildThis.h
index b88e8022a..8078d662c 100644
--- a/AI/Nullkiller2/Goals/BuildThis.h
+++ b/AI/Nullkiller2/Goals/BuildThis.h
@@ -12,7 +12,7 @@
 #include "CGoal.h"
 #include "../Analyzers/BuildAnalyzer.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/BuyArmy.cpp b/AI/Nullkiller2/Goals/BuyArmy.cpp
index 6f04102a2..c76ee2220 100644
--- a/AI/Nullkiller2/Goals/BuyArmy.cpp
+++ b/AI/Nullkiller2/Goals/BuyArmy.cpp
@@ -14,7 +14,7 @@
 #include "../Engine/Nullkiller.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/BuyArmy.h b/AI/Nullkiller2/Goals/BuyArmy.h
index 1de8f57ce..f7589187f 100644
--- a/AI/Nullkiller2/Goals/BuyArmy.h
+++ b/AI/Nullkiller2/Goals/BuyArmy.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/CGoal.h b/AI/Nullkiller2/Goals/CGoal.h
index c01097eb1..63c1da8d3 100644
--- a/AI/Nullkiller2/Goals/CGoal.h
+++ b/AI/Nullkiller2/Goals/CGoal.h
@@ -11,7 +11,7 @@
 
 #include "AbstractGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class AIGateway;
diff --git a/AI/Nullkiller2/Goals/CaptureObject.cpp b/AI/Nullkiller2/Goals/CaptureObject.cpp
index 7ca2ab266..3ec107b1d 100644
--- a/AI/Nullkiller2/Goals/CaptureObject.cpp
+++ b/AI/Nullkiller2/Goals/CaptureObject.cpp
@@ -15,7 +15,7 @@
 #include "../Behaviors/CaptureObjectsBehavior.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/CaptureObject.h b/AI/Nullkiller2/Goals/CaptureObject.h
index 2073cd2fe..50dce681a 100644
--- a/AI/Nullkiller2/Goals/CaptureObject.h
+++ b/AI/Nullkiller2/Goals/CaptureObject.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/CompleteQuest.cpp b/AI/Nullkiller2/Goals/CompleteQuest.cpp
index 1ad7f7c29..b1d246f7e 100644
--- a/AI/Nullkiller2/Goals/CompleteQuest.cpp
+++ b/AI/Nullkiller2/Goals/CompleteQuest.cpp
@@ -15,7 +15,7 @@
 #include "../../../lib/mapObjects/CQuest.h"
 #include "../../../lib/texts/CGeneralTextHandler.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/CompleteQuest.h b/AI/Nullkiller2/Goals/CompleteQuest.h
index 2ea62be7c..c46ebeaa2 100644
--- a/AI/Nullkiller2/Goals/CompleteQuest.h
+++ b/AI/Nullkiller2/Goals/CompleteQuest.h
@@ -13,7 +13,7 @@
 #include "../Goals/CGoal.h"
 #include "../../../lib/gameState/QuestInfo.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/Composition.cpp b/AI/Nullkiller2/Goals/Composition.cpp
index 190767a6b..a14ab5c74 100644
--- a/AI/Nullkiller2/Goals/Composition.cpp
+++ b/AI/Nullkiller2/Goals/Composition.cpp
@@ -14,7 +14,7 @@
 #include "../../../lib/constants/StringConstants.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/Composition.h b/AI/Nullkiller2/Goals/Composition.h
index b8a6bdd07..29c431371 100644
--- a/AI/Nullkiller2/Goals/Composition.h
+++ b/AI/Nullkiller2/Goals/Composition.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/DigAtTile.cpp b/AI/Nullkiller2/Goals/DigAtTile.cpp
index ec7ddfd92..ba05728df 100644
--- a/AI/Nullkiller2/Goals/DigAtTile.cpp
+++ b/AI/Nullkiller2/Goals/DigAtTile.cpp
@@ -13,7 +13,7 @@
 #include "../AIUtility.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/DigAtTile.h b/AI/Nullkiller2/Goals/DigAtTile.h
index c99d61d0b..0efb64117 100644
--- a/AI/Nullkiller2/Goals/DigAtTile.h
+++ b/AI/Nullkiller2/Goals/DigAtTile.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/DismissHero.cpp b/AI/Nullkiller2/Goals/DismissHero.cpp
index b2a70fb05..cf9412500 100644
--- a/AI/Nullkiller2/Goals/DismissHero.cpp
+++ b/AI/Nullkiller2/Goals/DismissHero.cpp
@@ -11,7 +11,7 @@
 #include "DismissHero.h"
 #include "../AIGateway.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/DismissHero.h b/AI/Nullkiller2/Goals/DismissHero.h
index 39116daf1..e89d3a220 100644
--- a/AI/Nullkiller2/Goals/DismissHero.h
+++ b/AI/Nullkiller2/Goals/DismissHero.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.cpp b/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.cpp
index 1ffb5f77b..f3f29c590 100644
--- a/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.cpp
+++ b/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.cpp
@@ -13,7 +13,7 @@
 #include "../AIGateway.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.h b/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.h
index 714350a7b..b2b54540b 100644
--- a/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.h
+++ b/AI/Nullkiller2/Goals/ExchangeSwapTownHeroes.h
@@ -12,7 +12,7 @@
 #include "CGoal.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/ExecuteHeroChain.cpp b/AI/Nullkiller2/Goals/ExecuteHeroChain.cpp
index a74dfeb36..65a148972 100644
--- a/AI/Nullkiller2/Goals/ExecuteHeroChain.cpp
+++ b/AI/Nullkiller2/Goals/ExecuteHeroChain.cpp
@@ -12,7 +12,7 @@
 #include "../AIGateway.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/ExecuteHeroChain.h b/AI/Nullkiller2/Goals/ExecuteHeroChain.h
index 5ab09c4df..3f7c6431d 100644
--- a/AI/Nullkiller2/Goals/ExecuteHeroChain.h
+++ b/AI/Nullkiller2/Goals/ExecuteHeroChain.h
@@ -12,7 +12,7 @@
 #include "CGoal.h"
 #include "../Pathfinding/AIPathfinder.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/ExploreNeighbourTile.cpp b/AI/Nullkiller2/Goals/ExploreNeighbourTile.cpp
index 108c59f3b..8329a20cf 100644
--- a/AI/Nullkiller2/Goals/ExploreNeighbourTile.cpp
+++ b/AI/Nullkiller2/Goals/ExploreNeighbourTile.cpp
@@ -14,7 +14,7 @@
 #include "../Helpers/ExplorationHelper.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/ExploreNeighbourTile.h b/AI/Nullkiller2/Goals/ExploreNeighbourTile.h
index 9a4dc0ea7..609fc9eb1 100644
--- a/AI/Nullkiller2/Goals/ExploreNeighbourTile.h
+++ b/AI/Nullkiller2/Goals/ExploreNeighbourTile.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class AIGateway;
diff --git a/AI/Nullkiller2/Goals/Invalid.h b/AI/Nullkiller2/Goals/Invalid.h
index 6207f1bb0..d99362604 100644
--- a/AI/Nullkiller2/Goals/Invalid.h
+++ b/AI/Nullkiller2/Goals/Invalid.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/RecruitHero.cpp b/AI/Nullkiller2/Goals/RecruitHero.cpp
index 1929d03fa..96278755b 100644
--- a/AI/Nullkiller2/Goals/RecruitHero.cpp
+++ b/AI/Nullkiller2/Goals/RecruitHero.cpp
@@ -14,7 +14,7 @@
 #include "../../../lib/constants/StringConstants.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/RecruitHero.h b/AI/Nullkiller2/Goals/RecruitHero.h
index c49644948..533eed8de 100644
--- a/AI/Nullkiller2/Goals/RecruitHero.h
+++ b/AI/Nullkiller2/Goals/RecruitHero.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Goals/SaveResources.cpp b/AI/Nullkiller2/Goals/SaveResources.cpp
index 6499ea457..31496979c 100644
--- a/AI/Nullkiller2/Goals/SaveResources.cpp
+++ b/AI/Nullkiller2/Goals/SaveResources.cpp
@@ -12,7 +12,7 @@
 #include "../AIGateway.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/SaveResources.h b/AI/Nullkiller2/Goals/SaveResources.h
index 09438b488..9dae2e29d 100644
--- a/AI/Nullkiller2/Goals/SaveResources.h
+++ b/AI/Nullkiller2/Goals/SaveResources.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/StayAtTown.cpp b/AI/Nullkiller2/Goals/StayAtTown.cpp
index 0a986e836..c94a5a49d 100644
--- a/AI/Nullkiller2/Goals/StayAtTown.cpp
+++ b/AI/Nullkiller2/Goals/StayAtTown.cpp
@@ -13,7 +13,7 @@
 #include "../Engine/Nullkiller.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Goals/StayAtTown.h b/AI/Nullkiller2/Goals/StayAtTown.h
index 9d90037b2..cc49c3881 100644
--- a/AI/Nullkiller2/Goals/StayAtTown.h
+++ b/AI/Nullkiller2/Goals/StayAtTown.h
@@ -14,7 +14,7 @@
 #include "../Analyzers/ArmyManager.h"
 #include "../Analyzers/DangerHitMapAnalyzer.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Goals/Trade.cpp b/AI/Nullkiller2/Goals/Trade.cpp
index cc7175efa..0bc6ad3f5 100644
--- a/AI/Nullkiller2/Goals/Trade.cpp
+++ b/AI/Nullkiller2/Goals/Trade.cpp
@@ -10,7 +10,7 @@
 #include "StdInc.h"
 #include "Trade.h"
 
-namespace NKAI
+namespace NK2AI
 {
 using namespace Goals;
 
diff --git a/AI/Nullkiller2/Goals/Trade.h b/AI/Nullkiller2/Goals/Trade.h
index f29ed8c8f..fde99d329 100644
--- a/AI/Nullkiller2/Goals/Trade.h
+++ b/AI/Nullkiller2/Goals/Trade.h
@@ -11,7 +11,7 @@
 
 #include "CGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Helpers/ArmyFormation.cpp b/AI/Nullkiller2/Helpers/ArmyFormation.cpp
index 1eb230774..40218536d 100644
--- a/AI/Nullkiller2/Helpers/ArmyFormation.cpp
+++ b/AI/Nullkiller2/Helpers/ArmyFormation.cpp
@@ -11,7 +11,7 @@
 #include "ArmyFormation.h"
 #include "../../../lib/mapObjects/CGTownInstance.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 void ArmyFormation::rearrangeArmyForWhirlpool(const CGHeroInstance * hero)
diff --git a/AI/Nullkiller2/Helpers/ArmyFormation.h b/AI/Nullkiller2/Helpers/ArmyFormation.h
index 88fe0363b..c32083ab5 100644
--- a/AI/Nullkiller2/Helpers/ArmyFormation.h
+++ b/AI/Nullkiller2/Helpers/ArmyFormation.h
@@ -14,7 +14,7 @@
 #include "../../../lib/GameConstants.h"
 #include "../../../lib/GameLibrary.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Helpers/ExplorationHelper.cpp b/AI/Nullkiller2/Helpers/ExplorationHelper.cpp
index b0d093921..2cd21be15 100644
--- a/AI/Nullkiller2/Helpers/ExplorationHelper.cpp
+++ b/AI/Nullkiller2/Helpers/ExplorationHelper.cpp
@@ -19,7 +19,7 @@
 #include "../Behaviors/CaptureObjectsBehavior.h"
 #include "../Goals/ExploreNeighbourTile.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Helpers/ExplorationHelper.h b/AI/Nullkiller2/Helpers/ExplorationHelper.h
index 009d8a724..6d861957b 100644
--- a/AI/Nullkiller2/Helpers/ExplorationHelper.h
+++ b/AI/Nullkiller2/Helpers/ExplorationHelper.h
@@ -15,7 +15,7 @@
 #include "../../../lib/GameLibrary.h"
 #include "../Goals/AbstractGoal.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class ExplorationHelper
diff --git a/AI/Nullkiller2/Markers/ArmyUpgrade.cpp b/AI/Nullkiller2/Markers/ArmyUpgrade.cpp
index 21f060486..636289223 100644
--- a/AI/Nullkiller2/Markers/ArmyUpgrade.cpp
+++ b/AI/Nullkiller2/Markers/ArmyUpgrade.cpp
@@ -13,7 +13,7 @@
 #include "../Engine/Nullkiller.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Markers/ArmyUpgrade.h b/AI/Nullkiller2/Markers/ArmyUpgrade.h
index 5ede01e80..d5eca31b2 100644
--- a/AI/Nullkiller2/Markers/ArmyUpgrade.h
+++ b/AI/Nullkiller2/Markers/ArmyUpgrade.h
@@ -13,7 +13,7 @@
 #include "../Pathfinding/AINodeStorage.h"
 #include "../Analyzers/ArmyManager.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Markers/DefendTown.cpp b/AI/Nullkiller2/Markers/DefendTown.cpp
index 123b87b5e..eb717605e 100644
--- a/AI/Nullkiller2/Markers/DefendTown.cpp
+++ b/AI/Nullkiller2/Markers/DefendTown.cpp
@@ -13,7 +13,7 @@
 #include "../Engine/Nullkiller.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Markers/DefendTown.h b/AI/Nullkiller2/Markers/DefendTown.h
index f03f84036..3253af393 100644
--- a/AI/Nullkiller2/Markers/DefendTown.h
+++ b/AI/Nullkiller2/Markers/DefendTown.h
@@ -14,7 +14,7 @@
 #include "../Analyzers/ArmyManager.h"
 #include "../Analyzers/DangerHitMapAnalyzer.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Markers/ExplorationPoint.cpp b/AI/Nullkiller2/Markers/ExplorationPoint.cpp
index 916ac5b7f..406c54321 100644
--- a/AI/Nullkiller2/Markers/ExplorationPoint.cpp
+++ b/AI/Nullkiller2/Markers/ExplorationPoint.cpp
@@ -14,7 +14,7 @@
 #include "../AIUtility.h"
 #include "../Analyzers/ArmyManager.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Markers/ExplorationPoint.h b/AI/Nullkiller2/Markers/ExplorationPoint.h
index 46469b8ec..101983a59 100644
--- a/AI/Nullkiller2/Markers/ExplorationPoint.h
+++ b/AI/Nullkiller2/Markers/ExplorationPoint.h
@@ -12,7 +12,7 @@
 #include "../Goals/CGoal.h"
 #include "../Pathfinding/AINodeStorage.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Markers/HeroExchange.cpp b/AI/Nullkiller2/Markers/HeroExchange.cpp
index 80117aeeb..74ea65c08 100644
--- a/AI/Nullkiller2/Markers/HeroExchange.cpp
+++ b/AI/Nullkiller2/Markers/HeroExchange.cpp
@@ -14,7 +14,7 @@
 #include "../AIUtility.h"
 #include "../Analyzers/ArmyManager.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Markers/HeroExchange.h b/AI/Nullkiller2/Markers/HeroExchange.h
index 2c741b8f3..8d5a214a0 100644
--- a/AI/Nullkiller2/Markers/HeroExchange.h
+++ b/AI/Nullkiller2/Markers/HeroExchange.h
@@ -12,7 +12,7 @@
 #include "../Goals/CGoal.h"
 #include "../Pathfinding/AINodeStorage.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace Goals
 {
diff --git a/AI/Nullkiller2/Markers/UnlockCluster.cpp b/AI/Nullkiller2/Markers/UnlockCluster.cpp
index c52ee8345..39fbb5c38 100644
--- a/AI/Nullkiller2/Markers/UnlockCluster.cpp
+++ b/AI/Nullkiller2/Markers/UnlockCluster.cpp
@@ -13,7 +13,7 @@
 #include "../Engine/Nullkiller.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace Goals;
diff --git a/AI/Nullkiller2/Markers/UnlockCluster.h b/AI/Nullkiller2/Markers/UnlockCluster.h
index 537541d9f..b295b3bf8 100644
--- a/AI/Nullkiller2/Markers/UnlockCluster.h
+++ b/AI/Nullkiller2/Markers/UnlockCluster.h
@@ -13,7 +13,7 @@
 #include "../Analyzers/ObjectClusterizer.h"
 
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct HeroPtr;
diff --git a/AI/Nullkiller2/Pathfinding/AINodeStorage.cpp b/AI/Nullkiller2/Pathfinding/AINodeStorage.cpp
index c3e3d1043..6a2323e4e 100644
--- a/AI/Nullkiller2/Pathfinding/AINodeStorage.cpp
+++ b/AI/Nullkiller2/Pathfinding/AINodeStorage.cpp
@@ -22,7 +22,7 @@
 #include "../../../lib/IGameSettings.h"
 #include "../../../lib/CPlayerState.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 std::shared_ptr<boost::multi_array<AIPathNode, 4>> AISharedStorage::shared;
diff --git a/AI/Nullkiller2/Pathfinding/AINodeStorage.h b/AI/Nullkiller2/Pathfinding/AINodeStorage.h
index 649da8d3f..a99fa79de 100644
--- a/AI/Nullkiller2/Pathfinding/AINodeStorage.h
+++ b/AI/Nullkiller2/Pathfinding/AINodeStorage.h
@@ -19,7 +19,7 @@ constexpr int NKAI_GRAPH_TRACE_LEVEL = 0; // To actually enable graph visualizat
 #include "Actions/SpecialAction.h"
 #include "Actors.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/AIPathfinder.cpp b/AI/Nullkiller2/Pathfinding/AIPathfinder.cpp
index a6c8c30b3..ffbc77961 100644
--- a/AI/Nullkiller2/Pathfinding/AIPathfinder.cpp
+++ b/AI/Nullkiller2/Pathfinding/AIPathfinder.cpp
@@ -13,7 +13,7 @@
 #include "../../../lib/mapping/CMap.h"
 #include "../Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 std::map<ObjectInstanceID, std::unique_ptr<GraphPaths>>  AIPathfinder::heroGraphs;
diff --git a/AI/Nullkiller2/Pathfinding/AIPathfinder.h b/AI/Nullkiller2/Pathfinding/AIPathfinder.h
index cd490cda4..2dabe3e1e 100644
--- a/AI/Nullkiller2/Pathfinding/AIPathfinder.h
+++ b/AI/Nullkiller2/Pathfinding/AIPathfinder.h
@@ -15,7 +15,7 @@
 #include "GraphPaths.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.cpp b/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.cpp
index e5c30d59b..8bd6ae7af 100644
--- a/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.cpp
+++ b/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.cpp
@@ -17,7 +17,7 @@
 
 #include "../../../lib/pathfinder/CPathfinder.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.h b/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.h
index 7c0b10dc7..db2a1e994 100644
--- a/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.h
+++ b/AI/Nullkiller2/Pathfinding/AIPathfinderConfig.h
@@ -13,7 +13,7 @@
 #include "AINodeStorage.h"
 #include "../../../lib/pathfinder/PathfinderOptions.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.cpp b/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.cpp
index 4c9ce19b8..99c5ee16a 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.cpp
@@ -17,7 +17,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "AdventureSpellCastMovementActions.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.h b/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.h
index a88324e3e..9d77c0c13 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/AdventureSpellCastMovementActions.h
@@ -13,7 +13,7 @@
 #include "SpecialAction.h"
 #include "../../../../lib/mapObjects/MapObjects.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/BattleAction.cpp b/AI/Nullkiller2/Pathfinding/Actions/BattleAction.cpp
index 4a2851502..07c585748 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/BattleAction.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/BattleAction.cpp
@@ -13,7 +13,7 @@
 #include "../../AIGateway.h"
 #include "../../Goals/CompleteQuest.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/BattleAction.h b/AI/Nullkiller2/Pathfinding/Actions/BattleAction.h
index f4bad8ed0..bd5bb0f25 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/BattleAction.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/BattleAction.h
@@ -12,7 +12,7 @@
 
 #include "SpecialAction.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/BoatActions.cpp b/AI/Nullkiller2/Pathfinding/Actions/BoatActions.cpp
index 50bb18f51..e4310ec59 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/BoatActions.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/BoatActions.cpp
@@ -17,7 +17,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "BoatActions.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/BoatActions.h b/AI/Nullkiller2/Pathfinding/Actions/BoatActions.h
index b9034f910..39e16fcfe 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/BoatActions.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/BoatActions.h
@@ -13,7 +13,7 @@
 #include "SpecialAction.h"
 #include "../../../../lib/mapObjects/MapObjects.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.cpp b/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.cpp
index 6513dbbbf..c1a5bf5ce 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.cpp
@@ -13,7 +13,7 @@
 #include "../../AIGateway.h"
 #include "../../Goals/CompleteQuest.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.h b/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.h
index da8d53e5b..7c2af4fc9 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/BuyArmyAction.h
@@ -12,7 +12,7 @@
 
 #include "SpecialAction.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Actions/QuestAction.cpp b/AI/Nullkiller2/Pathfinding/Actions/QuestAction.cpp
index a528157da..a92554d68 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/QuestAction.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/QuestAction.cpp
@@ -14,7 +14,7 @@
 #include "../../Goals/CompleteQuest.h"
 #include "../../../../lib/mapObjects/CQuest.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 namespace AIPathfinding
diff --git a/AI/Nullkiller2/Pathfinding/Actions/QuestAction.h b/AI/Nullkiller2/Pathfinding/Actions/QuestAction.h
index cc0dd59de..c4234eab5 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/QuestAction.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/QuestAction.h
@@ -13,7 +13,7 @@
 #include "SpecialAction.h"
 #include "../../../../lib/gameState/QuestInfo.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.cpp b/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.cpp
index 8e1595b18..8ef8db4c0 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.cpp
@@ -14,7 +14,7 @@
 #include "../../Goals/CGoal.h"
 #include "../../Goals/Invalid.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 Goals::TSubgoal SpecialAction::decompose(const Nullkiller * ai, const CGHeroInstance * hero) const
diff --git a/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.h b/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.h
index 3d8e48fb1..bd8e39465 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/SpecialAction.h
@@ -18,7 +18,7 @@ struct PathNodeInfo;
 struct CDestinationNodeInfo;
 VCMI_LIB_NAMESPACE_END
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct AIPathNode;
diff --git a/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.cpp b/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.cpp
index 22434c547..5a5551658 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.cpp
@@ -13,7 +13,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "TownPortalAction.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace AIPathfinding;
diff --git a/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.h b/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.h
index aa11e5930..24ca71c8b 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/TownPortalAction.h
@@ -14,7 +14,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "../../Goals/AdventureSpellCast.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.cpp b/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.cpp
index 56625a1b3..86ec877a3 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.cpp
@@ -14,7 +14,7 @@
 #include "WhirlpoolAction.h"
 #include "../../AIGateway.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 using namespace AIPathfinding;
diff --git a/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.h b/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.h
index 704b94b0f..bd4f4ebad 100644
--- a/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.h
+++ b/AI/Nullkiller2/Pathfinding/Actions/WhirlpoolAction.h
@@ -14,7 +14,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "../../Goals/AdventureSpellCast.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Actors.cpp b/AI/Nullkiller2/Pathfinding/Actors.cpp
index 7df7776e3..77336b21d 100644
--- a/AI/Nullkiller2/Pathfinding/Actors.cpp
+++ b/AI/Nullkiller2/Pathfinding/Actors.cpp
@@ -16,7 +16,7 @@
 #include "../../../lib/pathfinder/TurnInfo.h"
 #include "Actions/BuyArmyAction.h"
 
-using namespace NKAI;
+using namespace NK2AI;
 
 const CCreatureSet emptyArmy;
 
diff --git a/AI/Nullkiller2/Pathfinding/Actors.h b/AI/Nullkiller2/Pathfinding/Actors.h
index d73f01ac3..d0f8bf1c3 100644
--- a/AI/Nullkiller2/Pathfinding/Actors.h
+++ b/AI/Nullkiller2/Pathfinding/Actors.h
@@ -14,7 +14,7 @@
 #include "../AIUtility.h"
 #include "Actions/SpecialAction.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 extern const uint64_t MIN_ARMY_STRENGTH_FOR_CHAIN;
diff --git a/AI/Nullkiller2/Pathfinding/GraphPaths.cpp b/AI/Nullkiller2/Pathfinding/GraphPaths.cpp
index 2d1d186ec..d9226d09d 100644
--- a/AI/Nullkiller2/Pathfinding/GraphPaths.cpp
+++ b/AI/Nullkiller2/Pathfinding/GraphPaths.cpp
@@ -19,7 +19,7 @@
 #include "../pforeach.h"
 #include "Actions/BoatActions.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 bool GraphNodeComparer::operator()(const GraphPathNodePointer & lhs, const GraphPathNodePointer & rhs) const
diff --git a/AI/Nullkiller2/Pathfinding/GraphPaths.h b/AI/Nullkiller2/Pathfinding/GraphPaths.h
index 28dca8b1d..c647bc838 100644
--- a/AI/Nullkiller2/Pathfinding/GraphPaths.h
+++ b/AI/Nullkiller2/Pathfinding/GraphPaths.h
@@ -12,7 +12,7 @@
 
 #include "ObjectGraph.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Pathfinding/ObjectGraph.cpp b/AI/Nullkiller2/Pathfinding/ObjectGraph.cpp
index e4e6e0483..efbd186bc 100644
--- a/AI/Nullkiller2/Pathfinding/ObjectGraph.cpp
+++ b/AI/Nullkiller2/Pathfinding/ObjectGraph.cpp
@@ -19,7 +19,7 @@
 #include "../pforeach.h"
 #include "Actions/BoatActions.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 bool ObjectGraph::tryAddConnection(
diff --git a/AI/Nullkiller2/Pathfinding/ObjectGraph.h b/AI/Nullkiller2/Pathfinding/ObjectGraph.h
index d60844025..8e6b89ebb 100644
--- a/AI/Nullkiller2/Pathfinding/ObjectGraph.h
+++ b/AI/Nullkiller2/Pathfinding/ObjectGraph.h
@@ -13,7 +13,7 @@
 #include "AINodeStorage.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 class Nullkiller;
diff --git a/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.cpp b/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.cpp
index 589c05d41..81728eab3 100644
--- a/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.cpp
+++ b/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.cpp
@@ -17,7 +17,7 @@
 #include "Actions/QuestAction.h"
 #include "../pforeach.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 ObjectGraphCalculator::ObjectGraphCalculator(ObjectGraph * target, const Nullkiller * ai)
diff --git a/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.h b/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.h
index 812bd6985..f43bc8476 100644
--- a/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.h
+++ b/AI/Nullkiller2/Pathfinding/ObjectGraphCalculator.h
@@ -13,7 +13,7 @@
 #include "ObjectGraph.h"
 #include "../AIUtility.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 struct ConnectionCostInfo
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.cpp b/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.cpp
index e4f37bb0d..617490e15 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.cpp
+++ b/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.cpp
@@ -15,7 +15,7 @@
 #include "../../../../lib/spells/ISpellMechanics.h"
 #include "../../../../lib/spells/adventure/SummonBoatEffect.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.h b/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.h
index 1de94d4d6..78d4493fb 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.h
+++ b/AI/Nullkiller2/Pathfinding/Rules/AILayerTransitionRule.h
@@ -17,7 +17,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "../../../../lib/pathfinder/PathfindingRules.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.cpp b/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.cpp
index ef0e53c89..ca7990845 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.cpp
+++ b/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.cpp
@@ -18,7 +18,7 @@
 #include "../../../../lib/pathfinder/PathfinderOptions.h"
 #include "../../../../lib/pathfinder/CPathfinder.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.h b/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.h
index e24170a29..48457feb3 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.h
+++ b/AI/Nullkiller2/Pathfinding/Rules/AIMovementAfterDestinationRule.h
@@ -15,7 +15,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "../../../../lib/pathfinder/PathfindingRules.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.cpp b/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.cpp
index 307cd62e6..7735fb2cd 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.cpp
+++ b/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.cpp
@@ -10,7 +10,7 @@
 #include "StdInc.h"
 #include "AIMovementToDestinationRule.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.h b/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.h
index 3b4dddcaf..a040eb331 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.h
+++ b/AI/Nullkiller2/Pathfinding/Rules/AIMovementToDestinationRule.h
@@ -15,7 +15,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "../../../../lib/pathfinder/PathfindingRules.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.cpp b/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.cpp
index 5b685f0d8..137d9f71c 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.cpp
+++ b/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.cpp
@@ -12,7 +12,7 @@
 
 #include "../../../../lib/pathfinder/CPathfinder.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.h b/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.h
index b7d69ff3b..d66c5de7d 100644
--- a/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.h
+++ b/AI/Nullkiller2/Pathfinding/Rules/AIPreviousNodeRule.h
@@ -15,7 +15,7 @@
 #include "../../../../lib/mapObjects/MapObjects.h"
 #include "../../../../lib/pathfinder/PathfindingRules.h"
 
-namespace NKAI
+namespace NK2AI
 {
 namespace AIPathfinding
 {
diff --git a/AI/Nullkiller2/main.cpp b/AI/Nullkiller2/main.cpp
index 897e80509..0a82b86f4 100644
--- a/AI/Nullkiller2/main.cpp
+++ b/AI/Nullkiller2/main.cpp
@@ -28,5 +28,5 @@ extern "C" DLL_EXPORT void GetAiName(char * name)
 
 extern "C" DLL_EXPORT void GetNewAI(std::shared_ptr<CGlobalAI> & out)
 {
-	out = std::make_shared<NKAI::AIGateway>();
+	out = std::make_shared<NK2AI::AIGateway>();
 }
diff --git a/AI/Nullkiller2/pforeach.h b/AI/Nullkiller2/pforeach.h
index d8e911936..cd94d07af 100644
--- a/AI/Nullkiller2/pforeach.h
+++ b/AI/Nullkiller2/pforeach.h
@@ -2,7 +2,7 @@
 
 #include "Engine/Nullkiller.h"
 
-namespace NKAI
+namespace NK2AI
 {
 
 template<typename TFunc>