diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 6610f7f..3777a6b 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -43,6 +43,11 @@ jobs:
               CC: gcc-12,
               CXX: g++-12
             }
+          - {
+              OS: ubuntu-24.04,
+              CC: gcc-13,
+              CXX: g++-13
+            }
           - {
               OS: ubuntu-20.04,
               CC: clang-6.0,
@@ -100,11 +105,6 @@ jobs:
               CXX: clang++-15,
               VERSION: '15'
             }
-          - {
-              OS: macos-11,
-              CC: clang,
-              CXX: clang++
-            }
           - {
               OS: macos-12,
               CC: clang,
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 4cd3dbb..89f79ea 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -6,17 +6,30 @@ on:
   pull_request:
     branches: [ master ]
 
-env:
-  SOLUTION_FILE_PATH: projects\premake\hfsm2-vs.sln
-
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.PLATFORM.OS }}
+
+    env:
+      SOLUTION_FILE_PATH: ${{ matrix.PLATFORM.SOLUTION_FILE_PATH }}
+      PROJECT_FILE_NAME: ${{ matrix.PLATFORM.PROJECT_FILE_NAME }}
 
     strategy:
       matrix:
+        PLATFORM:
+          - {
+              OS: windows-2019,
+              SOLUTION_FILE_PATH: projects\premake\hfsm2-vs-2019.sln,
+              PROJECT_FILE_NAME: test-15
+            }
+          - {
+              OS: windows-2022,
+              SOLUTION_FILE_PATH: projects\premake\hfsm2-vs-2022.sln,
+              PROJECT_FILE_NAME: test-17
+            }
+
         BUILD_CONFIG: [ Release, Debug ]
-        BUILD_PLATFORM: [ 32, 64 ]
+        BUILD_PLATFORM: [ Win32, x64 ]
 
     steps:
     - uses: actions/checkout@v4
@@ -26,9 +39,8 @@ jobs:
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIG}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}
 
     - name: Test
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: "binaries/test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
+      run: "binaries/${{env.PROJECT_FILE_NAME}}-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b2eb8f..7d951dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 
+find_program(CCACHE_PROGRAM ccache)
+if(CCACHE_PROGRAM)
+	message(STATUS "Found ccache in ${CCACHE_PROGRAM}")
+	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
 project(hfsm2_test)
 
 file(GLOB SOURCE_FILES "test/*.cpp" "test/shared/*.cpp")
diff --git a/README.md b/README.md
index 256b999..ac76e09 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,11 @@ Header-only heriarchical FSM framework in C++11, with fully statically-defined s
 
 ## Compiler Support
 
-- Visual Studio: 2015, **2017, 2019, 2022**
-- GCC: 5, 6, 7, **8, 9, 10, 11, 12**
-- ARM GCC: **9**
-- Clang: 3.9, 4, 5, **6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
-- AppleClang: 12, **13, 13**
-
-(Currently CI-tested toolchains in **bold**)
+- Visual Studio: **2015, 2017, 2019, 2022**
+- GCC: **8, 9, 10, 11, 12, 13**
+- GCC (ARM): **9**
+- Clang: **6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
+- AppleClang: **14**
 
 ---
 
diff --git a/development/hfsm2/detail/root/control_0.hpp b/development/hfsm2/detail/root/control_0.hpp
index 3dea67a..9a33fb5 100644
--- a/development/hfsm2/detail/root/control_0.hpp
+++ b/development/hfsm2/detail/root/control_0.hpp
@@ -17,7 +17,7 @@ class ConstControlT {
 	template <typename, typename>
 	friend class R_;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct QueryWrapperT;
 
 protected:
diff --git a/development/hfsm2/detail/root/control_5.hpp b/development/hfsm2/detail/root/control_5.hpp
index dca68f2..795c514 100644
--- a/development/hfsm2/detail/root/control_5.hpp
+++ b/development/hfsm2/detail/root/control_5.hpp
@@ -10,13 +10,13 @@ class EventControlT final
 	template <typename, typename>
 	friend class R_;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct PreReactWrapperT;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct ReactWrapperT;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct PostReactWrapperT;
 
 	using FullControl	= FullControlT<TArgs>;
diff --git a/development/hfsm2/detail/structure/composite.hpp b/development/hfsm2/detail/structure/composite.hpp
index 7fa3b2f..e828f0e 100644
--- a/development/hfsm2/detail/structure/composite.hpp
+++ b/development/hfsm2/detail/structure/composite.hpp
@@ -86,10 +86,10 @@ struct HFSM2_EMPTY_BASES C_
 								  TL_<TSubStates...>
 							  >;
 
-	using PreReactWrapper	= PreReactWrapperT <HeadState, SubStates, ReactOrder>;
-	using ReactWrapper		= ReactWrapperT	   <HeadState, SubStates, ReactOrder>;
-	using PostReactWrapper	= PostReactWrapperT<HeadState, SubStates, ReactOrder>;
-	using QueryWrapper		= QueryWrapperT	   <HeadState, SubStates, ReactOrder>;
+	using PreReactWrapper	= PreReactWrapperT <C_, ReactOrder>;
+	using ReactWrapper		= ReactWrapperT	   <C_, ReactOrder>;
+	using PostReactWrapper	= PostReactWrapperT<C_, ReactOrder>;
+	using QueryWrapper		= QueryWrapperT	   <C_, ReactOrder>;
 
 	using Info				= CI_<STRATEGY, Head, TSubStates...>;
 	static constexpr Short WIDTH		  = Info::WIDTH;
diff --git a/development/hfsm2/detail/structure/orthogonal.hpp b/development/hfsm2/detail/structure/orthogonal.hpp
index d53ce5b..e0ab6c0 100644
--- a/development/hfsm2/detail/structure/orthogonal.hpp
+++ b/development/hfsm2/detail/structure/orthogonal.hpp
@@ -86,10 +86,10 @@ struct HFSM2_EMPTY_BASES O_
 							  TSubStates...
 						  >;
 
-	using PreReactWrapper	= PreReactWrapperT <HeadState, SubStates, ReactOrder>;
-	using ReactWrapper		= ReactWrapperT	   <HeadState, SubStates, ReactOrder>;
-	using PostReactWrapper	= PostReactWrapperT<HeadState, SubStates, ReactOrder>;
-	using QueryWrapper		= QueryWrapperT	   <HeadState, SubStates, ReactOrder>;
+	using PreReactWrapper	= PreReactWrapperT <O_, ReactOrder>;
+	using ReactWrapper		= ReactWrapperT	   <O_, ReactOrder>;
+	using PostReactWrapper	= PostReactWrapperT<O_, ReactOrder>;
+	using QueryWrapper		= QueryWrapperT	   <O_, ReactOrder>;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/development/hfsm2/detail/structure/reactions.inl b/development/hfsm2/detail/structure/reactions.inl
index 544ecfb..e98c2ae 100644
--- a/development/hfsm2/detail/structure/reactions.inl
+++ b/development/hfsm2/detail/structure/reactions.inl
@@ -3,24 +3,26 @@ namespace detail {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <typename, typename, typename >
+template <typename, typename>
 struct PreReactWrapperT;
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct PreReactWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PreReactWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -43,12 +45,12 @@ struct PreReactWrapperT<THeadState, TSubStates, TopDown> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -73,19 +75,21 @@ struct PreReactWrapperT<THeadState, TSubStates, TopDown> {
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct PreReactWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PreReactWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -108,12 +112,12 @@ struct PreReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -138,24 +142,26 @@ struct PreReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <typename, typename, typename >
+template <typename, typename>
 struct ReactWrapperT;
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct ReactWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct ReactWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -178,12 +184,12 @@ struct ReactWrapperT<THeadState, TSubStates, TopDown> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -208,19 +214,21 @@ struct ReactWrapperT<THeadState, TSubStates, TopDown> {
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct ReactWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct ReactWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -243,12 +251,12 @@ struct ReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -273,24 +281,26 @@ struct ReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <typename, typename, typename >
+template <typename, typename>
 struct PostReactWrapperT;
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct PostReactWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PostReactWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -315,12 +325,12 @@ struct PostReactWrapperT<THeadState, TSubStates, TopDown> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -347,19 +357,21 @@ struct PostReactWrapperT<THeadState, TSubStates, TopDown> {
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct PostReactWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PostReactWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -384,12 +396,12 @@ struct PostReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -416,24 +428,26 @@ struct PostReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <typename, typename, typename>
+template <typename, typename>
 struct QueryWrapperT;
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct QueryWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct QueryWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using ConstControl	= typename Region::ConstControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event,
 			const Prong active) noexcept
 	{
@@ -449,12 +463,12 @@ struct QueryWrapperT<THeadState, TSubStates, TopDown> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event) noexcept
 	{
 		const HeadState& headState = static_cast<const HeadState&>(region);
@@ -472,19 +486,21 @@ struct QueryWrapperT<THeadState, TSubStates, TopDown> {
 
 //------------------------------------------------------------------------------
 
-template <typename THeadState, typename TSubStates>
-struct QueryWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct QueryWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using ConstControl	= typename Region::ConstControl;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event,
 			const Prong active) noexcept
 	{
@@ -500,12 +516,12 @@ struct QueryWrapperT<THeadState, TSubStates, BottomUp> {
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event) noexcept
 	{
 		const HeadState& headState = static_cast<const HeadState&>(region);
diff --git a/development/hfsm2/machine_dev.hpp b/development/hfsm2/machine_dev.hpp
index bc6797f..f09d86e 100644
--- a/development/hfsm2/machine_dev.hpp
+++ b/development/hfsm2/machine_dev.hpp
@@ -1,5 +1,5 @@
 // HFSM2 (hierarchical state machine for games and interactive applications)
-// 2.5.0 (2024-01-01)
+// 2.5.1 (2024-05-25)
 //
 // Created by Andrew Gresyk
 //
@@ -33,7 +33,7 @@
 
 #define HFSM2_VERSION_MAJOR 2
 #define HFSM2_VERSION_MINOR 5
-#define HFSM2_VERSION_PATCH 0
+#define HFSM2_VERSION_PATCH 1
 
 #define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)
 
diff --git a/examples/temp/main.cpp b/examples/temp/main.cpp
index 49d6c32..2ecbf56 100644
--- a/examples/temp/main.cpp
+++ b/examples/temp/main.cpp
@@ -1,78 +1,290 @@
-#define HFSM2_ENABLE_UTILITY_THEORY
-#include <iostream>
+// HFSM2 (hierarchical state machine for games and interactive applications)
+// Created by Andrew Gresyk
+//
+// Traffic light example:
+// Cycle between R-Y-G-Y-B three times, then turn off
+
+// State structure:
+//
+// Root
+//  ├ On
+//  │  ├ Red
+//  │  ├ YellowDownwards
+//  │  ├ YellowUpwards
+//  │  └ Green
+//  └ Off
+
+// Output:
+//
+// On
+//   Red
+//     Yellow v
+//       Green
+//     Yellow ^
+//   Red
+//     Yellow v
+//       Green
+//     Yellow ^
+//   Red
+//     Yellow v
+//       Green
+//     Yellow ^
+//   Red
+// Off
+
+// optional: enable FSM structure report in debugger
+#define HFSM2_ENABLE_STRUCTURE_REPORT
+#define HFSM2_ENABLE_PLANS
+#define HFSM2_ENABLE_LOG_INTERFACE
 #include <hfsm2/machine.hpp>
 
+#include <iostream>
+#include <Windows.h>
+
+
+//------------------------------------------------------------------------------
+
+// data shared between FSM states and outside code
 struct Context {
-	uint8_t cycleCount = 0;
+	unsigned cycleCount = 0;
+	bool fail_this_time = true;
 };
 
+//template<typename Machine>
+//class HFSM2Logger : public Machine::Logger
+//{
+//public:
+//	void recordMethod(const Machine::Context& context,
+//		const hfsm2::StateID origin,
+//		const hfsm2::Method method) override
+//	{
+//		Debug::Event("HFSM2: origin=%d method=%d, origin, method");
+//	}
+//};
+
+// convenience typedef
 using M = hfsm2::MachineT<hfsm2::Config::ContextT<Context>>;
 
+#if 0
+
+// states need to be forward declared to be used in FSM struct declaration
+struct On;
+struct Red;
+struct YellowDownwards;
+struct YellowUpwards;
+struct Green;
+struct Off;
+
+using FSM = M::PeerRoot<
+				// sub-machine ..
+				M::Composite<On,
+					// .. with 4 sub-states
+					Red,
+					YellowDownwards,
+					YellowUpwards,
+					Green
+				>,
+				Off
+			>;
+
+#else
+
+// alternatively, some macro magic can be invoked to simplify FSM structure declaration
 #define S(s) struct s
+
+// state machine structure
 using FSM = M::PeerRoot<
-	M::Utilitarian<S(Red),
-		S(Yellow),
-		S(Green)
-	>,
-	S(Off)
->;
+				// sub-machine ..
+				M::Composite<S(On),
+					// .. with 4 sub-states
+					S(Red),
+					S(YellowDownwards),
+					S(YellowUpwards),
+					S(Green)
+				>,
+				S(Off)
+			>;
+
 #undef S
 
+#endif
+
+//------------------------------------------------------------------------------
+
+static_assert(FSM::regionId<On>()			  ==  1, "");
+
+static_assert(FSM::stateId<On>()			  ==  1, "");
+static_assert(FSM::stateId<Red>()			  ==  2, "");
+static_assert(FSM::stateId<YellowDownwards>() ==  3, "");
+static_assert(FSM::stateId<YellowUpwards>()	  ==  4, "");
+static_assert(FSM::stateId<Green>()			  ==  5, "");
+static_assert(FSM::stateId<Off>()			  ==  6, "");
+
+////////////////////////////////////////////////////////////////////////////////
+
+// top-level region in the hierarchy
 struct On
-	: FSM::State
+	: FSM::State // necessary boilerplate!
 {
-	void enter(Control& control) {
+	// called on state entry
+	void enter(PlanControl& control) {
 		control.context().cycleCount = 0;
 		std::cout << "On" << std::endl;
+
+		auto plan = control.plan();
+
+		plan.change<Red, YellowDownwards>();
+		plan.change<YellowDownwards, Green>();
+		//plan.change<Green, YellowUpwards>();
+		//plan.change<YellowUpwards, Red>();
+	}
+
+	void exit(PlanControl& /*control*/)               // called on state deactivation
+	{
+		std::cout << "On::Exit()" << std::endl;
+	}
+
+	void planSucceeded(FullControl& control) {        // called on the successful completion
+		std::cout << "Plan succeeded" << std::endl;
+		control.changeTo<Off>();                      //   of all plan steps
+	}
+
+	void planFailed(FullControl& control)
+	{
+		std::cout << "Plan failed, restarting..." << std::endl;
+		control.context().fail_this_time = false;
+		control.changeTo<On>();
+		//control.plan().restart<On, On>();
+	}
+
+	virtual void update(FullControl& /*control*/)
+	{
+		std::cout << "On Update()" << std::endl;
 	}
 };
 
+//------------------------------------------------------------------------------
+
+// sub-states
 struct Red
 	: FSM::State
 {
 	void enter(Control& control) {
 		++control.context().cycleCount;
-		std::cout << "  Red" << std::endl;
+		std::cout << "Red::Enter()" << std::endl;
 	}
 
+	// state can initiate transitions to _any_ other state
 	void update(FullControl& control) {
-		if (control.context().cycleCount > 3)
-			control.changeTo<Off>();
+		std::cout << "Red Update()" << std::endl;
+		control.succeed();
+	}
+		// multiple transitions can be initiated, can be useful in a hierarchy
+	//	if (control.context().cycleCount > 3)
+	//		control.changeTo<Off>();
+	//	else
+	//		control.changeTo<YellowDownwards>();
+	//}
+
+	void exit(PlanControl& control)
+	{
+		std::cout << "Red::Exit()" << std::endl;
+	}
+};
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+struct YellowDownwards
+	: FSM::State
+{
+	void enter(PlanControl& control) {
+		std::cout << "Yellow v::Enter()" << std::endl;
+	}
+
+	void update(FullControl& control) {
+		std::cout << "YellowDownwards Update()" << std::endl;
+		//control.changeTo<Green>();
+		if (control.context().fail_this_time)
+			control.fail();
 		else
-			control.changeTo<Green>();
+			control.succeed();
+	}
+
+	void exit(PlanControl& control)
+	{
+		std::cout << "YellowDownwards::Exit()" << std::endl;
 	}
 };
 
-struct Yellow
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+struct YellowUpwards
 	: FSM::State
 {
-	void enter(Control&) { std::cout << "    Yellow ^" << std::endl; }
-	void update(FullControl& control) { control.changeTo<Red>(); }
-	///
-	Utility utility(const Control& control) { return 0.5f + control.context().cycleCount; }
-	///
+	void enter(Control&) {
+		std::cout << "    Yellow ^" << std::endl;
+	}
+
+	void update(FullControl& control) {
+		std::cout << "YellowUpwards Update()" << std::endl;
+		//control.changeTo<Red>();
+	}
+
+	void exit(PlanControl& control)
+	{
+		std::cout << "YellowUpwards::Exit()" << std::endl;
+	}
 };
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 struct Green
 	: FSM::State
 {
-	void enter(Control&) { std::cout << "      Green" << std::endl; }
-	void update(FullControl& control) { control.changeTo<Yellow>(); }
+	void enter(Control&) {
+		std::cout << "Green::Enter()" << std::endl;
+	}
+
+	void update(FullControl& control) {
+		std::cout << "Green Update()" << std::endl;
+		//control.changeTo<YellowUpwards>();
+		control.succeed();
+	}
+
+	void exit(PlanControl& control)
+	{
+		std::cout << "Green::Exit()" << std::endl;
+	}
 };
 
+//------------------------------------------------------------------------------
+
+// another top-level state
 struct Off
 	: FSM::State
 {
-	void enter(Control&) { std::cout << "Off" << std::endl; }
+	void enter(Control&) {
+		std::cout << "Off" << std::endl;
+	}
 };
 
-int
-main() {
+////////////////////////////////////////////////////////////////////////////////
+
+int main() {
+	// shared data storage instance
 	Context context;
-	FSM::Instance machine{ context };
+
+	FSM::Instance machine{context};
 
 	while (machine.isActive<Off>() == false)
+	{
+		std::cout << "update start" << std::endl;
 		machine.update();
+		std::cout << "update complete" << std::endl << std::endl;
+		Sleep(1000);
+	}
 
 	return 0;
 }
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/include/hfsm2/machine.hpp b/include/hfsm2/machine.hpp
index 721687d..2a76a50 100644
--- a/include/hfsm2/machine.hpp
+++ b/include/hfsm2/machine.hpp
@@ -1,5 +1,5 @@
 // HFSM2 (hierarchical state machine for games and interactive applications)
-// 2.5.0 (2024-01-01)
+// 2.5.1 (2024-05-25)
 //
 // Created by Andrew Gresyk
 //
@@ -33,7 +33,7 @@
 
 #define HFSM2_VERSION_MAJOR 2
 #define HFSM2_VERSION_MINOR 5
-#define HFSM2_VERSION_PATCH 0
+#define HFSM2_VERSION_PATCH 1
 
 #define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)
 
@@ -5638,7 +5638,7 @@ class ConstControlT {
 	template <typename, typename>
 	friend class R_;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct QueryWrapperT;
 
 protected:
@@ -7488,13 +7488,13 @@ class EventControlT final
 	template <typename, typename>
 	friend class R_;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct PreReactWrapperT;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct ReactWrapperT;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct PostReactWrapperT;
 
 	using FullControl	= FullControlT<TArgs>;
@@ -9631,20 +9631,22 @@ using RemainingOS = typename RemainingOST<TN, TA, NP, TI, TR...>::Type;
 namespace hfsm2 {
 namespace detail {
 
-template <typename, typename, typename >
+template <typename, typename>
 struct PreReactWrapperT;
 
-template <typename THeadState, typename TSubStates>
-struct PreReactWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PreReactWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -9665,12 +9667,12 @@ struct PreReactWrapperT<THeadState, TSubStates, TopDown> {
 			return TaskStatus{};
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -9692,17 +9694,19 @@ struct PreReactWrapperT<THeadState, TSubStates, TopDown> {
 
 };
 
-template <typename THeadState, typename TSubStates>
-struct PreReactWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PreReactWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -9723,12 +9727,12 @@ struct PreReactWrapperT<THeadState, TSubStates, BottomUp> {
 			return TaskStatus{};
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -9750,20 +9754,22 @@ struct PreReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 };
 
-template <typename, typename, typename >
+template <typename, typename>
 struct ReactWrapperT;
 
-template <typename THeadState, typename TSubStates>
-struct ReactWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct ReactWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -9784,12 +9790,12 @@ struct ReactWrapperT<THeadState, TSubStates, TopDown> {
 			return TaskStatus{};
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -9811,17 +9817,19 @@ struct ReactWrapperT<THeadState, TSubStates, TopDown> {
 
 };
 
-template <typename THeadState, typename TSubStates>
-struct ReactWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct ReactWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -9842,12 +9850,12 @@ struct ReactWrapperT<THeadState, TSubStates, BottomUp> {
 			return TaskStatus{};
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -9869,20 +9877,22 @@ struct ReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 };
 
-template <typename, typename, typename >
+template <typename, typename>
 struct PostReactWrapperT;
 
-template <typename THeadState, typename TSubStates>
-struct PostReactWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PostReactWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -9905,12 +9915,12 @@ struct PostReactWrapperT<THeadState, TSubStates, TopDown> {
 		return TaskStatus{};
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -9934,17 +9944,19 @@ struct PostReactWrapperT<THeadState, TSubStates, TopDown> {
 
 };
 
-template <typename THeadState, typename TSubStates>
-struct PostReactWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct PostReactWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using EventControl	= typename Region::EventControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event,
 			const Prong active) noexcept
 	{
@@ -9967,12 +9979,12 @@ struct PostReactWrapperT<THeadState, TSubStates, BottomUp> {
 		return TaskStatus{};
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	TaskStatus
-	execute(TRegion& region,
-			typename TRegion::EventControl& control,
+	execute(Region& region,
+			EventControl& control,
 			const TEvent& event) noexcept
 	{
 		if (!control._consumed) {
@@ -9996,20 +10008,22 @@ struct PostReactWrapperT<THeadState, TSubStates, BottomUp> {
 
 };
 
-template <typename, typename, typename>
+template <typename, typename>
 struct QueryWrapperT;
 
-template <typename THeadState, typename TSubStates>
-struct QueryWrapperT<THeadState, TSubStates, TopDown> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct QueryWrapperT<TRegion, TopDown> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using ConstControl	= typename Region::ConstControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event,
 			const Prong active) noexcept
 	{
@@ -10023,12 +10037,12 @@ struct QueryWrapperT<THeadState, TSubStates, TopDown> {
 			subStates.wideQuery(control, event, active);
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event) noexcept
 	{
 		const HeadState& headState = static_cast<const HeadState&>(region);
@@ -10043,17 +10057,19 @@ struct QueryWrapperT<THeadState, TSubStates, TopDown> {
 
 };
 
-template <typename THeadState, typename TSubStates>
-struct QueryWrapperT<THeadState, TSubStates, BottomUp> {
-	using HeadState = THeadState;
-	using SubStates = TSubStates;
+template <typename TRegion>
+struct QueryWrapperT<TRegion, BottomUp> {
+	using Region		= TRegion;
+	using HeadState		= typename Region::HeadState;
+	using SubStates		= typename Region::SubStates;
+	using ConstControl	= typename Region::ConstControl;
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event,
 			const Prong active) noexcept
 	{
@@ -10067,12 +10083,12 @@ struct QueryWrapperT<THeadState, TSubStates, BottomUp> {
 			headState.deepQuery(control, event);
 	}
 
-	template <typename TRegion, typename TEvent>
+	template <typename TEvent>
 	static
 	HFSM2_CONSTEXPR(14)
 	void
-	execute(const TRegion& region,
-			typename TRegion::ConstControl& control,
+	execute(const Region& region,
+			ConstControl& control,
 			TEvent& event) noexcept
 	{
 		const HeadState& headState = static_cast<const HeadState&>(region);
@@ -11478,10 +11494,10 @@ struct HFSM2_EMPTY_BASES C_
 								  TL_<TSubStates...>
 							  >;
 
-	using PreReactWrapper	= PreReactWrapperT <HeadState, SubStates, ReactOrder>;
-	using ReactWrapper		= ReactWrapperT	   <HeadState, SubStates, ReactOrder>;
-	using PostReactWrapper	= PostReactWrapperT<HeadState, SubStates, ReactOrder>;
-	using QueryWrapper		= QueryWrapperT	   <HeadState, SubStates, ReactOrder>;
+	using PreReactWrapper	= PreReactWrapperT <C_, ReactOrder>;
+	using ReactWrapper		= ReactWrapperT	   <C_, ReactOrder>;
+	using PostReactWrapper	= PostReactWrapperT<C_, ReactOrder>;
+	using QueryWrapper		= QueryWrapperT	   <C_, ReactOrder>;
 
 	using Info				= CI_<STRATEGY, Head, TSubStates...>;
 	static constexpr Short WIDTH		  = Info::WIDTH;
@@ -13722,10 +13738,10 @@ struct HFSM2_EMPTY_BASES O_
 							  TSubStates...
 						  >;
 
-	using PreReactWrapper	= PreReactWrapperT <HeadState, SubStates, ReactOrder>;
-	using ReactWrapper		= ReactWrapperT	   <HeadState, SubStates, ReactOrder>;
-	using PostReactWrapper	= PostReactWrapperT<HeadState, SubStates, ReactOrder>;
-	using QueryWrapper		= QueryWrapperT	   <HeadState, SubStates, ReactOrder>;
+	using PreReactWrapper	= PreReactWrapperT <O_, ReactOrder>;
+	using ReactWrapper		= ReactWrapperT	   <O_, ReactOrder>;
+	using PostReactWrapper	= PostReactWrapperT<O_, ReactOrder>;
+	using QueryWrapper		= QueryWrapperT	   <O_, ReactOrder>;
 
 	HFSM2_CONSTEXPR(11)	static ProngBits  orthoRequested (		Registry& registry)		noexcept	{ return			   registry.orthoRequested.template  bits<ORTHO_UNIT, WIDTH>();	}
 	HFSM2_CONSTEXPR(11)	static ProngCBits orthoRequested (const Registry& registry)		noexcept	{ return			   registry.orthoRequested.template cbits<ORTHO_UNIT, WIDTH>();	}
diff --git a/premake.lua b/premake.lua
index ba53c63..a8069a9 100644
--- a/premake.lua
+++ b/premake.lua
@@ -32,7 +32,7 @@ workspace "hfsm2"
 	--systemversion "$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))"
 
 	targetdir "binaries/"
-	targetname "$(ProjectName)-$(Configuration)-$(PlatformArchitecture)"
+	targetname "$(ProjectName)-$(Configuration)-$(Platform)"
 	warnings "High"
 
 	filter "toolset:msc-v140 or msc-v141"
diff --git a/projects/premake/advanced_event_handling-14.vcxproj b/projects/premake/advanced_event_handling-14.vcxproj
index 5e30f11..48aa42c 100644
--- a/projects/premake/advanced_event_handling-14.vcxproj
+++ b/projects/premake/advanced_event_handling-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/advanced_event_handling-15.vcxproj b/projects/premake/advanced_event_handling-15.vcxproj
index 6ece159..8e7b02c 100644
--- a/projects/premake/advanced_event_handling-15.vcxproj
+++ b/projects/premake/advanced_event_handling-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/advanced_event_handling-16.vcxproj b/projects/premake/advanced_event_handling-16.vcxproj
index 9db0ebe..9f39e75 100644
--- a/projects/premake/advanced_event_handling-16.vcxproj
+++ b/projects/premake/advanced_event_handling-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/advanced_event_handling-17.vcxproj b/projects/premake/advanced_event_handling-17.vcxproj
index d581401..ebb7651 100644
--- a/projects/premake/advanced_event_handling-17.vcxproj
+++ b/projects/premake/advanced_event_handling-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/advanced_event_handling-clang.vcxproj b/projects/premake/advanced_event_handling-clang.vcxproj
index 3bcfb07..3e055cb 100644
--- a/projects/premake/advanced_event_handling-clang.vcxproj
+++ b/projects/premake/advanced_event_handling-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\advanced_event_handling-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\advanced_event_handling-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\advanced_event_handling-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\advanced_event_handling-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_audio_player-14.vcxproj b/projects/premake/basic_audio_player-14.vcxproj
index 3fcce28..62471d3 100644
--- a/projects/premake/basic_audio_player-14.vcxproj
+++ b/projects/premake/basic_audio_player-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_audio_player-15.vcxproj b/projects/premake/basic_audio_player-15.vcxproj
index 8dacfd1..e00c934 100644
--- a/projects/premake/basic_audio_player-15.vcxproj
+++ b/projects/premake/basic_audio_player-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_audio_player-16.vcxproj b/projects/premake/basic_audio_player-16.vcxproj
index a96dccb..ca9d4fb 100644
--- a/projects/premake/basic_audio_player-16.vcxproj
+++ b/projects/premake/basic_audio_player-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_audio_player-17.vcxproj b/projects/premake/basic_audio_player-17.vcxproj
index 0db964b..ca724b5 100644
--- a/projects/premake/basic_audio_player-17.vcxproj
+++ b/projects/premake/basic_audio_player-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_audio_player-clang.vcxproj b/projects/premake/basic_audio_player-clang.vcxproj
index 8dbab04..0970def 100644
--- a/projects/premake/basic_audio_player-clang.vcxproj
+++ b/projects/premake/basic_audio_player-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_audio_player-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_audio_player-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_audio_player-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_audio_player-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_traffic_light-14.vcxproj b/projects/premake/basic_traffic_light-14.vcxproj
index 3431435..d212daf 100644
--- a/projects/premake/basic_traffic_light-14.vcxproj
+++ b/projects/premake/basic_traffic_light-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_traffic_light-15.vcxproj b/projects/premake/basic_traffic_light-15.vcxproj
index 4486fc7..ba3d71d 100644
--- a/projects/premake/basic_traffic_light-15.vcxproj
+++ b/projects/premake/basic_traffic_light-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_traffic_light-16.vcxproj b/projects/premake/basic_traffic_light-16.vcxproj
index 74d2fc4..06dc167 100644
--- a/projects/premake/basic_traffic_light-16.vcxproj
+++ b/projects/premake/basic_traffic_light-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_traffic_light-17.vcxproj b/projects/premake/basic_traffic_light-17.vcxproj
index 0814f7e..63827c9 100644
--- a/projects/premake/basic_traffic_light-17.vcxproj
+++ b/projects/premake/basic_traffic_light-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/basic_traffic_light-clang.vcxproj b/projects/premake/basic_traffic_light-clang.vcxproj
index 8b0de91..816622d 100644
--- a/projects/premake/basic_traffic_light-clang.vcxproj
+++ b/projects/premake/basic_traffic_light-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\basic_traffic_light-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\basic_traffic_light-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\basic_traffic_light-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\basic_traffic_light-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/calculator-14.vcxproj b/projects/premake/calculator-14.vcxproj
index 4035df7..6459e19 100644
--- a/projects/premake/calculator-14.vcxproj
+++ b/projects/premake/calculator-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/calculator-15.vcxproj b/projects/premake/calculator-15.vcxproj
index 119a5b8..78f6149 100644
--- a/projects/premake/calculator-15.vcxproj
+++ b/projects/premake/calculator-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/calculator-16.vcxproj b/projects/premake/calculator-16.vcxproj
index 6c78bcd..e515fad 100644
--- a/projects/premake/calculator-16.vcxproj
+++ b/projects/premake/calculator-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/calculator-17.vcxproj b/projects/premake/calculator-17.vcxproj
index c3566ba..61c05d1 100644
--- a/projects/premake/calculator-17.vcxproj
+++ b/projects/premake/calculator-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/calculator-clang.vcxproj b/projects/premake/calculator-clang.vcxproj
index 265cd4d..7a1d1c6 100644
--- a/projects/premake/calculator-clang.vcxproj
+++ b/projects/premake/calculator-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\calculator-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\calculator-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\calculator-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\calculator-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/debug_logger_interface-14.vcxproj b/projects/premake/debug_logger_interface-14.vcxproj
index f14edc0..bb7fdd5 100644
--- a/projects/premake/debug_logger_interface-14.vcxproj
+++ b/projects/premake/debug_logger_interface-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/debug_logger_interface-15.vcxproj b/projects/premake/debug_logger_interface-15.vcxproj
index c8ceccf..81f7e02 100644
--- a/projects/premake/debug_logger_interface-15.vcxproj
+++ b/projects/premake/debug_logger_interface-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/debug_logger_interface-16.vcxproj b/projects/premake/debug_logger_interface-16.vcxproj
index 1400da5..a7cccd4 100644
--- a/projects/premake/debug_logger_interface-16.vcxproj
+++ b/projects/premake/debug_logger_interface-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/debug_logger_interface-17.vcxproj b/projects/premake/debug_logger_interface-17.vcxproj
index 1ffcdc3..c2e9f12 100644
--- a/projects/premake/debug_logger_interface-17.vcxproj
+++ b/projects/premake/debug_logger_interface-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/debug_logger_interface-clang.vcxproj b/projects/premake/debug_logger_interface-clang.vcxproj
index 385cb0a..4125312 100644
--- a/projects/premake/debug_logger_interface-clang.vcxproj
+++ b/projects/premake/debug_logger_interface-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\debug_logger_interface-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\debug_logger_interface-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\debug_logger_interface-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\debug_logger_interface-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/hfsm2-vs-2019.sln b/projects/premake/hfsm2-vs-2019.sln
new file mode 100644
index 0000000..b846930
--- /dev/null
+++ b/projects/premake/hfsm2-vs-2019.sln
@@ -0,0 +1,141 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34902.65
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-14", "advanced_event_handling-14.vcxproj", "{F2F0D850-DE00-8521-47BA-E93F33E973BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-15", "advanced_event_handling-15.vcxproj", "{F3F0D850-DF00-8521-48BA-E93F34E973BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-14", "basic_audio_player-14.vcxproj", "{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-15", "basic_audio_player-15.vcxproj", "{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-14", "basic_traffic_light-14.vcxproj", "{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-15", "basic_traffic_light-15.vcxproj", "{8FF02841-7BEA-5193-6457-E8A350F0B7FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-14", "calculator-14.vcxproj", "{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-15", "calculator-15.vcxproj", "{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-14", "debug_logger_interface-14.vcxproj", "{CD91E21A-3954-16A5-8204-A531EE05EF82}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-15", "debug_logger_interface-15.vcxproj", "{CE91E21A-3A54-16A5-8304-A531EF05EF82}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-14", "test-14.vcxproj", "{37901DD9-A36F-9C74-AC87-274B18E602D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-15", "test-15.vcxproj", "{38901DD9-A46F-9C74-AD87-274B19E602D6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F2F0D850-DE00-8521-47BA-E93F33E973BA}.Release|x64.Build.0 = Release|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|x64.Build.0 = Release|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D6549E75-42C1-5970-0BB5-F1CD77E07BD8}.Release|x64.Build.0 = Release|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|x64.Build.0 = Release|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{8EF02841-7AEA-5193-6357-E8A34FF0B7FF}.Release|x64.Build.0 = Release|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|x64.Build.0 = Release|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Debug|x64.Build.0 = Debug|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|Win32.Build.0 = Release|Win32
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|x64.ActiveCfg = Release|x64
+		{81C649A8-ED86-C5DE-B6C1-0E5C22410ABB}.Release|x64.Build.0 = Release|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|x64.Build.0 = Debug|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|Win32.Build.0 = Release|Win32
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|x64.ActiveCfg = Release|x64
+		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|x64.Build.0 = Release|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Debug|x64.Build.0 = Debug|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|Win32.Build.0 = Release|Win32
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|x64.ActiveCfg = Release|x64
+		{CD91E21A-3954-16A5-8204-A531EE05EF82}.Release|x64.Build.0 = Release|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|x64.Build.0 = Debug|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|Win32.Build.0 = Release|Win32
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|x64.ActiveCfg = Release|x64
+		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|x64.Build.0 = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Debug|x64.Build.0 = Debug|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|Win32.Build.0 = Release|Win32
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.ActiveCfg = Release|x64
+		{37901DD9-A36F-9C74-AC87-274B18E602D6}.Release|x64.Build.0 = Release|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|x64.Build.0 = Debug|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|Win32.Build.0 = Release|Win32
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|x64.ActiveCfg = Release|x64
+		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C1ADAB77-1788-4DE1-9BA1-F2D20BE6B7DB}
+	EndGlobalSection
+EndGlobal
diff --git a/projects/premake/hfsm2-vs-2022.sln b/projects/premake/hfsm2-vs-2022.sln
new file mode 100644
index 0000000..dc2a633
--- /dev/null
+++ b/projects/premake/hfsm2-vs-2022.sln
@@ -0,0 +1,101 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34902.65
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-17", "advanced_event_handling-17.vcxproj", "{F5F0D850-E100-8521-4ABA-E93F36E973BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-16", "basic_audio_player-16.vcxproj", "{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-17", "basic_audio_player-17.vcxproj", "{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-17", "basic_traffic_light-17.vcxproj", "{91F02841-7DEA-5193-6657-E8A352F0B7FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-17", "calculator-17.vcxproj", "{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-17", "debug_logger_interface-17.vcxproj", "{D091E21A-3C54-16A5-8504-A531F105EF82}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-16", "test-16.vcxproj", "{39901DD9-A56F-9C74-AE87-274B1AE602D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-17", "test-17.vcxproj", "{3A901DD9-A66F-9C74-AF87-274B1BE602D6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|Win32.Build.0 = Debug|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|x64.ActiveCfg = Debug|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|x64.Build.0 = Debug|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|Win32.ActiveCfg = Release|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|Win32.Build.0 = Release|Win32
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|x64.ActiveCfg = Release|x64
+		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|x64.Build.0 = Release|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|x64.Build.0 = Release|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|Win32.Build.0 = Debug|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|x64.ActiveCfg = Debug|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|x64.Build.0 = Debug|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|Win32.ActiveCfg = Release|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|Win32.Build.0 = Release|Win32
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|x64.ActiveCfg = Release|x64
+		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|x64.Build.0 = Release|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|Win32.Build.0 = Debug|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|x64.ActiveCfg = Debug|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|x64.Build.0 = Debug|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|Win32.ActiveCfg = Release|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|Win32.Build.0 = Release|Win32
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|x64.ActiveCfg = Release|x64
+		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|x64.Build.0 = Release|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|Win32.Build.0 = Debug|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|x64.ActiveCfg = Debug|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|x64.Build.0 = Debug|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|Win32.ActiveCfg = Release|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|Win32.Build.0 = Release|Win32
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|x64.ActiveCfg = Release|x64
+		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|x64.Build.0 = Release|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|Win32.Build.0 = Debug|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|x64.ActiveCfg = Debug|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|x64.Build.0 = Debug|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|Win32.ActiveCfg = Release|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|Win32.Build.0 = Release|Win32
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|x64.ActiveCfg = Release|x64
+		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|x64.Build.0 = Release|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|x64.Build.0 = Debug|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|Win32.Build.0 = Release|Win32
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|x64.ActiveCfg = Release|x64
+		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|x64.Build.0 = Release|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|Win32.Build.0 = Debug|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|x64.ActiveCfg = Debug|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|x64.Build.0 = Debug|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|Win32.ActiveCfg = Release|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|Win32.Build.0 = Release|Win32
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|x64.ActiveCfg = Release|x64
+		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {69ED02CB-EF20-4C29-8AA4-F96BE61FA502}
+	EndGlobalSection
+EndGlobal
diff --git a/projects/premake/hfsm2-vs.sln b/projects/premake/hfsm2-vs.sln
deleted file mode 100644
index 9f5f9c7..0000000
--- a/projects/premake/hfsm2-vs.sln
+++ /dev/null
@@ -1,188 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34330.188
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-15", "advanced_event_handling-15.vcxproj", "{F3F0D850-DF00-8521-48BA-E93F34E973BA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "advanced_event_handling-17", "advanced_event_handling-17.vcxproj", "{F5F0D850-E100-8521-4ABA-E93F36E973BA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-15", "basic_audio_player-15.vcxproj", "{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-16", "basic_audio_player-16.vcxproj", "{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_audio_player-17", "basic_audio_player-17.vcxproj", "{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-15", "basic_traffic_light-15.vcxproj", "{8FF02841-7BEA-5193-6457-E8A350F0B7FF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_traffic_light-17", "basic_traffic_light-17.vcxproj", "{91F02841-7DEA-5193-6657-E8A352F0B7FF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-15", "calculator-15.vcxproj", "{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calculator-17", "calculator-17.vcxproj", "{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-15", "debug_logger_interface-15.vcxproj", "{CE91E21A-3A54-16A5-8304-A531EF05EF82}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_logger_interface-17", "debug_logger_interface-17.vcxproj", "{D091E21A-3C54-16A5-8504-A531F105EF82}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-15", "temp-15.vcxproj", "{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-16", "temp-16.vcxproj", "{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "temp-17", "temp-17.vcxproj", "{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-15", "test-15.vcxproj", "{38901DD9-A46F-9C74-AD87-274B19E602D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-16", "test-16.vcxproj", "{39901DD9-A56F-9C74-AE87-274B1AE602D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-17", "test-17.vcxproj", "{3A901DD9-A66F-9C74-AF87-274B1BE602D6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|32 = Debug|32
-		Debug|64 = Debug|64
-		Release|32 = Release|32
-		Release|64 = Release|64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|32.ActiveCfg = Debug|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|32.Build.0 = Debug|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|64.ActiveCfg = Debug|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Debug|64.Build.0 = Debug|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|32.ActiveCfg = Release|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|32.Build.0 = Release|Win32
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|64.ActiveCfg = Release|x64
-		{F3F0D850-DF00-8521-48BA-E93F34E973BA}.Release|64.Build.0 = Release|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|32.ActiveCfg = Debug|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|32.Build.0 = Debug|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|64.ActiveCfg = Debug|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Debug|64.Build.0 = Debug|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|32.ActiveCfg = Release|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|32.Build.0 = Release|Win32
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|64.ActiveCfg = Release|x64
-		{F5F0D850-E100-8521-4ABA-E93F36E973BA}.Release|64.Build.0 = Release|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|32.ActiveCfg = Debug|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|32.Build.0 = Debug|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|64.ActiveCfg = Debug|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Debug|64.Build.0 = Debug|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|32.ActiveCfg = Release|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|32.Build.0 = Release|Win32
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|64.ActiveCfg = Release|x64
-		{D7549E75-43C1-5970-0CB5-F1CD78E07BD8}.Release|64.Build.0 = Release|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|32.ActiveCfg = Debug|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|32.Build.0 = Debug|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|64.ActiveCfg = Debug|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Debug|64.Build.0 = Debug|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|32.ActiveCfg = Release|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|32.Build.0 = Release|Win32
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|64.ActiveCfg = Release|x64
-		{D8549E75-44C1-5970-0DB5-F1CD79E07BD8}.Release|64.Build.0 = Release|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|32.ActiveCfg = Debug|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|32.Build.0 = Debug|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|64.ActiveCfg = Debug|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Debug|64.Build.0 = Debug|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|32.ActiveCfg = Release|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|32.Build.0 = Release|Win32
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|64.ActiveCfg = Release|x64
-		{D9549E75-45C1-5970-0EB5-F1CD7AE07BD8}.Release|64.Build.0 = Release|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|32.ActiveCfg = Debug|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|32.Build.0 = Debug|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|64.ActiveCfg = Debug|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Debug|64.Build.0 = Debug|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|32.ActiveCfg = Release|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|32.Build.0 = Release|Win32
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|64.ActiveCfg = Release|x64
-		{8FF02841-7BEA-5193-6457-E8A350F0B7FF}.Release|64.Build.0 = Release|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|32.ActiveCfg = Debug|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|32.Build.0 = Debug|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|64.ActiveCfg = Debug|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Debug|64.Build.0 = Debug|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|32.ActiveCfg = Release|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|32.Build.0 = Release|Win32
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|64.ActiveCfg = Release|x64
-		{91F02841-7DEA-5193-6657-E8A352F0B7FF}.Release|64.Build.0 = Release|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|32.ActiveCfg = Debug|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|32.Build.0 = Debug|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|64.ActiveCfg = Debug|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Debug|64.Build.0 = Debug|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|32.ActiveCfg = Release|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|32.Build.0 = Release|Win32
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|64.ActiveCfg = Release|x64
-		{82C649A8-EE86-C5DE-B7C1-0E5C23410ABB}.Release|64.Build.0 = Release|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|32.ActiveCfg = Debug|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|32.Build.0 = Debug|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|64.ActiveCfg = Debug|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Debug|64.Build.0 = Debug|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|32.ActiveCfg = Release|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|32.Build.0 = Release|Win32
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|64.ActiveCfg = Release|x64
-		{84C649A8-F086-C5DE-B9C1-0E5C25410ABB}.Release|64.Build.0 = Release|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|32.ActiveCfg = Debug|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|32.Build.0 = Debug|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|64.ActiveCfg = Debug|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Debug|64.Build.0 = Debug|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|32.ActiveCfg = Release|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|32.Build.0 = Release|Win32
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|64.ActiveCfg = Release|x64
-		{CE91E21A-3A54-16A5-8304-A531EF05EF82}.Release|64.Build.0 = Release|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|32.ActiveCfg = Debug|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|32.Build.0 = Debug|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|64.ActiveCfg = Debug|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Debug|64.Build.0 = Debug|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|32.ActiveCfg = Release|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|32.Build.0 = Release|Win32
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|64.ActiveCfg = Release|x64
-		{D091E21A-3C54-16A5-8504-A531F105EF82}.Release|64.Build.0 = Release|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|32.ActiveCfg = Debug|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|32.Build.0 = Debug|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|64.ActiveCfg = Debug|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Debug|64.Build.0 = Debug|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|32.ActiveCfg = Release|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|32.Build.0 = Release|Win32
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|64.ActiveCfg = Release|x64
-		{AECBAED8-1AAB-2D74-23C3-B84A8F2194D5}.Release|64.Build.0 = Release|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|32.ActiveCfg = Debug|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|32.Build.0 = Debug|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|64.ActiveCfg = Debug|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Debug|64.Build.0 = Debug|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|32.ActiveCfg = Release|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|32.Build.0 = Release|Win32
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|64.ActiveCfg = Release|x64
-		{AFCBAED8-1BAB-2D74-24C3-B84A902194D5}.Release|64.Build.0 = Release|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|32.ActiveCfg = Debug|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|32.Build.0 = Debug|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|64.ActiveCfg = Debug|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Debug|64.Build.0 = Debug|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|32.ActiveCfg = Release|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|32.Build.0 = Release|Win32
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|64.ActiveCfg = Release|x64
-		{B0CBAED8-1CAB-2D74-25C3-B84A912194D5}.Release|64.Build.0 = Release|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|32.ActiveCfg = Debug|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|32.Build.0 = Debug|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|64.ActiveCfg = Debug|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Debug|64.Build.0 = Debug|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|32.ActiveCfg = Release|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|32.Build.0 = Release|Win32
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|64.ActiveCfg = Release|x64
-		{38901DD9-A46F-9C74-AD87-274B19E602D6}.Release|64.Build.0 = Release|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|32.ActiveCfg = Debug|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|32.Build.0 = Debug|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|64.ActiveCfg = Debug|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Debug|64.Build.0 = Debug|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|32.ActiveCfg = Release|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|32.Build.0 = Release|Win32
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|64.ActiveCfg = Release|x64
-		{39901DD9-A56F-9C74-AE87-274B1AE602D6}.Release|64.Build.0 = Release|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|32.ActiveCfg = Debug|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|32.Build.0 = Debug|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|64.ActiveCfg = Debug|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Debug|64.Build.0 = Debug|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|32.ActiveCfg = Release|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|32.Build.0 = Release|Win32
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|64.ActiveCfg = Release|x64
-		{3A901DD9-A66F-9C74-AF87-274B1BE602D6}.Release|64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/projects/premake/temp-14.vcxproj b/projects/premake/temp-14.vcxproj
index b6447fd..17192d2 100644
--- a/projects/premake/temp-14.vcxproj
+++ b/projects/premake/temp-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/temp-15.vcxproj b/projects/premake/temp-15.vcxproj
index 0988d0a..d14c4a5 100644
--- a/projects/premake/temp-15.vcxproj
+++ b/projects/premake/temp-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/temp-16.vcxproj b/projects/premake/temp-16.vcxproj
index 05ec566..0ac38fb 100644
--- a/projects/premake/temp-16.vcxproj
+++ b/projects/premake/temp-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/temp-17.vcxproj b/projects/premake/temp-17.vcxproj
index 1af8b96..b915c07 100644
--- a/projects/premake/temp-17.vcxproj
+++ b/projects/premake/temp-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/temp-clang.vcxproj b/projects/premake/temp-clang.vcxproj
index 381cc95..f3d92a0 100644
--- a/projects/premake/temp-clang.vcxproj
+++ b/projects/premake/temp-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\temp-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\temp-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\temp-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\temp-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/test-14.vcxproj b/projects/premake/test-14.vcxproj
index 65cb5ea..0fbd80b 100644
--- a/projects/premake/test-14.vcxproj
+++ b/projects/premake/test-14.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-14\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/test-15.vcxproj b/projects/premake/test-15.vcxproj
index ada7e54..7a7a612 100644
--- a/projects/premake/test-15.vcxproj
+++ b/projects/premake/test-15.vcxproj
@@ -84,28 +84,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-15\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/test-16.vcxproj b/projects/premake/test-16.vcxproj
index a64ee1b..25d5328 100644
--- a/projects/premake/test-16.vcxproj
+++ b/projects/premake/test-16.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-16\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/test-17.vcxproj b/projects/premake/test-17.vcxproj
index f65b9f6..d8ccf30 100644
--- a/projects/premake/test-17.vcxproj
+++ b/projects/premake/test-17.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-17\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/projects/premake/test-clang.vcxproj b/projects/premake/test-clang.vcxproj
index 73b90b3..373c074 100644
--- a/projects/premake/test-clang.vcxproj
+++ b/projects/premake/test-clang.vcxproj
@@ -72,28 +72,28 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Debug\test-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Debug\test-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x86\Release\test-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\binaries\</OutDir>
     <IntDir>$(BUILD_ROOT)\$(SolutionName)-$(PlatformArchitecture)\$(ProjectName)-$(Configuration)\x64\Release\test-clang\</IntDir>
-    <TargetName>$(ProjectName)-$(Configuration)-$(PlatformArchitecture)</TargetName>
+    <TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/test/wiki_plans.cpp b/test/wiki_plans.cpp
index 61bfb92..b64b1d9 100644
--- a/test/wiki_plans.cpp
+++ b/test/wiki_plans.cpp
@@ -19,27 +19,20 @@ TEST_CASE("Wiki.Plans.Traffic Light") {
 
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-    struct Apex
-        : FSM::State
-    {
+    struct Apex   : FSM::State {};
+
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+    struct Red    : FSM::State {
         void enter(PlanControl& control) {
-            // create an empty plan
             auto plan = control.plan();
 
-            // 'Red' will be implicitly activated as an initial substate
-            // of the composite root region
-            //
-            // loop yellow -> green -> yellow -> red
             plan.change<Red, Yellow>();
             plan.change<Yellow, Green>();
             plan.change<Green, Yellow>();
             plan.change<Yellow, Red>();
         }
-    };
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-    struct Red    : FSM::State {
         void update(FullControl& control) { control.succeed(); }
     };
 
@@ -68,6 +61,15 @@ TEST_CASE("Wiki.Plans.Traffic Light") {
 
     fsm.update();
     REQUIRE(fsm.isActive<Red>());
+
+    fsm.update();
+    REQUIRE(fsm.isActive<Yellow>());
+
+    fsm.update();
+    REQUIRE(fsm.isActive<Green>());
+
+    fsm.update();
+    REQUIRE(fsm.isActive<Yellow>());
 }
 
 ////////////////////////////////////////////////////////////////////////////////