diff --git a/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp b/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp
index a71a7b6d60005c62404df018bfde0d92a2160c47..9de2e674a8d0944c21bac612924ff8dcdba36037 100644
--- a/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp
+++ b/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp
@@ -6,7 +6,7 @@
 #include "NDisplayLaunchButtonCommands.h"
 #include "Misc/MessageDialog.h"
 #include "Framework/MultiBox/MultiBoxBuilder.h"
-#include "IPluginManager.h"
+#include "Interfaces/IPluginManager.h"
 #include "Misc/EngineVersion.h"
 #include "Networking.h"
 #include "SocketHelper.h"
@@ -46,7 +46,7 @@ void FNDisplayLaunchButtonModule::ShutdownModule()
 void FNDisplayLaunchButtonModule::PluginButtonClicked()
 {
 	const UNDisplayLaunchButtonSettings* Settings = GetDefault<UNDisplayLaunchButtonSettings>();
-	if (Settings->LaunchType == NONE)
+	if (Settings->LaunchType == ButtonLaunchType_NONE)
 	{
 		GEngine->AddOnScreenDebugMessage(-1, 3, FColor::White, TEXT("The Button is set to do nothing."));
 		return;
@@ -58,7 +58,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
 	TSharedPtr<SWindow> RootWindow = FGlobalTabmanager::Get()->GetRootWindow();
 	if (RootWindow.IsValid()) RootWindow->Minimize();
 	
-	if (Settings->LaunchType == ROLV)
+	if (Settings->LaunchType == ButtonLaunchType_ROLV)
 	{
 		FString EditorExecutable = "UE4Editor.exe";
 		FString Parameters = "\"" + FPaths::GetProjectFilePath() + "\" -game dc_cfg=\"" + Settings->RolvConfig.FilePath + "\"" + ((Settings->ROLVLogToProjectDir) ? ("-log ABSLOG=" + FPaths::ProjectDir() + "\\ROLV_Launch.log") : "");
@@ -78,7 +78,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
 		if (Settings->SwitchProjector && ModeFromBefore != DisplayType_Error) SwitchProjectorToState(Settings->ProjectorIP, Settings->ProjectorPort, ModeFromBefore);
 	}
 
-	if (Settings->LaunchType == MiniCAVE)
+	if (Settings->LaunchType == ButtonLaunchType_MiniCAVE)
 	{
 		FString Config = IPluginManager::Get().FindPlugin("CAVELaunchButton")->GetBaseDir() + "/LaunchConfig/minicave.cfg";
 		FString EditorExecutable = "UE4Editor.exe";
@@ -101,7 +101,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
 		FPlatformProcess::WaitForProc(Processes[Num_Nodes - 1]); //wait for only one of them
 	}
 
-	if (Settings->LaunchType == CAVE)
+	if (Settings->LaunchType == ButtonLaunchType_CAVE)
 	{
 		FProcHandle Instance = FPlatformProcess::CreateProc(
 			*Settings->CAVELaunchScriptPath.FilePath,
diff --git a/Source/NDisplayLaunchButton/Private/SocketHelper.h b/Source/NDisplayLaunchButton/Private/SocketHelper.h
index 1384bff0058bafbbffd75a6ce7a29e9c6aee6355..73335e9de6bc592918f2ec825ab55ba8d8934587 100644
--- a/Source/NDisplayLaunchButton/Private/SocketHelper.h
+++ b/Source/NDisplayLaunchButton/Private/SocketHelper.h
@@ -3,9 +3,10 @@
 
 #include "CoreMinimal.h"
 #include "Sockets.h"
-#include "IPv4Address.h"
-#include "IPv4Endpoint.h"
-#include "TcpSocketBuilder.h"
+#include "Interfaces/IPv4/IPv4Address.h"
+#include "Interfaces/IPv4/IPv4Endpoint.h"
+#include "Common/TcpSocketBuilder.h"
+#include "Logging/LogMacros.h"
 #include "SocketHelper.generated.h"
 
 DECLARE_LOG_CATEGORY_CLASS(LogNDisplayLaunchButtonSockerHelper, Log, All);
diff --git a/Source/NDisplayLaunchButton/Public/NDisplayLaunchButton.h b/Source/NDisplayLaunchButton/Public/NDisplayLaunchButton.h
index 5a228c57b93d0d1b5532851472f63590346dab31..f23187186584483a8b8659954c52891ecfc35c9f 100644
--- a/Source/NDisplayLaunchButton/Public/NDisplayLaunchButton.h
+++ b/Source/NDisplayLaunchButton/Public/NDisplayLaunchButton.h
@@ -5,7 +5,7 @@
 #include "CoreMinimal.h"
 #include "Modules/ModuleManager.h"
 #include "NDisplayLaunchButtonSettings.h"
-#include "LogMacros.h"
+#include "Logging/LogMacros.h"
 #include "Framework/MultiBox/MultiBoxBuilder.h"
 
 class FToolBarBuilder;
diff --git a/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h b/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h
index 160ed3c29f7e00ce0b0c02542f69a27e7ec2f9e5..536bed6a052447450a73da81f08c119a44f60aa3 100644
--- a/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h
+++ b/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h
@@ -17,10 +17,10 @@ enum ProjectorDisplayType
 UENUM(BlueprintType)
 enum ButtonLaunchType
 {
-	NONE UMETA(DisplayName = "Nothing"),
-	MiniCAVE UMETA(DisplayName = "MiniCAVE"),
-	CAVE UMETA(DisplayName = "CAVE"),
-	ROLV UMETA(DisplayName = "ROLV")
+	ButtonLaunchType_NONE UMETA(DisplayName = "Nothing"),
+	ButtonLaunchType_MiniCAVE UMETA(DisplayName = "MiniCAVE"),
+	ButtonLaunchType_CAVE UMETA(DisplayName = "CAVE"),
+	ButtonLaunchType_ROLV UMETA(DisplayName = "ROLV")
 };
 
 UCLASS(config=Engine, defaultconfig, meta=(DisplayName="nDisplay Launch Button"))
@@ -90,26 +90,26 @@ public:
 
 		//TODO: This Code is not executed for all FFilePath Properties. Check if this works in 4.23 with the EditCondition Parser and remove this method
 		
-		PROPERTY_CONDITION_CHECK(MiniCAVELaunchParameters, LaunchType == MiniCAVE)
-		PROPERTY_CONDITION_CHECK(MiniCAVEAdditionalLaunchParametersMaster, LaunchType == MiniCAVE)
-		PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDir, LaunchType == MiniCAVE)
+		PROPERTY_CONDITION_CHECK(MiniCAVELaunchParameters, LaunchType == ButtonLaunchType_MiniCAVE)
+		PROPERTY_CONDITION_CHECK(MiniCAVEAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_MiniCAVE)
+		PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDir, LaunchType == ButtonLaunchType_MiniCAVE)
 		
-		PROPERTY_CONDITION_CHECK(CAVELaunchScriptPath, LaunchType == CAVE)
+		PROPERTY_CONDITION_CHECK(CAVELaunchScriptPath, LaunchType == ButtonLaunchType_CAVE)
 		
-		PROPERTY_CONDITION_CHECK(RolvConfig, LaunchType == ROLV)
-		PROPERTY_CONDITION_CHECK(ROLVLaunchParameters, LaunchType == ROLV)
-		PROPERTY_CONDITION_CHECK(ROLVLogToProjectDir, LaunchType == ROLV)
-		PROPERTY_CONDITION_CHECK(SwitchProjector, LaunchType == ROLV)
-		PROPERTY_CONDITION_CHECK(ProjectorType, LaunchType == ROLV && SwitchProjector)
-		PROPERTY_CONDITION_CHECK(ProjectorIP, LaunchType == ROLV && SwitchProjector)
-		PROPERTY_CONDITION_CHECK(ProjectorPort, LaunchType == ROLV && SwitchProjector)
-		PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ROLV && StartVRPN)
-		PROPERTY_CONDITION_CHECK(StartVRPN, LaunchType == ROLV)
-		PROPERTY_CONDITION_CHECK(VRPNPath, LaunchType == ROLV && StartVRPN)
-		PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ROLV && StartVRPN)
-		PROPERTY_CONDITION_CHECK(StartDTrack, LaunchType == ROLV)
-		PROPERTY_CONDITION_CHECK(DTrackIP, LaunchType == ROLV && StartDTrack)
-		PROPERTY_CONDITION_CHECK(DTrackPort, LaunchType == ROLV && StartDTrack)
+		PROPERTY_CONDITION_CHECK(RolvConfig, LaunchType == ButtonLaunchType_ROLV)
+		PROPERTY_CONDITION_CHECK(ROLVLaunchParameters, LaunchType == ButtonLaunchType_ROLV)
+		PROPERTY_CONDITION_CHECK(ROLVLogToProjectDir, LaunchType == ButtonLaunchType_ROLV)
+		PROPERTY_CONDITION_CHECK(SwitchProjector, LaunchType == ButtonLaunchType_ROLV)
+		PROPERTY_CONDITION_CHECK(ProjectorType, LaunchType == ButtonLaunchType_ROLV && SwitchProjector)
+		PROPERTY_CONDITION_CHECK(ProjectorIP, LaunchType == ButtonLaunchType_ROLV && SwitchProjector)
+		PROPERTY_CONDITION_CHECK(ProjectorPort, LaunchType == ButtonLaunchType_ROLV && SwitchProjector)
+		PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ButtonLaunchType_ROLV && StartVRPN)
+		PROPERTY_CONDITION_CHECK(StartVRPN, LaunchType == ButtonLaunchType_ROLV)
+		PROPERTY_CONDITION_CHECK(VRPNPath, LaunchType == ButtonLaunchType_ROLV && StartVRPN)
+		PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ButtonLaunchType_ROLV && StartVRPN)
+		PROPERTY_CONDITION_CHECK(StartDTrack, LaunchType == ButtonLaunchType_ROLV)
+		PROPERTY_CONDITION_CHECK(DTrackIP, LaunchType == ButtonLaunchType_ROLV && StartDTrack)
+		PROPERTY_CONDITION_CHECK(DTrackPort, LaunchType == ButtonLaunchType_ROLV && StartDTrack)
 		
 		return ParentVal;
 	}