diff --git a/plugins/inputs/azure_storage_queue/README.md b/plugins/inputs/azure_storage_queue/README.md
index 7985c886e1578..905e85e4cdea6 100644
--- a/plugins/inputs/azure_storage_queue/README.md
+++ b/plugins/inputs/azure_storage_queue/README.md
@@ -1,4 +1,4 @@
-# Telegraf Input Plugin: Azure Storage Queue
+# Azure Storage Queue Input Plugin
 
 This plugin gathers sizes of Azure Storage Queues.
 
diff --git a/plugins/inputs/bcache/README.md b/plugins/inputs/bcache/README.md
index 9b7040d6798ce..11d567ec5616b 100644
--- a/plugins/inputs/bcache/README.md
+++ b/plugins/inputs/bcache/README.md
@@ -1,4 +1,4 @@
-# Telegraf plugin: bcache
+# bcache Input Plugin
 
 Get bcache stat from stats_total directory and dirty_data file.
 
diff --git a/plugins/inputs/burrow/README.md b/plugins/inputs/burrow/README.md
index bdc821ca55784..1d763a430455f 100644
--- a/plugins/inputs/burrow/README.md
+++ b/plugins/inputs/burrow/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: Burrow
+# Burrow Kafka Consumer Lag Checking Input Plugin
 
 Collect Kafka topic, consumer and partition status
 via [Burrow](https://github.com/linkedin/Burrow) HTTP [API](https://github.com/linkedin/Burrow/wiki/HTTP-Endpoint).
diff --git a/plugins/inputs/cassandra/README.md b/plugins/inputs/cassandra/README.md
index 881bba3e0a239..d89459533f55e 100644
--- a/plugins/inputs/cassandra/README.md
+++ b/plugins/inputs/cassandra/README.md
@@ -1,5 +1,4 @@
-
-# Telegraf plugin: Cassandra
+# Cassandra Input Plugin
 
 ### **Deprecated in version 1.7**: Please use the [jolokia2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2) plugin with the [cassandra.conf](/plugins/inputs/jolokia2/examples/cassandra.conf) example configuration.
 
diff --git a/plugins/inputs/cgroup/README.md b/plugins/inputs/cgroup/README.md
index 55fac87935c2a..6982517bc5879 100644
--- a/plugins/inputs/cgroup/README.md
+++ b/plugins/inputs/cgroup/README.md
@@ -1,4 +1,4 @@
-# CGroup Input Plugin For Telegraf Agent
+# CGroup Input Plugin
 
 This input plugin will capture specific statistics per cgroup.
 
diff --git a/plugins/inputs/cisco_telemetry_mdt/README.md b/plugins/inputs/cisco_telemetry_mdt/README.md
index 3545c6120be9f..9c4eb3645d491 100644
--- a/plugins/inputs/cisco_telemetry_mdt/README.md
+++ b/plugins/inputs/cisco_telemetry_mdt/README.md
@@ -1,4 +1,4 @@
-# Cisco model-driven telemetry (MDT)
+# Cisco Model-Driven Telemetry (MDT) Input Plugin
 
 Cisco model-driven telemetry (MDT) is an input plugin that consumes
 telemetry data from Cisco IOS XR, IOS XE and NX-OS platforms. It supports TCP & GRPC dialout transports.
diff --git a/plugins/inputs/cloud_pubsub_push/README.md b/plugins/inputs/cloud_pubsub_push/README.md
index 76725c9979bdb..3173b43361fb6 100644
--- a/plugins/inputs/cloud_pubsub_push/README.md
+++ b/plugins/inputs/cloud_pubsub_push/README.md
@@ -1,4 +1,4 @@
-# Google Cloud PubSub Push Input Service Plugin
+# Google Cloud PubSub Push Input Plugin
 
 The Google Cloud PubSub Push listener is a service input plugin that listens for messages sent via an HTTP POST from [Google Cloud PubSub][pubsub].
 The plugin expects messages in Google's Pub/Sub JSON Format ONLY.
diff --git a/plugins/inputs/cloudwatch/README.md b/plugins/inputs/cloudwatch/README.md
index 3cd098f4706f5..674dd0ac4363a 100644
--- a/plugins/inputs/cloudwatch/README.md
+++ b/plugins/inputs/cloudwatch/README.md
@@ -1,4 +1,4 @@
-# Amazon CloudWatch Statistics Input
+# Amazon CloudWatch Statistics Input Plugin
 
 This plugin will pull Metric Statistics from Amazon CloudWatch.
 
diff --git a/plugins/inputs/conntrack/README.md b/plugins/inputs/conntrack/README.md
index 813bc48617278..2e5fb8861dec1 100644
--- a/plugins/inputs/conntrack/README.md
+++ b/plugins/inputs/conntrack/README.md
@@ -1,4 +1,4 @@
-# Conntrack Plugin
+# Conntrack Input Plugin
 
 Collects stats from Netfilter's conntrack-tools.
 
diff --git a/plugins/inputs/couchbase/README.md b/plugins/inputs/couchbase/README.md
index 954879da4f4a4..659b87c3a1fb6 100644
--- a/plugins/inputs/couchbase/README.md
+++ b/plugins/inputs/couchbase/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: Couchbase
+# Couchbase Input Plugin
 
 ## Configuration:
 
diff --git a/plugins/inputs/disque/README.md b/plugins/inputs/disque/README.md
index 0df7570612b47..ad05658cc2b14 100644
--- a/plugins/inputs/disque/README.md
+++ b/plugins/inputs/disque/README.md
@@ -1,4 +1,4 @@
-# Disque Input
+# Disque Input Plugin
 
 [Disque](https://github.com/antirez/disque) is an ongoing experiment to build a distributed, in-memory, message broker.
 
diff --git a/plugins/inputs/gnmi/README.md b/plugins/inputs/gnmi/README.md
index ef32e61c8aa6d..7387e566dd21b 100644
--- a/plugins/inputs/gnmi/README.md
+++ b/plugins/inputs/gnmi/README.md
@@ -1,4 +1,4 @@
-# gNMI (gRPC Network Management Interface)
+# gNMI (gRPC Network Management Interface) Input Plugin
 
 This plugin consumes telemetry data based on the [gNMI](https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-specification.md) Subscribe method. TLS is supported for authentication and encryption.  This input plugin is vendor-agnostic and is supported on any platform that supports the gNMI spec.
 
diff --git a/plugins/inputs/graylog/README.md b/plugins/inputs/graylog/README.md
index acb191f8bef09..6a835f1d60a4f 100644
--- a/plugins/inputs/graylog/README.md
+++ b/plugins/inputs/graylog/README.md
@@ -1,4 +1,4 @@
-# GrayLog plugin
+# GrayLog Input Plugin
 
 The Graylog plugin can collect data from remote Graylog service URLs.
 
diff --git a/plugins/inputs/influxdb/README.md b/plugins/inputs/influxdb/README.md
index eab0bf76970b3..e17bd7072438b 100644
--- a/plugins/inputs/influxdb/README.md
+++ b/plugins/inputs/influxdb/README.md
@@ -1,4 +1,4 @@
-# influxdb plugin
+# InfluxDB Input Plugin
 
 The InfluxDB plugin will collect metrics on the given InfluxDB servers.
 
diff --git a/plugins/inputs/ipset/README.md b/plugins/inputs/ipset/README.md
index ae66ccfc07c38..f4477254f117d 100644
--- a/plugins/inputs/ipset/README.md
+++ b/plugins/inputs/ipset/README.md
@@ -1,4 +1,4 @@
-# Ipset Plugin
+# Ipset Input Plugin
 
 The ipset plugin gathers packets and bytes counters from Linux ipset.
 It uses the output of the command "ipset save".
diff --git a/plugins/inputs/iptables/README.md b/plugins/inputs/iptables/README.md
index 6b56febba0300..db730c88178ff 100644
--- a/plugins/inputs/iptables/README.md
+++ b/plugins/inputs/iptables/README.md
@@ -1,4 +1,4 @@
-# Iptables Plugin
+# Iptables Input Plugin
 
 The iptables plugin gathers packets and bytes counters for rules within a set of table and chain from the Linux's iptables firewall.
 
diff --git a/plugins/inputs/jenkins/README.md b/plugins/inputs/jenkins/README.md
index 3615006c4c5da..f4e9f94ac22a7 100644
--- a/plugins/inputs/jenkins/README.md
+++ b/plugins/inputs/jenkins/README.md
@@ -1,4 +1,4 @@
-# Jenkins Plugin
+# Jenkins Input Plugin
 
 The jenkins plugin gathers information about the nodes and jobs running in a jenkins instance.
 
diff --git a/plugins/inputs/jolokia/README.md b/plugins/inputs/jolokia/README.md
index 2622d83bc5668..96ee48701b464 100644
--- a/plugins/inputs/jolokia/README.md
+++ b/plugins/inputs/jolokia/README.md
@@ -1,4 +1,4 @@
-# Telegraf plugin: Jolokia
+# Jolokia Input Plugin
 
 **Deprecated in version 1.5:** Please use the [jolokia2](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2) plugin.
 
diff --git a/plugins/inputs/jolokia2/README.md b/plugins/inputs/jolokia2/README.md
index 190e6627d272c..4a7b8f4200a42 100644
--- a/plugins/inputs/jolokia2/README.md
+++ b/plugins/inputs/jolokia2/README.md
@@ -1,4 +1,4 @@
-# Jolokia2 Input Plugins
+# Jolokia2 Input Plugin
 
 The [Jolokia](http://jolokia.org) _agent_ and _proxy_ input plugins collect JMX metrics from an HTTP endpoint using Jolokia's [JSON-over-HTTP protocol](https://jolokia.org/reference/html/protocol.html).
 
diff --git a/plugins/inputs/kafka_consumer_legacy/README.md b/plugins/inputs/kafka_consumer_legacy/README.md
index 8fc7ed295a085..2f0c219ea8647 100644
--- a/plugins/inputs/kafka_consumer_legacy/README.md
+++ b/plugins/inputs/kafka_consumer_legacy/README.md
@@ -1,4 +1,4 @@
-# Kafka Consumer Input Plugin
+# Kafka Consumer Legacy Input Plugin
 
 The [Kafka](http://kafka.apache.org/) consumer plugin polls a specified Kafka
 topic and adds messages to InfluxDB. The plugin assumes messages follow the
diff --git a/plugins/inputs/kapacitor/README.md b/plugins/inputs/kapacitor/README.md
index ace4f18ff7f14..6a70387ee587b 100644
--- a/plugins/inputs/kapacitor/README.md
+++ b/plugins/inputs/kapacitor/README.md
@@ -1,4 +1,4 @@
-# Kapacitor Plugin
+# Kapacitor Input Plugin
 
 The Kapacitor plugin collects metrics from the given Kapacitor instances.
 
diff --git a/plugins/inputs/kube_inventory/README.md b/plugins/inputs/kube_inventory/README.md
index e17006503f406..dbed6d6f01edb 100644
--- a/plugins/inputs/kube_inventory/README.md
+++ b/plugins/inputs/kube_inventory/README.md
@@ -1,4 +1,4 @@
-# Kube_Inventory Plugin
+# Kubernetes Inventory Input Plugin
 
 This plugin generates metrics derived from the state of the following Kubernetes resources:
 
diff --git a/plugins/inputs/linux_sysctl_fs/README.md b/plugins/inputs/linux_sysctl_fs/README.md
index e9341c322d05d..d6598e16ff30a 100644
--- a/plugins/inputs/linux_sysctl_fs/README.md
+++ b/plugins/inputs/linux_sysctl_fs/README.md
@@ -1,4 +1,4 @@
-# Linux Sysctl FS Input
+# Linux Sysctl FS Input Plugin
 
 The linux_sysctl_fs input provides Linux system level file metrics. The documentation on these fields can be found at https://www.kernel.org/doc/Documentation/sysctl/fs.txt.
 
diff --git a/plugins/inputs/mailchimp/README.md b/plugins/inputs/mailchimp/README.md
index cf82eb243bd05..46750f6fc5efa 100644
--- a/plugins/inputs/mailchimp/README.md
+++ b/plugins/inputs/mailchimp/README.md
@@ -1,4 +1,4 @@
-# Mailchimp Input
+# Mailchimp Input Plugin
 
 Pulls campaign reports from the [Mailchimp API](https://developer.mailchimp.com/).
 
diff --git a/plugins/inputs/marklogic/README.md b/plugins/inputs/marklogic/README.md
index afbfb2824a0f4..7feb4a10d9d04 100644
--- a/plugins/inputs/marklogic/README.md
+++ b/plugins/inputs/marklogic/README.md
@@ -1,4 +1,4 @@
-# MarkLogic Plugin
+# MarkLogic Input Plugin
 
 The MarkLogic Telegraf plugin gathers health status metrics from one or more host.
 
diff --git a/plugins/inputs/mem/README.md b/plugins/inputs/mem/README.md
index 6571987fa3721..9122b885a09e1 100644
--- a/plugins/inputs/mem/README.md
+++ b/plugins/inputs/mem/README.md
@@ -1,4 +1,4 @@
-# Mem Input Plugin
+# Memory Input Plugin
 
 The mem plugin collects system memory metrics.
 
diff --git a/plugins/inputs/nginx/README.md b/plugins/inputs/nginx/README.md
index de112e4d7c1e1..bc4916507ef25 100644
--- a/plugins/inputs/nginx/README.md
+++ b/plugins/inputs/nginx/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: Nginx
+# Nginx Input Plugin
 
 ### Configuration:
 
diff --git a/plugins/inputs/nginx_plus/README.md b/plugins/inputs/nginx_plus/README.md
index 03c651f91ff4f..cb0713ed848ff 100644
--- a/plugins/inputs/nginx_plus/README.md
+++ b/plugins/inputs/nginx_plus/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: nginx_plus
+# Nginx Plus Input Plugin
 
 Nginx Plus is a commercial version of the open source web server Nginx. The use this plugin you will need a license. For more information about the differences between Nginx (F/OSS) and Nginx Plus, [click here](https://www.nginx.com/blog/whats-difference-nginx-foss-nginx-plus/).
 
diff --git a/plugins/inputs/nginx_plus_api/README.md b/plugins/inputs/nginx_plus_api/README.md
index 96972496f413f..57cb127b5dd12 100644
--- a/plugins/inputs/nginx_plus_api/README.md
+++ b/plugins/inputs/nginx_plus_api/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: nginx_plus_api
+# Nginx Plus API Input Plugin
 
 Nginx Plus is a commercial version of the open source web server Nginx. The use this plugin you will need a license. For more information about the differences between Nginx (F/OSS) and Nginx Plus, [click here](https://www.nginx.com/blog/whats-difference-nginx-foss-nginx-plus/).
 
diff --git a/plugins/inputs/nginx_upstream_check/README.md b/plugins/inputs/nginx_upstream_check/README.md
index 4a76a33392517..58bee07be931d 100644
--- a/plugins/inputs/nginx_upstream_check/README.md
+++ b/plugins/inputs/nginx_upstream_check/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: Nginx_upstream_check
+# Nginx Upstream Check Input Plugin
 
 Read the status output of the nginx_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module).
 This module can periodically check the servers in the Nginx's upstream with configured request and interval to determine
diff --git a/plugins/inputs/nginx_vts/README.md b/plugins/inputs/nginx_vts/README.md
index 8ddf72d1c39ad..fe9e7fd6ea62f 100644
--- a/plugins/inputs/nginx_vts/README.md
+++ b/plugins/inputs/nginx_vts/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: nginx_vts
+# Nginx Virtual Host Traffic (VTS) Input Plugin
 
 This plugin gathers Nginx status using external virtual host traffic status module -  https://github.com/vozlt/nginx-module-vts. This is an Nginx module that provides access to virtual host status information. It contains the current status such as servers, upstreams, caches. This is similar to the live activity monitoring of Nginx plus.
 For module configuration details please see its [documentation](https://github.com/vozlt/nginx-module-vts#synopsis).
diff --git a/plugins/inputs/nstat/README.md b/plugins/inputs/nstat/README.md
index 5d2ca6c0a8f65..c0ebc2654f5b8 100644
--- a/plugins/inputs/nstat/README.md
+++ b/plugins/inputs/nstat/README.md
@@ -1,4 +1,4 @@
-## Nstat input plugin
+# Nstat Input Plugin
 
 Plugin collects network metrics from `/proc/net/netstat`, `/proc/net/snmp` and `/proc/net/snmp6` files
 
diff --git a/plugins/inputs/nvidia_smi/README.md b/plugins/inputs/nvidia_smi/README.md
index e7685d652af83..bbe90e005c6d6 100644
--- a/plugins/inputs/nvidia_smi/README.md
+++ b/plugins/inputs/nvidia_smi/README.md
@@ -1,4 +1,4 @@
-# `nvidia-smi` Input Plugin
+# Nvidia System Management Interface (SMI) Input Plugin
 
 This plugin uses a query on the [`nvidia-smi`](https://developer.nvidia.com/nvidia-system-management-interface) binary to pull GPU stats including memory and GPU usage, temp and other.
 
diff --git a/plugins/inputs/openldap/README.md b/plugins/inputs/openldap/README.md
index cfd35b2cd7de3..fcb175bd430f8 100644
--- a/plugins/inputs/openldap/README.md
+++ b/plugins/inputs/openldap/README.md
@@ -1,4 +1,4 @@
-# Openldap Input Plugin
+# OpenLDAP Input Plugin
 
 This plugin gathers metrics from OpenLDAP's cn=Monitor backend.
 
diff --git a/plugins/inputs/pf/README.md b/plugins/inputs/pf/README.md
index 96a5ed4889a0d..83215d8f62f3a 100644
--- a/plugins/inputs/pf/README.md
+++ b/plugins/inputs/pf/README.md
@@ -1,4 +1,4 @@
-# PF Plugin
+# PF Input Plugin
 
 The pf plugin gathers information from the FreeBSD/OpenBSD pf firewall. Currently it can retrieve information about the state table: the number of current entries in the table, and counters for the number of searches, inserts, and removals to the table.
 
diff --git a/plugins/inputs/postgresql/README.md b/plugins/inputs/postgresql/README.md
index fbc9f7680967a..627fd2dbbfa88 100644
--- a/plugins/inputs/postgresql/README.md
+++ b/plugins/inputs/postgresql/README.md
@@ -1,4 +1,4 @@
-# PostgreSQL plugin
+# PostgreSQL Input Plugin
 
 This postgresql plugin provides metrics for your postgres database. It currently works with postgres versions 8.1+. It uses data from the built in _pg_stat_database_ and pg_stat_bgwriter views. The metrics recorded depend on your version of postgres. See table:
 ```
diff --git a/plugins/inputs/postgresql_extensible/README.md b/plugins/inputs/postgresql_extensible/README.md
index 1911aca537a3c..abbdd07f43d1b 100644
--- a/plugins/inputs/postgresql_extensible/README.md
+++ b/plugins/inputs/postgresql_extensible/README.md
@@ -1,4 +1,4 @@
-# PostgreSQL plugin
+# PostgreSQL Extensible Input Plugin
 
 This postgresql plugin provides metrics for your postgres database. It has been
 designed to parse SQL queries in the plugin section of your `telegraf.conf`.
diff --git a/plugins/inputs/puppetagent/README.md b/plugins/inputs/puppetagent/README.md
index 480f7531ddbff..8578db9eb0a52 100644
--- a/plugins/inputs/puppetagent/README.md
+++ b/plugins/inputs/puppetagent/README.md
@@ -1,4 +1,4 @@
-## Telegraf Plugin: PuppetAgent
+# PuppetAgent Input Plugin
 
 #### Description
 
diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 75223520ffd81..f62b9db6e3f61 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -1,4 +1,4 @@
-# Telegraf Plugin: Redis
+# Redis Input Plugin
 
 ### Configuration:
 
diff --git a/plugins/inputs/rethinkdb/README.md b/plugins/inputs/rethinkdb/README.md
index d10453acee9d7..b1946644ea13a 100644
--- a/plugins/inputs/rethinkdb/README.md
+++ b/plugins/inputs/rethinkdb/README.md
@@ -1,4 +1,4 @@
-# RethinkDB Input
+# RethinkDB Input Plugin
 
 Collect metrics from [RethinkDB](https://www.rethinkdb.com/).
 
diff --git a/plugins/inputs/riak/README.md b/plugins/inputs/riak/README.md
index c36624d273dd7..a435eea4d7f63 100644
--- a/plugins/inputs/riak/README.md
+++ b/plugins/inputs/riak/README.md
@@ -1,4 +1,4 @@
-# Riak Plugin
+# Riak Input Plugin
 
 The Riak plugin gathers metrics from one or more riak instances.
 
diff --git a/plugins/inputs/sensors/README.md b/plugins/inputs/sensors/README.md
index 1d900047cd3e4..d9bcfe2e4544d 100644
--- a/plugins/inputs/sensors/README.md
+++ b/plugins/inputs/sensors/README.md
@@ -1,4 +1,4 @@
-# sensors Input Plugin
+# LM Sensors Input Plugin
 
 Collect [lm-sensors](https://en.wikipedia.org/wiki/Lm_sensors) metrics - requires the lm-sensors
 package installed.
diff --git a/plugins/inputs/snmp_legacy/README.md b/plugins/inputs/snmp_legacy/README.md
index bee78322803be..06bebbcad6176 100644
--- a/plugins/inputs/snmp_legacy/README.md
+++ b/plugins/inputs/snmp_legacy/README.md
@@ -1,4 +1,4 @@
-# SNMP Input Plugin
+# SNMP Legacy Input Plugin
 
 The SNMP input plugin gathers metrics from SNMP agents
 
diff --git a/plugins/inputs/socket_listener/README.md b/plugins/inputs/socket_listener/README.md
index 840b92709ada4..f5189a195af9d 100644
--- a/plugins/inputs/socket_listener/README.md
+++ b/plugins/inputs/socket_listener/README.md
@@ -1,4 +1,4 @@
-# socket listener service input plugin
+# Socket Listener Input Plugin
 
 The Socket Listener is a service input plugin that listens for messages from
 streaming (tcp, unix) or datagram (udp, unixgram) protocols.
diff --git a/plugins/inputs/solr/README.md b/plugins/inputs/solr/README.md
index e1d22cac6315b..c20fa92836c70 100644
--- a/plugins/inputs/solr/README.md
+++ b/plugins/inputs/solr/README.md
@@ -1,4 +1,4 @@
-# Solr input plugin
+# Solr Input Plugin
 
 The [solr](http://lucene.apache.org/solr/) plugin collects stats via the
 [MBean Request Handler](https://cwiki.apache.org/confluence/display/solr/MBean+Request+Handler)
diff --git a/plugins/inputs/statsd/README.md b/plugins/inputs/statsd/README.md
index 79f7598173350..57953eed72600 100644
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@@ -1,4 +1,4 @@
-# Telegraf Service Plugin: statsd
+# StatsD Input Plugin
 
 ### Configuration
 
diff --git a/plugins/inputs/systemd_units/README.md b/plugins/inputs/systemd_units/README.md
index f6b8796f968b1..fc8306dee2da9 100644
--- a/plugins/inputs/systemd_units/README.md
+++ b/plugins/inputs/systemd_units/README.md
@@ -1,4 +1,4 @@
-# Systemd Units Plugin
+# systemd Units Input Plugin
 
 The systemd_units plugin gathers systemd unit status on Linux. It relies on
 `systemctl list-units --all --type=service` to collect data on service status.
diff --git a/plugins/inputs/tcp_listener/README.md b/plugins/inputs/tcp_listener/README.md
index f858c7179c783..aeb29e2b49d35 100644
--- a/plugins/inputs/tcp_listener/README.md
+++ b/plugins/inputs/tcp_listener/README.md
@@ -1,4 +1,4 @@
-# TCP listener service input plugin
+# TCP Listener Input Plugin
 
 > DEPRECATED: As of version 1.3 the TCP listener plugin has been deprecated in favor of the
 > [socket_listener plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener)
diff --git a/plugins/inputs/temp/README.md b/plugins/inputs/temp/README.md
index 8398d25ca2d7c..95db4a3bb786f 100644
--- a/plugins/inputs/temp/README.md
+++ b/plugins/inputs/temp/README.md
@@ -1,4 +1,4 @@
-# Temp Input plugin
+# Temperature Input Plugin
 
 The temp input plugin gather metrics on system temperature.  This plugin is
 meant to be multi platform and uses platform specific collection methods.
diff --git a/plugins/inputs/udp_listener/README.md b/plugins/inputs/udp_listener/README.md
index 6228090b67be2..921e8dbf1eac3 100644
--- a/plugins/inputs/udp_listener/README.md
+++ b/plugins/inputs/udp_listener/README.md
@@ -1,4 +1,4 @@
-# UDP listener service input plugin
+# UDP Listener Input Plugin
 
 > DEPRECATED: As of version 1.3 the UDP listener plugin has been deprecated in favor of the
 > [socket_listener plugin](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener)
diff --git a/plugins/inputs/uwsgi/README.md b/plugins/inputs/uwsgi/README.md
index c4d41a02d4d74..9a6d42764e3ef 100644
--- a/plugins/inputs/uwsgi/README.md
+++ b/plugins/inputs/uwsgi/README.md
@@ -1,4 +1,4 @@
-# uWSGI
+# uWSGI Input Plugin
 
 The uWSGI input plugin gathers metrics about uWSGI using its [Stats Server](https://uwsgi-docs.readthedocs.io/en/latest/StatsServer.html).
 
diff --git a/plugins/inputs/webhooks/README.md b/plugins/inputs/webhooks/README.md
index c6c7daf355116..2eea2a537adee 100644
--- a/plugins/inputs/webhooks/README.md
+++ b/plugins/inputs/webhooks/README.md
@@ -1,4 +1,4 @@
-# Webhooks
+# Webhooks Input Plugin
 
 This is a Telegraf service plugin that start an http server and register multiple webhook listeners.
 
diff --git a/plugins/inputs/win_perf_counters/README.md b/plugins/inputs/win_perf_counters/README.md
index 50e7b2c335427..1bb4bcb34a7ff 100644
--- a/plugins/inputs/win_perf_counters/README.md
+++ b/plugins/inputs/win_perf_counters/README.md
@@ -1,4 +1,4 @@
-# win_perf_counters readme
+# Windows Performance Counters Input Plugin
 
 This document presents the input plugin to read Performance Counters on Windows operating systems.
 
diff --git a/plugins/inputs/x509_cert/README.md b/plugins/inputs/x509_cert/README.md
index 074bbc58c1c10..760813ecc7adb 100644
--- a/plugins/inputs/x509_cert/README.md
+++ b/plugins/inputs/x509_cert/README.md
@@ -1,4 +1,4 @@
-# X509 Cert Input Plugin
+# x509 Certificate Input Plugin
 
 This plugin provides information about X509 certificate accessible via local
 file or network connection.
diff --git a/plugins/inputs/zfs/README.md b/plugins/inputs/zfs/README.md
index e22156bc65b9f..f0e71a47d714c 100644
--- a/plugins/inputs/zfs/README.md
+++ b/plugins/inputs/zfs/README.md
@@ -1,4 +1,4 @@
-# ZFS plugin
+# ZFS Input Plugin
 
 This ZFS plugin provides metrics from your ZFS filesystems. It supports ZFS on
 Linux and FreeBSD. It gets ZFS stat from `/proc/spl/kstat/zfs` on Linux and
diff --git a/plugins/inputs/zipkin/README.md b/plugins/inputs/zipkin/README.md
index b3ff82c1306f6..f07ca6e55afad 100644
--- a/plugins/inputs/zipkin/README.md
+++ b/plugins/inputs/zipkin/README.md
@@ -1,4 +1,4 @@
-# Zipkin Plugin
+# Zipkin Input Plugin
 
 This plugin implements the Zipkin http server to gather trace and timing data needed to troubleshoot latency problems in microservice architectures.
 
diff --git a/plugins/inputs/zookeeper/README.md b/plugins/inputs/zookeeper/README.md
index 23009c519b64a..0ce7f442a4bba 100644
--- a/plugins/inputs/zookeeper/README.md
+++ b/plugins/inputs/zookeeper/README.md
@@ -1,4 +1,4 @@
-## Zookeeper Input Plugin
+# Zookeeper Input Plugin
 
 The zookeeper plugin collects variables outputted from the 'mntr' command
 [Zookeeper Admin](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html).