diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c
index 8d3bf9915..06c6a3826 100644
--- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c
+++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c
@@ -253,7 +253,7 @@ static void prvHTTPDemoTask( void * pvParameters )
          * timeout. The timeout value will be exponentially increased until either the
          * maximum number of attempts or the maximum timeout value is reached. The
          * function returns pdFAIL if the TCP connection cannot be established with
-         * the broker after configured number of attempts. */
+         * the server after the configured number of attempts. */
         xDemoStatus = connectToServerWithBackoffRetries( prvConnectToServer,
                                                          &xNetworkContext );
 
diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/demo_config.h b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/demo_config.h
index ec0b70fcb..5cd9d35b8 100644
--- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/demo_config.h
+++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/demo_config.h
@@ -150,7 +150,7 @@ extern void vLoggingPrintf( const char * pcFormatString,
 /**
  * @brief An option to disable Server Name Indication.
  *
- * @note When using a local server setup, SNI needs to be disabled for a broker
+ * @note When using a local server setup, SNI needs to be disabled for a server
  * that only has an IP address but no hostname. However, SNI should be enabled
  * whenever possible.
  */
diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c
index 4d13a7802..517e29b3c 100644
--- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c
+++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c
@@ -332,7 +332,7 @@ static void prvHTTPDemoTask( void * pvParameters )
          * timeout. The timeout value will be exponentially increased until either the
          * maximum number of attempts or the maximum timeout value is reached. The
          * function returns pdFAIL if the TCP connection cannot be established with
-         * the broker after configured number of attempts. */
+         * the server after the number of attempts. */
         xDemoStatus = connectToServerWithBackoffRetries( prvConnectToServer,
                                                          &xNetworkContext );