diff --git a/definitions/Definitions.cpp b/definitions/Definitions.cpp
index bf650b59..bc0b10ea 100644
--- a/definitions/Definitions.cpp
+++ b/definitions/Definitions.cpp
@@ -38,7 +38,7 @@
 #include <interfaces/IDeviceInfo.h>
 #include <interfaces/IDictionary.h>
 #include <interfaces/IDisplayInfo.h>
-#include <interfaces/IDialServer.h>
+#include <interfaces/IDIALServer.h>
 #include <interfaces/IDNSServer.h>
 #include <interfaces/IDolby.h>
 #include <interfaces/IDRM.h>
@@ -50,7 +50,7 @@
 #include <interfaces/IInputSwitch.h>
 #include <interfaces/IIPNetwork.h>
 #include <interfaces/IKeyHandler.h>
-#include <interfaces/ILisa.h>
+#include <interfaces/ILISA.h>
 #include <interfaces/ILanguageTag.h>
 #include <interfaces/IMath.h>
 #include <interfaces/IMemory.h>
diff --git a/example_interfaces/Module.h b/example_interfaces/Module.h
index 0a879fbd..39404c74 100644
--- a/example_interfaces/Module.h
+++ b/example_interfaces/Module.h
@@ -25,10 +25,10 @@
 
 #include <core/core.h>
 
-#include <plugins/IPlugin.h>
-#include <plugins/ISubSystem.h>
-#include <plugins/IShell.h>
-#include <plugins/IStateControl.h>
+#include <interfaces/IPlugin.h>
+#include <interfaces/ISubSystem.h>
+#include <interfaces/IShell.h>
+#include <interfaces/IStateControl.h>
 
 #include "ExampleIds.h"
 
diff --git a/interfaces/IButler.h b/interfaces/IButler.h
index 4dd2c6a3..eb2db6e0 100644
--- a/interfaces/IButler.h
+++ b/interfaces/IButler.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "Module.h"
-#include <plugins/IShell.h>
+#include <interfaces/IShell.h>
 #include <interfaces/IValuePoint.h>
 
 // @stubgen:include "IValuePoint.h"
diff --git a/interfaces/ISubsystemControl.h b/interfaces/ISubsystemControl.h
index 49154479..cb0da62f 100644
--- a/interfaces/ISubsystemControl.h
+++ b/interfaces/ISubsystemControl.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-// @stubgen:include <plugins/ISubSystem.h>
+// @stubgen:include <interfaces/ISubSystem.h>
 
 namespace Thunder {
 
diff --git a/interfaces/Interfaces.vcxproj b/interfaces/Interfaces.vcxproj
index 9c04b569..4303a67f 100644
--- a/interfaces/Interfaces.vcxproj
+++ b/interfaces/Interfaces.vcxproj
@@ -272,7 +272,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(ProjectDir) -I $(FrameworkPath) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
@@ -304,7 +304,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(ProjectDir) -I $(FrameworkPath) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
@@ -336,7 +336,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(ProjectDir) -I $(FrameworkPath) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
@@ -372,7 +372,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(ProjectDir) -I $(FrameworkPath) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
diff --git a/interfaces/Module.h b/interfaces/Module.h
index 7420bd34..2c023f99 100644
--- a/interfaces/Module.h
+++ b/interfaces/Module.h
@@ -27,10 +27,10 @@
 
 // These are interfaces offered by Thunder and used in the Plugins. Make them
 // available on interfaces that are exposed cross plugins.
-#include <plugins/IPlugin.h>
-#include <plugins/ISubSystem.h>
-#include <plugins/IShell.h>
-#include <plugins/IStateControl.h>
+#include <interfaces/IPlugin.h>
+#include <interfaces/ISubSystem.h>
+#include <interfaces/IShell.h>
+#include <interfaces/IStateControl.h>
 
 // All identifiers to identify an interface are allocated in this same directory
 // in the file calls Ids.h, please extend it with your requried interface number
diff --git a/qa_interfaces/Module.h b/qa_interfaces/Module.h
index 18c0d45e..b836ddc6 100644
--- a/qa_interfaces/Module.h
+++ b/qa_interfaces/Module.h
@@ -27,10 +27,10 @@
 
 // These are interfaces offered by Thunder and used in the Plugins. Make them
 // available on interfaces that are exposed cross plugins.
-#include <plugins/IPlugin.h>
-#include <plugins/ISubSystem.h>
-#include <plugins/IShell.h>
-#include <plugins/IStateControl.h>
+#include <interfaces/IPlugin.h>
+#include <interfaces/ISubSystem.h>
+#include <interfaces/IShell.h>
+#include <interfaces/IStateControl.h>
 
 // All identifiers to identify a QA interface are allocated in this same directory
 // in the file calls Ids.h, please extend it with your required interface number