diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index ce1ea83232..78abfba048 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -60,10 +60,10 @@
     <Compile Include="Src\Services\Debugger\BreakpointBookmarkEventArgs.cs" />
     <Compile Include="Src\Services\File\RecentOpen.cs" />
     <Compile Include="Src\Services\Language\LanguageService.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\WindowActiveAuswerter.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\ProjectOpenAuswerter.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\WindowActiveEvaluator.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\ProjectOpenEvaluator.cs" />
     <Compile Include="Src\Internal\Doozers\DefaultDialogPanelDescriptor.cs" />
-    <Compile Include="Src\Internal\Doozers\DialogPanelErbauer.cs" />
+    <Compile Include="Src\Internal\Doozers\DialogPanelDoozer.cs" />
     <Compile Include="Src\Internal\Doozers\IDialogPanel.cs" />
     <Compile Include="Src\Internal\Doozers\IDialogPanelDescriptor.cs" />
     <Compile Include="Src\Services\File\FileService.cs" />
@@ -100,12 +100,12 @@
     <Compile Include="Src\Dom\Implementations\AbstractReturnType.cs" />
     <Compile Include="Src\Dom\Implementations\DefaultCompilationUnit.cs" />
     <Compile Include="Src\Services\ParserService\ParserService.cs" />
-    <Compile Include="Src\Services\DisplayBinding\DisplayBindingErbauer.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\CombineOpenAuswerter.cs" />
-    <Compile Include="Src\Services\LanguageBinding\LanguageBindingErbauer.cs" />
+    <Compile Include="Src\Services\DisplayBinding\DisplayBindingDoozer.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\CombineOpenEvaluator.cs" />
+    <Compile Include="Src\Services\LanguageBinding\LanguageBindingDoozer.cs" />
     <Compile Include="Src\Services\Language\Language.cs" />
     <Compile Include="Src\Services\DisplayBinding\DisplayBindingService.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\ProjectActiveAuswerter.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\ProjectActiveEvaluator.cs" />
     <Compile Include="Src\Dom\IUsing.cs" />
     <Compile Include="Src\Dom\ModifierEnum.cs" />
     <Compile Include="Src\Dom\IDecoration.cs" />
@@ -132,7 +132,7 @@
     <Compile Include="Src\Services\ParserService\AssemblyInformation.cs" />
     <Compile Include="Src\Services\AmbienceService\AmbienceService.cs" />
     <Compile Include="Src\Services\AmbienceService\CodeDOMGeneratorUtility.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\WindowOpenAuswerter.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\WindowOpenEvaluator.cs" />
     <Compile Include="Src\Internal\Templates\Project\ProjectDescriptor.cs" />
     <Compile Include="Src\Internal\Templates\Project\CombineDescriptor.cs" />
     <Compile Include="Src\Gui\IProgressMonitor.cs" />
@@ -314,7 +314,7 @@
     <Compile Include="Src\Commands\CustomStringTagProvider.cs" />
     <Compile Include="Src\Internal\Templates\CodeTemplateGroup.cs" />
     <Compile Include="Src\Commands\VBConverter\CSharpConvertBuffer.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\ActiveViewContentUntitledAuswerter.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\ActiveViewContentUntitledEvaluator.cs" />
     <Compile Include="Src\Services\Debugger\DebuggerService.cs" />
     <Compile Include="Src\Gui\Pads\CompilerMessageView\CompilerMessageView.cs" />
     <Compile Include="Src\Gui\ContentInterfaces\IHelpProvider.cs" />
@@ -328,8 +328,8 @@
     <Compile Include="Src\Internal\Templates\StandardHeaders.cs" />
     <Compile Include="Src\Gui\Components\LocalizedPropertyGrid\LocalizedProperty.cs" />
     <Compile Include="Src\Dom\IExpressionFinder.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\IsProcessRunningAuswerter.cs" />
-    <Compile Include="Src\Internal\Doozers\PadErbauer.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\IsProcessRunningEvaluator.cs" />
+    <Compile Include="Src\Internal\Doozers\PadDoozer.cs" />
     <Compile Include="Src\Gui\Dialogs\InputBox.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -338,15 +338,15 @@
     <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptions.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Src\Internal\ConditionEvaluators\ActiveContentExtensionAuswerter.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\ActiveContentExtensionEvaluator.cs" />
     <Compile Include="Src\Gui\ContentInterfaces\IViewContentMemento.cs" />
     <Compile Include="Src\Commands\ChooseConfigurationCommand.cs" />
     <Compile Include="Src\Gui\Workbench\ViewContentEventHandler.cs" />
     <Compile Include="Src\Services\Debugger\IDebugger.cs" />
     <Compile Include="Src\Services\Debugger\DefaultDebugger.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\ActiveWindowStateAuswerter.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\OpenWindowStateAuswerter.cs" />
-    <Compile Include="Src\Internal\ConditionEvaluators\DebuggerSupportsAuswerter.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\ActiveWindowStateEvaluator.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\OpenWindowStateEvaluator.cs" />
+    <Compile Include="Src\Internal\ConditionEvaluators\DebuggerSupportsEvaluator.cs" />
     <Compile Include="Src\Commands\ChooseLayoutCommand.cs" />
     <Compile Include="Src\Gui\Workbench\Layouts\LayoutConfiguration.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanel.cs">
@@ -404,7 +404,7 @@
     <Compile Include="Src\Services\LanguageBinding\LanguageBindingDescriptor.cs" />
     <Compile Include="Src\Services\DisplayBinding\DisplayBindingDescriptor.cs" />
     <Compile Include="Src\Dom\FoldingRegion.cs" />
-    <Compile Include="Src\Services\ParserService\Doozer\ParserErbauer.cs" />
+    <Compile Include="Src\Services\ParserService\Doozer\ParserDoozer.cs" />
     <Compile Include="Src\Services\ParserService\Doozer\ParserDescriptor.cs" />
     <Compile Include="Src\Gui\XmlForms\Lib\IPropertyValueCreator.cs" />
     <Compile Include="Src\Gui\XmlForms\Lib\IStringValueFilter.cs" />
@@ -508,8 +508,8 @@
     <Compile Include="Src\TextEditor\Bookmarks\BookmarkEventHandler.cs" />
     <Compile Include="Src\TextEditor\Bookmarks\BookmarkManager.cs" />
     <Compile Include="Src\TextEditor\Codons\AddInTreeSyntaxModeProvider.cs" />
-    <Compile Include="Src\TextEditor\Codons\EditActionErbauer.cs" />
-    <Compile Include="Src\TextEditor\Codons\SyntaxModeErbauer.cs" />
+    <Compile Include="Src\TextEditor\Codons\EditActionDoozer.cs" />
+    <Compile Include="Src\TextEditor\Codons\SyntaxModeDoozer.cs" />
     <Compile Include="Src\TextEditor\Commands\CodeGenerators\AbstractClassImplementorCodeGenerator.cs" />
     <Compile Include="Src\TextEditor\Commands\CodeGenerators\AbstractFieldCodeGenerator.cs" />
     <Compile Include="Src\TextEditor\Commands\CodeGenerators\AbstractPropertyCodeGenerator.cs" />
@@ -703,4 +703,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveContentExtensionAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveContentExtensionEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveContentExtensionAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveContentExtensionEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveViewContentUntitledAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveViewContentUntitledEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveViewContentUntitledAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveViewContentUntitledEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/CombineOpenAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/CombineOpenEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/CombineOpenAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/CombineOpenEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/DebuggerSupportsEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/IsProcessRunningEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectActiveAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectActiveEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectActiveAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectActiveEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectOpenAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectOpenEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectOpenAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/ProjectOpenEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowActiveAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowActiveEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowActiveAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowActiveEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenAuswerter.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenAuswerter.cs
rename to src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
diff --git a/src/Main/Base/Project/Src/Internal/Doozers/DialogPanelErbauer.cs b/src/Main/Base/Project/Src/Internal/Doozers/DialogPanelDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/Doozers/DialogPanelErbauer.cs
rename to src/Main/Base/Project/Src/Internal/Doozers/DialogPanelDoozer.cs
diff --git a/src/Main/Base/Project/Src/Internal/Doozers/PadErbauer.cs b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Internal/Doozers/PadErbauer.cs
rename to src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
diff --git a/src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingErbauer.cs b/src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingErbauer.cs
rename to src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingDoozer.cs
diff --git a/src/Main/Base/Project/Src/Services/LanguageBinding/LanguageBindingErbauer.cs b/src/Main/Base/Project/Src/Services/LanguageBinding/LanguageBindingDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Services/LanguageBinding/LanguageBindingErbauer.cs
rename to src/Main/Base/Project/Src/Services/LanguageBinding/LanguageBindingDoozer.cs
diff --git a/src/Main/Base/Project/Src/Services/ParserService/Doozer/ParserErbauer.cs b/src/Main/Base/Project/Src/Services/ParserService/Doozer/ParserDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/Services/ParserService/Doozer/ParserErbauer.cs
rename to src/Main/Base/Project/Src/Services/ParserService/Doozer/ParserDoozer.cs
diff --git a/src/Main/Base/Project/Src/TextEditor/Codons/EditActionErbauer.cs b/src/Main/Base/Project/Src/TextEditor/Codons/EditActionDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/TextEditor/Codons/EditActionErbauer.cs
rename to src/Main/Base/Project/Src/TextEditor/Codons/EditActionDoozer.cs
diff --git a/src/Main/Base/Project/Src/TextEditor/Codons/SyntaxModeErbauer.cs b/src/Main/Base/Project/Src/TextEditor/Codons/SyntaxModeDoozer.cs
similarity index 100%
rename from src/Main/Base/Project/Src/TextEditor/Codons/SyntaxModeErbauer.cs
rename to src/Main/Base/Project/Src/TextEditor/Codons/SyntaxModeDoozer.cs
diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj
index 063f3fce72..d154ea39ac 100644
--- a/src/Main/Core/Project/ICSharpCode.Core.csproj
+++ b/src/Main/Core/Project/ICSharpCode.Core.csproj
@@ -46,18 +46,18 @@
     <Compile Include="Src\AddInTree\AddIn\ComplexCondition.cs" />
     <Compile Include="Src\AddInTree\AddIn\Condition.cs" />
     <Compile Include="Src\AddInTree\AddIn\ExtensionPath.cs" />
-    <Compile Include="Src\AddInTree\AddIn\IAuswerter.cs" />
+    <Compile Include="Src\AddInTree\AddIn\IConditionEvaluator.cs" />
     <Compile Include="Src\AddInTree\AddIn\ICondition.cs" />
-    <Compile Include="Src\AddInTree\AddIn\IErbauer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\IDoozer.cs" />
     <Compile Include="Src\AddInTree\AddIn\Runtime.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultConditionEvaluators\CompareAuswerter.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultConditionEvaluators\LazyLoadAuswerter.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultConditionEvaluators\OwnerStateAuswerter.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ClassErbauer.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\FileFilterErbauer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultConditionEvaluators\CompareConditionEvaluator.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultConditionEvaluators\LazyConditionEvaluator.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultConditionEvaluators\OwnerStateConditionEvaluator.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ClassDoozer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\FileFilterDoozer.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Icon\IconDescriptor.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Icon\IconErbauer.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\LazyLoaderErbauer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Icon\IconDoozer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\LazyDoozer.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\AbstractCheckableMenuCommand.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\AbstractMenuCommand.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\Gui\IStatusUpdate.cs" />
@@ -76,7 +76,7 @@
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\ICheckableMenuCommand.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\IMenuCommand.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\ISubmenuBuilder.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\MenuItemErbauer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\MenuItemDoozer.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ToolBarItem\AbstractComboBoxCommand.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ToolBarItem\Gui\ToolBarCheckBox.cs">
       <SubType>Component</SubType>
@@ -94,7 +94,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ToolBarItem\IComboBoxCommand.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ToolBarItem\ToolBarItemErbauer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ToolBarItem\ToolBarItemDoozer.cs" />
     <Compile Include="Src\AddInTree\AddInTree.cs" />
     <Compile Include="Src\AddInTree\AddInTreeNode.cs" />
     <Compile Include="Src\AddInTree\TreePathNotFoundException.cs" />
@@ -127,7 +127,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Src\AddInTree\AddIn\IBuildItemsModifier.cs" />
-    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\IncludeErbauer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\IncludeDoozer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/CompareAuswerter.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/CompareConditionEvaluator.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/CompareAuswerter.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/CompareConditionEvaluator.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/LazyLoadAuswerter.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/LazyConditionEvaluator.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/LazyLoadAuswerter.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/LazyConditionEvaluator.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/OwnerStateAuswerter.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/OwnerStateConditionEvaluator.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/OwnerStateAuswerter.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultConditionEvaluators/OwnerStateConditionEvaluator.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ClassErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ClassDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ClassErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ClassDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/FileFilterErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/FileFilterDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/FileFilterErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/FileFilterDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Icon/IconErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Icon/IconDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Icon/IconErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Icon/IconDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/LazyLoaderErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/LazyDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/LazyLoaderErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/LazyDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/ToolBarItemErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/ToolBarItemDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/ToolBarItemErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/ToolBarItemDoozer.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/IAuswerter.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/IConditionEvaluator.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/IAuswerter.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/IConditionEvaluator.cs
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/IErbauer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/IDoozer.cs
similarity index 100%
rename from src/Main/Core/Project/Src/AddInTree/AddIn/IErbauer.cs
rename to src/Main/Core/Project/Src/AddInTree/AddIn/IDoozer.cs