diff --git a/source/_components/binary_sensor.octoprint.markdown b/source/_components/binary_sensor.octoprint.markdown
index c8ef090c450..309685014d9 100644
--- a/source/_components/binary_sensor.octoprint.markdown
+++ b/source/_components/binary_sensor.octoprint.markdown
@@ -24,6 +24,7 @@ To set it up, add the following information to your `configuration.yaml` file:
 ```yaml
 binary_sensor:
   platform: octoprint
+  name: OctoPrint
   monitored_conditions:
     - Printing
     - Printing Error
@@ -31,7 +32,8 @@ binary_sensor:
 
 Configuration variables:
 
+- **name** (*Optional*): The name of the sensor. Default is 'OctoPrint'.
 - **monitored_conditions** array (*Required*): States to monitor.
-  - Printing
-  - Printing Error
+  - **Printing**: State of the printer.
+  - **Printing Error**: Error while printing.
 
diff --git a/source/_components/sensor.octoprint.markdown b/source/_components/sensor.octoprint.markdown
index 20682101264..0cdc090fd68 100644
--- a/source/_components/sensor.octoprint.markdown
+++ b/source/_components/sensor.octoprint.markdown
@@ -24,6 +24,7 @@ To set it up, add the following information to your `configuration.yaml` file:
 ```yaml
 sensor:
   platform: octoprint
+  name: OctoPrint
   monitored_conditions:
     - Current State
     - Temperatures
@@ -32,8 +33,9 @@ sensor:
 
 Configuration variables:
 
+- **name** (*Optional*): The name of the sensor. Default is 'OctoPrint'.
 - **monitored_conditions** array (*Required*): States to monitor.
-  - Current State (Text of current state)
-  - Temperatures (Temperatures of all available tools)(print head, print bed, ...) These will be displayed as tool0, tool1, ... please refer to your OctoPrint frontend to associate tool number with actual device.
-  - Job Percentage
+  - **Current State**: Text of current state)
+  - **Temperatures**:  Temperatures of all available tools, eg. `print`, `head`, `print bed`, etc. These will be displayed as `tool0`, `tool1`, or `toolN` please refer to your OctoPrint frontend to associate the tool number with an actual device.
+  - **Job Percentage**: