diff --git a/website/docs/d/s3_objects.html.markdown b/website/docs/d/s3_objects.html.markdown
index 1b488786070..7ae4c32cbf8 100644
--- a/website/docs/d/s3_objects.html.markdown
+++ b/website/docs/d/s3_objects.html.markdown
@@ -10,7 +10,7 @@ description: |-
 
 ~> **NOTE on `max_keys`:** Retrieving very large numbers of keys can adversely affect Terraform's performance.
 
-The bucket-objects data source returns keys (i.e., file names) and other metadata about objects in an S3 bucket.
+The objects data source returns keys (i.e., file names) and other metadata about objects in an S3 bucket.
 
 ## Example Usage
 
diff --git a/website/docs/r/cloudtrail.html.markdown b/website/docs/r/cloudtrail.html.markdown
index 279b5155578..363aadab7d9 100644
--- a/website/docs/r/cloudtrail.html.markdown
+++ b/website/docs/r/cloudtrail.html.markdown
@@ -151,7 +151,7 @@ resource "aws_cloudtrail" "example" {
   # ... other configuration ...
 
   advanced_event_selector {
-    name = "Log all S3 buckets objects events except for two S3 buckets"
+    name = "Log all S3 objects events except for two S3 buckets"
 
     field_selector {
       field  = "eventCategory"
diff --git a/website/docs/r/s3_object.html.markdown b/website/docs/r/s3_object.html.markdown
index d690538279d..fad048f3b29 100644
--- a/website/docs/r/s3_object.html.markdown
+++ b/website/docs/r/s3_object.html.markdown
@@ -40,7 +40,7 @@ resource "aws_s3_bucket" "examplebucket" {
   acl    = "private"
 }
 
-resource "aws_s3_object" "examplebucket_object" {
+resource "aws_s3_object" "example" {
   key        = "someobject"
   bucket     = aws_s3_bucket.examplebucket.id
   source     = "index.html"
@@ -56,7 +56,7 @@ resource "aws_s3_bucket" "examplebucket" {
   acl    = "private"
 }
 
-resource "aws_s3_object" "examplebucket_object" {
+resource "aws_s3_object" "example" {
   key                    = "someobject"
   bucket                 = aws_s3_bucket.examplebucket.id
   source                 = "index.html"
@@ -72,7 +72,7 @@ resource "aws_s3_bucket" "examplebucket" {
   acl    = "private"
 }
 
-resource "aws_s3_object" "examplebucket_object" {
+resource "aws_s3_object" "example" {
   key                    = "someobject"
   bucket                 = aws_s3_bucket.examplebucket.id
   source                 = "index.html"
@@ -96,7 +96,7 @@ resource "aws_s3_bucket" "examplebucket" {
   }
 }
 
-resource "aws_s3_object" "examplebucket_object" {
+resource "aws_s3_object" "example" {
   key    = "someobject"
   bucket = aws_s3_bucket.examplebucket.id
   source = "important.txt"