diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
index e1aea631..e531927d 100644
--- a/Lawo.EmberPlusSharp/Model/Consumer.cs
+++ b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -225,7 +225,7 @@ private void OnHasChangesSet(object sender, EventArgs e)
 
         private async Task QueryChildrenAsync()
         {
-            var queryChildrenTask = this.QueryChildrenAsyncCore();
+            var queryChildrenTask = this.QueryChildrenCoreAsync();
 
             if ((await Task.WhenAny(queryChildrenTask, Task.Delay(this.queryChildrenTimeout))) != queryChildrenTask)
             {
@@ -300,9 +300,9 @@ private async void AutoSendLoop()
             }
         }
 
-        private async Task QueryChildrenAsyncCore()
+        private async Task QueryChildrenCoreAsync()
         {
-            while (await this.SendChildrenQuery())
+            while (await this.SendRequestAsync())
             {
                 await this.WaitForAndApplyChanges();
             }
@@ -351,7 +351,7 @@ private async Task DelayAutoSend()
             }
         }
 
-        private async Task<bool> SendChildrenQuery()
+        private async Task<bool> SendRequestAsync()
         {
             var rootRequestState = this.root.UpdateRequestState(false);
 
diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase.cs
index 022bd8a8..8f83996b 100644
--- a/Lawo.EmberPlusSharp/Model/NodeBase.cs
+++ b/Lawo.EmberPlusSharp/Model/NodeBase.cs
@@ -105,7 +105,7 @@ internal void ReadChild(EmberReader reader, ElementType actualType)
             this.ReadChild(reader, actualType, reader.AssertAndReadContentsAsInt32());
         }
 
-        internal void WriteChildrenQueryCollection(EmberWriter writer)
+        internal void WriteRequestCollection(EmberWriter writer)
         {
             if (this.children.Count == 0)
             {
@@ -278,7 +278,7 @@ internal override void WriteRequest(EmberWriter writer)
                         GlowQualifiedNode.Children.OuterId, GlowElementCollection.InnerNumber);
                 }
 
-                this.WriteChildrenQueryCollection(writer);
+                this.WriteRequestCollection(writer);
 
                 if (isEmpty)
                 {
diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root.cs
index 8ec225a2..6481cf8f 100644
--- a/Lawo.EmberPlusSharp/Model/Root.cs
+++ b/Lawo.EmberPlusSharp/Model/Root.cs
@@ -129,7 +129,7 @@ internal sealed override bool ReadChildrenCore(EmberReader reader)
         internal sealed override void WriteRequest(EmberWriter writer)
         {
             writer.WriteStartApplicationDefinedType(GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
-            this.WriteChildrenQueryCollection(writer);
+            this.WriteRequestCollection(writer);
             writer.WriteEndContainer();
         }
 
diff --git a/Lawo.EmberPlusSharp/S101/S101Client.cs b/Lawo.EmberPlusSharp/S101/S101Client.cs
index ef62069d..b6dc33b8 100644
--- a/Lawo.EmberPlusSharp/S101/S101Client.cs
+++ b/Lawo.EmberPlusSharp/S101/S101Client.cs
@@ -198,7 +198,7 @@ public byte KeepAliveRequestSlot
         public Task SendOutOfFrameByteAsync(byte value)
         {
             this.AssertPreconditions();
-            return this.SendOutOfFrameByteAsyncCore(value);
+            return this.SendOutOfFrameByteCoreAsync(value);
         }
 
         /// <summary>Calls
@@ -231,7 +231,7 @@ public Task SendMessageAsync(S101Message message)
         public Task SendMessageAsync(S101Message message, byte[] payload)
         {
             this.AssertPreconditions();
-            return this.SendMessageAsyncCore(message, payload);
+            return this.SendMessageCoreAsync(message, payload);
         }
 
         /// <summary>See <see cref="IDisposable.Dispose"/>.</summary>
@@ -369,7 +369,7 @@ private void DisposeCore(bool log)
             }
         }
 
-        private async Task SendMessageAsyncCore(S101Message message, byte[] payload)
+        private async Task SendMessageCoreAsync(S101Message message, byte[] payload)
         {
             await this.EnqueueLogOperation(() => this.logger.LogMessage(LogNames.Send, message, payload));
 
@@ -393,7 +393,7 @@ await this.sendQueue.Enqueue(
                 });
         }
 
-        private async Task SendOutOfFrameByteAsyncCore(byte value)
+        private async Task SendOutOfFrameByteCoreAsync(byte value)
         {
             await this.EnqueueLogOperation(() => this.logger.LogData(LogNames.OutOfFrameByte, LogNames.Send, new[] { value }, 0, 1));
             await this.sendQueue.Enqueue(() => this.writer.WriteOutOfFrameByteAsync(value, this.source.Token));
@@ -417,7 +417,7 @@ await Task.WhenAny(readTask, timeoutTask = Task.Delay(timeoutHalf), cancellation
                 switch (++timeoutCount)
                 {
                     case 1:
-                        await this.SendMessageAsyncCore(
+                        await this.SendMessageCoreAsync(
                             new S101Message(this.keepAliveRequestSlot, new KeepAliveRequest()), null);
                         break;
                     case 2:
diff --git a/Lawo.EmberPlusSharp/S101/S101Writer.cs b/Lawo.EmberPlusSharp/S101/S101Writer.cs
index 8b23472e..944e0092 100644
--- a/Lawo.EmberPlusSharp/S101/S101Writer.cs
+++ b/Lawo.EmberPlusSharp/S101/S101Writer.cs
@@ -69,7 +69,7 @@ public Task DisposeAsync(CancellationToken cancellationToken)
         /// <exception cref="ArgumentException"><paramref name="value"/> equals <c>0xFE</c>.</exception>
         public Task WriteOutOfFrameByteAsync(byte value, CancellationToken cancellationToken)
         {
-            return this.taskSingleton.Execute(() => this.WriteOutOfFrameByteAsyncCore(value, cancellationToken));
+            return this.taskSingleton.Execute(() => this.WriteOutOfFrameByteCoreAsync(value, cancellationToken));
         }
 
         /// <summary>Asynchronously writes <paramref name="message"/>.</summary>
@@ -145,7 +145,7 @@ private async Task<NonSeekableStream> WriteMessageCoreAsync(
             return this.stream;
         }
 
-        private async Task WriteOutOfFrameByteAsyncCore(byte value, CancellationToken cancellationToken)
+        private async Task WriteOutOfFrameByteCoreAsync(byte value, CancellationToken cancellationToken)
         {
             this.AssertNotDisposed();