diff --git a/CodeAnalysis.ruleset b/CodeAnalysis.ruleset
index f0ee557e..efd50562 100644
--- a/CodeAnalysis.ruleset
+++ b/CodeAnalysis.ruleset
@@ -236,12 +236,10 @@
     <Rule Id="CA5122" Action="Error" />
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <Rule Id="SA1625" Action="None" />
+    <Rule Id="SA1611" Action="None" />
     <Rule Id="SA1615" Action="None" />
     <Rule Id="SA1637" Action="None" />
-    <Rule Id="SA1649" Action="None" />
-    <Rule Id="SA1611" Action="None" />
-    <Rule Id="SA1648" Action="None" />
     <Rule Id="SA1640" Action="None" />
+    <Rule Id="SA1648" Action="None" />
   </Rules>
 </RuleSet>
\ No newline at end of file
diff --git a/Lawo.EmberPlusSharp/Ember/FieldPath.cs b/Lawo.EmberPlusSharp/Ember/FieldPath`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Ember/FieldPath.cs
rename to Lawo.EmberPlusSharp/Ember/FieldPath`2.cs
diff --git a/Lawo.EmberPlusSharp/Ember/Field.cs b/Lawo.EmberPlusSharp/Ember/Field`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Ember/Field.cs
rename to Lawo.EmberPlusSharp/Ember/Field`2.cs
diff --git a/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj b/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj
index c58779f1..d4a4ff24 100644
--- a/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj
+++ b/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj
@@ -68,8 +68,8 @@
     <Compile Include="Ember\EmberWriter.cs" />
     <Compile Include="Ember\Class.cs" />
     <Compile Include="Ember\Constants.cs" />
-    <Compile Include="Ember\Field.cs" />
-    <Compile Include="Ember\FieldPath.cs" />
+    <Compile Include="Ember\Field`2.cs" />
+    <Compile Include="Ember\FieldPath`2.cs" />
     <Compile Include="Ember\IEmberConverter.cs" />
     <Compile Include="Ember\InnerNumber.cs" />
     <Compile Include="Ember\EmberId.cs" />
@@ -98,23 +98,23 @@
     <Compile Include="Glow\GlowTypes.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Model\ChildrenRetrievalPolicy.cs" />
-    <Compile Include="Model\ElementWithSchemas.cs" />
-    <Compile Include="Model\Function.cs" />
-    <Compile Include="Model\Function1.cs" />
-    <Compile Include="Model\Function3.cs" />
-    <Compile Include="Model\Function5.cs" />
-    <Compile Include="Model\Function6.cs" />
-    <Compile Include="Model\Function4.cs" />
-    <Compile Include="Model\Function2.cs" />
+    <Compile Include="Model\ElementWithSchemas`1.cs" />
+    <Compile Include="Model\Function`1.cs" />
+    <Compile Include="Model\Function`2.cs" />
+    <Compile Include="Model\Function`4.cs" />
+    <Compile Include="Model\Function`6.cs" />
+    <Compile Include="Model\Function`7.cs" />
+    <Compile Include="Model\Function`5.cs" />
+    <Compile Include="Model\Function`3.cs" />
     <Compile Include="Model\InvocationCollection.cs" />
     <Compile Include="Model\IStreamedParameter.cs" />
     <Compile Include="Model\IStreamedParameterCollection.cs" />
     <Compile Include="Model\RetrievalState.cs" />
-    <Compile Include="Model\DynamicRoot.cs" />
+    <Compile Include="Model\DynamicRoot`1.cs" />
     <Compile Include="Model\DynamicNodeHelper.cs" />
     <Compile Include="Model\DynamicNode.cs" />
-    <Compile Include="Model\DynamicFieldNode.cs" />
-    <Compile Include="Model\DynamicNodeBase.cs" />
+    <Compile Include="Model\DynamicFieldNode`1.cs" />
+    <Compile Include="Model\DynamicNodeBase`1.cs" />
     <Compile Include="Model\DynamicParameter.cs" />
     <Compile Include="Model\IElementWithSchemas.cs" />
     <Compile Include="Model\IFunction.cs" />
@@ -126,38 +126,38 @@
     <Compile Include="Model\RetrieveDetailsChangeStatus.cs" />
     <Compile Include="Model\IValueReader.cs" />
     <Compile Include="Model\MatrixAddressingMode.cs" />
-    <Compile Include="Model\MatrixParameters.cs" />
+    <Compile Include="Model\MatrixParameters`3.cs" />
     <Compile Include="Model\MatrixLabels.cs" />
-    <Compile Include="Model\NodeBase.cs" />
-    <Compile Include="Model\NullableEnumParameter.cs" />
-    <Compile Include="Model\EnumParameterImpl.cs" />
-    <Compile Include="Model\EnumParameter.cs" />
+    <Compile Include="Model\NodeBase`1.cs" />
+    <Compile Include="Model\NullableEnumParameter`1.cs" />
+    <Compile Include="Model\EnumParameterImpl`1.cs" />
+    <Compile Include="Model\EnumParameter`1.cs" />
     <Compile Include="Model\NullableStringParameter.cs" />
     <Compile Include="Model\NullableOctetstringParameter.cs" />
     <Compile Include="Model\NullableRealParameter.cs" />
     <Compile Include="Model\NullableIntegerParameter.cs" />
     <Compile Include="Model\NullableBooleanParameter.cs" />
-    <Compile Include="Model\NullableNumericParameter.cs" />
-    <Compile Include="Model\FunctionBase.cs" />
+    <Compile Include="Model\NullableNumericParameter`2.cs" />
+    <Compile Include="Model\FunctionBase`1.cs" />
     <Compile Include="Model\DynamicFunction.cs" />
     <Compile Include="Model\DynamicResult.cs" />
-    <Compile Include="Model\Matrix.cs" />
+    <Compile Include="Model\Matrix`3.cs" />
     <Compile Include="Model\MatrixType.cs" />
-    <Compile Include="Model\Result5.cs" />
-    <Compile Include="Model\Result6.cs" />
+    <Compile Include="Model\Result`5.cs" />
+    <Compile Include="Model\Result`6.cs" />
     <Compile Include="Model\ShadowNode.cs" />
-    <Compile Include="Model\StaticFunction.cs" />
-    <Compile Include="Model\Result2.cs" />
-    <Compile Include="Model\Result3.cs" />
-    <Compile Include="Model\Result4.cs" />
-    <Compile Include="Model\Result1.cs" />
+    <Compile Include="Model\StaticFunction`1.cs" />
+    <Compile Include="Model\Result`2.cs" />
+    <Compile Include="Model\Result`3.cs" />
+    <Compile Include="Model\Result`4.cs" />
+    <Compile Include="Model\Result`1.cs" />
     <Compile Include="Model\Result.cs" />
-    <Compile Include="Model\ResultBase.cs" />
+    <Compile Include="Model\ResultBase`1.cs" />
     <Compile Include="Model\StreamedParameterCollection.cs" />
-    <Compile Include="Model\ValueParameter.cs" />
-    <Compile Include="Model\ReferenceParameter.cs" />
-    <Compile Include="Model\NullableParameter.cs" />
-    <Compile Include="Model\ParameterBase.cs" />
+    <Compile Include="Model\ValueParameter`2.cs" />
+    <Compile Include="Model\ReferenceParameter`2.cs" />
+    <Compile Include="Model\NullableParameter`2.cs" />
+    <Compile Include="Model\ParameterBase`2.cs" />
     <Compile Include="Model\ElementType.cs" />
     <Compile Include="Model\EmberReaderExtensions.cs" />
     <Compile Include="Model\BooleanParameter.cs" />
@@ -177,39 +177,39 @@
     <Compile Include="Glow\GlowElementCollection.cs" />
     <Compile Include="Glow\GlowNode.cs" />
     <Compile Include="Glow\GlowParameter.cs" />
-    <Compile Include="Model\CollectionNode.cs" />
+    <Compile Include="Model\CollectionNode`1.cs" />
     <Compile Include="Model\IParent.cs" />
-    <Compile Include="Model\ValueWriter.cs" />
-    <Compile Include="Model\ValueReader.cs" />
+    <Compile Include="Model\ValueWriter`1.cs" />
+    <Compile Include="Model\ValueReader`1.cs" />
     <Compile Include="S101\EventInfo.cs" />
     <Compile Include="S101\LogNames.cs" />
     <Compile Include="Glow\GlowLogConverter.cs" />
     <Compile Include="S101\OutOfFrameByteReceivedEventArgs.cs" />
     <Compile Include="S101\S101Logger.cs" />
-    <Compile Include="Model\Node.cs" />
+    <Compile Include="Model\Node`1.cs" />
     <Compile Include="Model\OctetstringParameter.cs" />
-    <Compile Include="Model\Root.cs" />
+    <Compile Include="Model\Root`1.cs" />
     <Compile Include="Model\StringParameter.cs" />
     <Compile Include="Model\IntegerParameter.cs" />
     <Compile Include="Model\IParameter.cs" />
     <Compile Include="Model\ModelException.cs" />
     <Compile Include="Model\Element.cs" />
-    <Compile Include="Model\Element1.cs" />
+    <Compile Include="Model\Element`1.cs" />
     <Compile Include="Model\ElementAttribute.cs" />
     <Compile Include="Model\IElement.cs" />
     <Compile Include="Model\INode.cs" />
     <Compile Include="Model\Context.cs" />
     <Compile Include="Model\MetaElement.cs" />
     <Compile Include="Model\MetaElement1.cs" />
-    <Compile Include="Model\NumericParameter.cs" />
-    <Compile Include="Model\Parameter.cs" />
+    <Compile Include="Model\NumericParameter`2.cs" />
+    <Compile Include="Model\Parameter`2.cs" />
     <Compile Include="Model\ParameterAccess.cs" />
     <Compile Include="Model\ParameterType.cs" />
     <Compile Include="Model\RealParameter.cs" />
-    <Compile Include="Model\Consumer.cs" />
+    <Compile Include="Model\Consumer`1.cs" />
     <Compile Include="Model\StreamDescription.cs" />
     <Compile Include="Model\StreamFormat.cs" />
-    <Compile Include="Model\FieldNode.cs" />
+    <Compile Include="Model\FieldNode`1.cs" />
     <Compile Include="S101\S101Command.cs" />
     <Compile Include="S101\CommandType.cs" />
     <Compile Include="S101\Constants.cs" />
@@ -250,7 +250,7 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json" >
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
diff --git a/Lawo.EmberPlusSharp/Model/CollectionNode.cs b/Lawo.EmberPlusSharp/Model/CollectionNode`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/CollectionNode.cs
rename to Lawo.EmberPlusSharp/Model/CollectionNode`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer`1.cs
similarity index 98%
rename from Lawo.EmberPlusSharp/Model/Consumer.cs
rename to Lawo.EmberPlusSharp/Model/Consumer`1.cs
index fb33ae7b..56a061b4 100644
--- a/Lawo.EmberPlusSharp/Model/Consumer.cs
+++ b/Lawo.EmberPlusSharp/Model/Consumer`1.cs
@@ -150,6 +150,7 @@ public static Task<Consumer<TRoot>> CreateAsync(S101Client client, int timeout,
         /// <para>All changes to the object tree are reported by raising the
         /// <see cref="INotifyPropertyChanged.PropertyChanged"/> event of the affected objects.</para>
         /// </remarks>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1625:Element documentation must not be copied and pasted", Justification = "Intended, both exceptions can be thrown under the same circumstances.")]
         [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes", Justification = "There's no other way.")]
         public static async Task<Consumer<TRoot>> CreateAsync(
             S101Client client, int timeout, ChildrenRetrievalPolicy childrenRetrievalPolicy, byte slot)
@@ -190,6 +191,7 @@ public Task SendChangesAsync()
         /// <remarks>Also retrieves the children of any objects implementing <see cref="INode"/> that have had their
         /// <see cref="INode.ChildrenRetrievalPolicy"/> property set to a value other than
         /// <see cref="ChildrenRetrievalPolicy.None">ChildrenRetrievalPolicy.None</see>.</remarks>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1625:Element documentation must not be copied and pasted", Justification = "Intended, both exceptions can be thrown under the same circumstances.")]
         public async Task SendAsync()
         {
             if (await this.SendCoreAsync())
diff --git a/Lawo.EmberPlusSharp/Model/DynamicFieldNode.cs b/Lawo.EmberPlusSharp/Model/DynamicFieldNode`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/DynamicFieldNode.cs
rename to Lawo.EmberPlusSharp/Model/DynamicFieldNode`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/DynamicNodeBase.cs b/Lawo.EmberPlusSharp/Model/DynamicNodeBase`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/DynamicNodeBase.cs
rename to Lawo.EmberPlusSharp/Model/DynamicNodeBase`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/DynamicRoot.cs b/Lawo.EmberPlusSharp/Model/DynamicRoot`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/DynamicRoot.cs
rename to Lawo.EmberPlusSharp/Model/DynamicRoot`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/ElementWithSchemas.cs b/Lawo.EmberPlusSharp/Model/ElementWithSchemas`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ElementWithSchemas.cs
rename to Lawo.EmberPlusSharp/Model/ElementWithSchemas`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Element1.cs b/Lawo.EmberPlusSharp/Model/Element`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Element1.cs
rename to Lawo.EmberPlusSharp/Model/Element`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/EnumParameterImpl.cs b/Lawo.EmberPlusSharp/Model/EnumParameterImpl`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/EnumParameterImpl.cs
rename to Lawo.EmberPlusSharp/Model/EnumParameterImpl`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/EnumParameter.cs b/Lawo.EmberPlusSharp/Model/EnumParameter`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/EnumParameter.cs
rename to Lawo.EmberPlusSharp/Model/EnumParameter`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/FieldNode.cs b/Lawo.EmberPlusSharp/Model/FieldNode`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/FieldNode.cs
rename to Lawo.EmberPlusSharp/Model/FieldNode`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/FunctionBase.cs b/Lawo.EmberPlusSharp/Model/FunctionBase`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/FunctionBase.cs
rename to Lawo.EmberPlusSharp/Model/FunctionBase`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function.cs b/Lawo.EmberPlusSharp/Model/Function`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function.cs
rename to Lawo.EmberPlusSharp/Model/Function`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function1.cs b/Lawo.EmberPlusSharp/Model/Function`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function1.cs
rename to Lawo.EmberPlusSharp/Model/Function`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function2.cs b/Lawo.EmberPlusSharp/Model/Function`3.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function2.cs
rename to Lawo.EmberPlusSharp/Model/Function`3.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function3.cs b/Lawo.EmberPlusSharp/Model/Function`4.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function3.cs
rename to Lawo.EmberPlusSharp/Model/Function`4.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function4.cs b/Lawo.EmberPlusSharp/Model/Function`5.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function4.cs
rename to Lawo.EmberPlusSharp/Model/Function`5.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function5.cs b/Lawo.EmberPlusSharp/Model/Function`6.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function5.cs
rename to Lawo.EmberPlusSharp/Model/Function`6.cs
diff --git a/Lawo.EmberPlusSharp/Model/Function6.cs b/Lawo.EmberPlusSharp/Model/Function`7.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Function6.cs
rename to Lawo.EmberPlusSharp/Model/Function`7.cs
diff --git a/Lawo.EmberPlusSharp/Model/MatrixParameters.cs b/Lawo.EmberPlusSharp/Model/MatrixParameters`3.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/MatrixParameters.cs
rename to Lawo.EmberPlusSharp/Model/MatrixParameters`3.cs
diff --git a/Lawo.EmberPlusSharp/Model/Matrix.cs b/Lawo.EmberPlusSharp/Model/Matrix`3.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Matrix.cs
rename to Lawo.EmberPlusSharp/Model/Matrix`3.cs
diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/NodeBase.cs
rename to Lawo.EmberPlusSharp/Model/NodeBase`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Node.cs b/Lawo.EmberPlusSharp/Model/Node`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Node.cs
rename to Lawo.EmberPlusSharp/Model/Node`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/NullableEnumParameter.cs b/Lawo.EmberPlusSharp/Model/NullableEnumParameter`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/NullableEnumParameter.cs
rename to Lawo.EmberPlusSharp/Model/NullableEnumParameter`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/NullableNumericParameter.cs b/Lawo.EmberPlusSharp/Model/NullableNumericParameter`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/NullableNumericParameter.cs
rename to Lawo.EmberPlusSharp/Model/NullableNumericParameter`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/NullableParameter.cs b/Lawo.EmberPlusSharp/Model/NullableParameter`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/NullableParameter.cs
rename to Lawo.EmberPlusSharp/Model/NullableParameter`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/NumericParameter.cs b/Lawo.EmberPlusSharp/Model/NumericParameter`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/NumericParameter.cs
rename to Lawo.EmberPlusSharp/Model/NumericParameter`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/ParameterBase.cs b/Lawo.EmberPlusSharp/Model/ParameterBase`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ParameterBase.cs
rename to Lawo.EmberPlusSharp/Model/ParameterBase`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/Parameter.cs b/Lawo.EmberPlusSharp/Model/Parameter`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Parameter.cs
rename to Lawo.EmberPlusSharp/Model/Parameter`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/ReferenceParameter.cs b/Lawo.EmberPlusSharp/Model/ReferenceParameter`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ReferenceParameter.cs
rename to Lawo.EmberPlusSharp/Model/ReferenceParameter`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/ResultBase.cs b/Lawo.EmberPlusSharp/Model/ResultBase`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ResultBase.cs
rename to Lawo.EmberPlusSharp/Model/ResultBase`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Result1.cs b/Lawo.EmberPlusSharp/Model/Result`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Result1.cs
rename to Lawo.EmberPlusSharp/Model/Result`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/Result2.cs b/Lawo.EmberPlusSharp/Model/Result`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Result2.cs
rename to Lawo.EmberPlusSharp/Model/Result`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/Result3.cs b/Lawo.EmberPlusSharp/Model/Result`3.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Result3.cs
rename to Lawo.EmberPlusSharp/Model/Result`3.cs
diff --git a/Lawo.EmberPlusSharp/Model/Result4.cs b/Lawo.EmberPlusSharp/Model/Result`4.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Result4.cs
rename to Lawo.EmberPlusSharp/Model/Result`4.cs
diff --git a/Lawo.EmberPlusSharp/Model/Result5.cs b/Lawo.EmberPlusSharp/Model/Result`5.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Result5.cs
rename to Lawo.EmberPlusSharp/Model/Result`5.cs
diff --git a/Lawo.EmberPlusSharp/Model/Result6.cs b/Lawo.EmberPlusSharp/Model/Result`6.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Result6.cs
rename to Lawo.EmberPlusSharp/Model/Result`6.cs
diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/Root.cs
rename to Lawo.EmberPlusSharp/Model/Root`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/StaticFunction.cs b/Lawo.EmberPlusSharp/Model/StaticFunction`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/StaticFunction.cs
rename to Lawo.EmberPlusSharp/Model/StaticFunction`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/ValueParameter.cs b/Lawo.EmberPlusSharp/Model/ValueParameter`2.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ValueParameter.cs
rename to Lawo.EmberPlusSharp/Model/ValueParameter`2.cs
diff --git a/Lawo.EmberPlusSharp/Model/ValueReader.cs b/Lawo.EmberPlusSharp/Model/ValueReader`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ValueReader.cs
rename to Lawo.EmberPlusSharp/Model/ValueReader`1.cs
diff --git a/Lawo.EmberPlusSharp/Model/ValueWriter.cs b/Lawo.EmberPlusSharp/Model/ValueWriter`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharp/Model/ValueWriter.cs
rename to Lawo.EmberPlusSharp/Model/ValueWriter`1.cs
diff --git a/Lawo.EmberPlusSharp/S101/S101Client.cs b/Lawo.EmberPlusSharp/S101/S101Client.cs
index c4955bc8..c83e74eb 100644
--- a/Lawo.EmberPlusSharp/S101/S101Client.cs
+++ b/Lawo.EmberPlusSharp/S101/S101Client.cs
@@ -238,6 +238,7 @@ public Task SendMessageAsync(S101Message message)
         /// <see cref="ConnectionLost"/> event has been raised.</exception>
         /// <exception cref="OperationCanceledException"><see cref="Dispose"/> has been called or the
         /// <see cref="ConnectionLost"/> event has been raised.</exception>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1625:Element documentation must not be copied and pasted", Justification = "Intended, both exceptions can be thrown under the same circumstances.")]
         public Task SendMessageAsync(S101Message message, byte[] payload)
         {
             this.AssertPreconditions();
diff --git a/Lawo.EmberPlusSharpTest/Lawo.EmberPlusSharpTest.csproj b/Lawo.EmberPlusSharpTest/Lawo.EmberPlusSharpTest.csproj
index 7a79b75c..d09a6bd3 100644
--- a/Lawo.EmberPlusSharpTest/Lawo.EmberPlusSharpTest.csproj
+++ b/Lawo.EmberPlusSharpTest/Lawo.EmberPlusSharpTest.csproj
@@ -91,14 +91,14 @@
     <Compile Include="Model\Test\FunctionNode.cs" />
     <Compile Include="Model\Test\EmptyZoneNode.cs" />
     <Compile Include="Model\Test\EmptyZoneNodeRoot.cs" />
-    <Compile Include="Model\Test\InterfaceElementRoot.cs" />
+    <Compile Include="Model\Test\InterfaceElementRoot`1.cs" />
     <Compile Include="Model\Test\StreamRoot.cs" />
     <Compile Include="Model\Test\ZoneNodeRoot.cs" />
     <Compile Include="Model\Test\TwoParameterRoot.cs" />
     <Compile Include="Model\Test\FunctionRoot.cs" />
     <Compile Include="Model\Test\EmptyNode.cs" />
     <Compile Include="Model\Test\EmptyNodeRoot.cs" />
-    <Compile Include="Model\Test\ChangeNotificationRoot.cs" />
+    <Compile Include="Model\Test\BooleanRoot.cs" />
     <Compile Include="Model\Test\FunctionSignatureMismatchRoot4.cs" />
     <Compile Include="Model\Test\FunctionSignatureMismatchRoot5.cs" />
     <Compile Include="Model\Test\FunctionResultMismatchRoot.cs" />
@@ -114,7 +114,7 @@
     <Compile Include="Model\Test\MediaSessionReceiver.cs" />
     <Compile Include="Model\Test\ZoneNode.cs" />
     <Compile Include="Model\TutorialTest.cs" />
-    <Compile Include="Model\DynamicNodeHelper.cs" />
+    <Compile Include="Model\DynamicHelper.cs" />
     <Compile Include="Model\Test\EmptyDynamicRoot.cs" />
     <Compile Include="Model\Test\BigTreeStaticRoot.cs" />
     <Compile Include="Model\Test\BigTreeNode.cs" />
diff --git a/Lawo.EmberPlusSharpTest/Model/DynamicNodeHelper.cs b/Lawo.EmberPlusSharpTest/Model/DynamicHelper.cs
similarity index 100%
rename from Lawo.EmberPlusSharpTest/Model/DynamicNodeHelper.cs
rename to Lawo.EmberPlusSharpTest/Model/DynamicHelper.cs
diff --git a/Lawo.EmberPlusSharpTest/Model/Test/ChangeNotificationRoot.cs b/Lawo.EmberPlusSharpTest/Model/Test/BooleanRoot.cs
similarity index 100%
rename from Lawo.EmberPlusSharpTest/Model/Test/ChangeNotificationRoot.cs
rename to Lawo.EmberPlusSharpTest/Model/Test/BooleanRoot.cs
diff --git a/Lawo.EmberPlusSharpTest/Model/Test/InterfaceElementRoot.cs b/Lawo.EmberPlusSharpTest/Model/Test/InterfaceElementRoot`1.cs
similarity index 100%
rename from Lawo.EmberPlusSharpTest/Model/Test/InterfaceElementRoot.cs
rename to Lawo.EmberPlusSharpTest/Model/Test/InterfaceElementRoot`1.cs
diff --git a/Lawo.UnitTesting/Activator.cs b/Lawo.UnitTesting/Activator`1.cs
similarity index 100%
rename from Lawo.UnitTesting/Activator.cs
rename to Lawo.UnitTesting/Activator`1.cs
diff --git a/Lawo.UnitTesting/Lawo.UnitTesting.csproj b/Lawo.UnitTesting/Lawo.UnitTesting.csproj
index 0fb52245..3f36741d 100644
--- a/Lawo.UnitTesting/Lawo.UnitTesting.csproj
+++ b/Lawo.UnitTesting/Lawo.UnitTesting.csproj
@@ -51,7 +51,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Activator.cs" />
+    <Compile Include="Activator`1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestBase.cs" />
   </ItemGroup>
@@ -67,7 +67,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json" >
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
     <None Include="packages.config" />
diff --git a/Lawo/ComponentModel/Binding.cs b/Lawo/ComponentModel/Binding`4.cs
similarity index 100%
rename from Lawo/ComponentModel/Binding.cs
rename to Lawo/ComponentModel/Binding`4.cs
diff --git a/Lawo/ComponentModel/CalculatedProperty1.cs b/Lawo/ComponentModel/CalculatedProperty`1.cs
similarity index 100%
rename from Lawo/ComponentModel/CalculatedProperty1.cs
rename to Lawo/ComponentModel/CalculatedProperty`1.cs
diff --git a/Lawo/ComponentModel/ChangeOriginatedAtEventArgs.cs b/Lawo/ComponentModel/ChangeOriginatedAtEventArgs`2.cs
similarity index 100%
rename from Lawo/ComponentModel/ChangeOriginatedAtEventArgs.cs
rename to Lawo/ComponentModel/ChangeOriginatedAtEventArgs`2.cs
diff --git a/Lawo/ComponentModel/DisposableReadOnlyObservableCollection.cs b/Lawo/ComponentModel/DisposableReadOnlyObservableCollection`1.cs
similarity index 100%
rename from Lawo/ComponentModel/DisposableReadOnlyObservableCollection.cs
rename to Lawo/ComponentModel/DisposableReadOnlyObservableCollection`1.cs
diff --git a/Lawo/ComponentModel/MultiBinding1.cs b/Lawo/ComponentModel/MultiBinding`1.cs
similarity index 100%
rename from Lawo/ComponentModel/MultiBinding1.cs
rename to Lawo/ComponentModel/MultiBinding`1.cs
diff --git a/Lawo/ComponentModel/SubscribedObservableCollection.cs b/Lawo/ComponentModel/SubscribedObservableCollection`1.cs
similarity index 100%
rename from Lawo/ComponentModel/SubscribedObservableCollection.cs
rename to Lawo/ComponentModel/SubscribedObservableCollection`1.cs
diff --git a/Lawo/Lawo.csproj b/Lawo/Lawo.csproj
index 216cea59..dedb5ef2 100644
--- a/Lawo/Lawo.csproj
+++ b/Lawo/Lawo.csproj
@@ -55,20 +55,20 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="BufferHelper.cs" />
-    <Compile Include="ComponentModel\SubscribedObservableCollection.cs" />
-    <Compile Include="ComponentModel\DisposableReadOnlyObservableCollection.cs" />
+    <Compile Include="ComponentModel\SubscribedObservableCollection`1.cs" />
+    <Compile Include="ComponentModel\DisposableReadOnlyObservableCollection`1.cs" />
     <Compile Include="ComponentModel\FilterHelper.cs" />
     <Compile Include="ComponentModel\Trigger.cs" />
     <Compile Include="ComponentModel\MultiBinding.cs" />
     <Compile Include="ComponentModel\CalculatedProperty.cs" />
-    <Compile Include="ComponentModel\MultiBinding1.cs" />
-    <Compile Include="ComponentModel\CalculatedProperty1.cs" />
-    <Compile Include="ComponentModel\ChangeOriginatedAtEventArgs.cs" />
+    <Compile Include="ComponentModel\MultiBinding`1.cs" />
+    <Compile Include="ComponentModel\CalculatedProperty`1.cs" />
+    <Compile Include="ComponentModel\ChangeOriginatedAtEventArgs`2.cs" />
     <Compile Include="ComponentModel\FlattenHelper.cs" />
     <Compile Include="ComponentModel\ProjectionHelper.cs" />
     <Compile Include="ComponentModel\OneWayBinding.cs" />
     <Compile Include="ComponentModel\TwoWayBinding.cs" />
-    <Compile Include="ComponentModel\Binding.cs" />
+    <Compile Include="ComponentModel\Binding`4.cs" />
     <Compile Include="ComponentModel\ObservableCollectionHelper.cs" />
     <Compile Include="ComponentModel\PropertyChangedRegistration.cs" />
     <Compile Include="ComponentModel\NotifyPropertyChanged.cs" />
@@ -93,11 +93,11 @@
     <Compile Include="IO\WriteBuffer.cs" />
     <Compile Include="IO\JsonSerializer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Reflection\IProperty2.cs" />
-    <Compile Include="Reflection\IProperty.cs" />
+    <Compile Include="Reflection\IProperty`2.cs" />
+    <Compile Include="Reflection\IProperty`1.cs" />
     <Compile Include="Reflection\ReflectionHelper.cs" />
     <Compile Include="ScopeGuard.cs" />
-    <Compile Include="ScopeGuard1.cs" />
+    <Compile Include="ScopeGuard`1.cs" />
     <Compile Include="Threading\NativeMethods.cs" />
     <Compile Include="Threading\Tasks\AsyncPump.cs" />
     <Compile Include="Threading\Tasks\TaskSingleton.cs" />
@@ -110,7 +110,7 @@
     </CodeAnalysisDictionary>
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json" >
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
     <None Include="packages.config" />
diff --git a/Lawo/Reflection/IProperty.cs b/Lawo/Reflection/IProperty`1.cs
similarity index 100%
rename from Lawo/Reflection/IProperty.cs
rename to Lawo/Reflection/IProperty`1.cs
diff --git a/Lawo/Reflection/IProperty2.cs b/Lawo/Reflection/IProperty`2.cs
similarity index 100%
rename from Lawo/Reflection/IProperty2.cs
rename to Lawo/Reflection/IProperty`2.cs
diff --git a/Lawo/ScopeGuard1.cs b/Lawo/ScopeGuard`1.cs
similarity index 100%
rename from Lawo/ScopeGuard1.cs
rename to Lawo/ScopeGuard`1.cs
diff --git a/stylecop.json b/stylecop.json
index 466884dc..94b42c60 100644
--- a/stylecop.json
+++ b/stylecop.json
@@ -11,9 +11,10 @@
       ]
     },
     "documentationRules": {
+      "fileNamingConvention": "metadata",
+      "copyrightText": "Copyright 2012-2016 Lawo AG (http://www.lawo.com).",
       "documentInterfaces": false,
-      "documentInternalElements": false,
-      "copyrightText": "Copyright 2012-2016 Lawo AG (http://www.lawo.com)."
+      "documentInternalElements": false
     }
   }
 }