diff --git a/website/source/docs/providers/aws/r/waf_byte_match_set.html.markdown b/website/source/docs/providers/aws/r/waf_byte_match_set.html.markdown
index 49ad7534ef..8c33eec7cf 100644
--- a/website/source/docs/providers/aws/r/waf_byte_match_set.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_byte_match_set.html.markdown
@@ -6,6 +6,10 @@ description: |-
   Provides a AWS WAF ByteMatchSet resource.
 ---
 
+# aws\_waf\_byte\_match\_set
+
+Provides a WAF Byte Match Set Resource
+
 ## Example Usage
 
 ```
diff --git a/website/source/docs/providers/aws/r/waf_ipset.html.markdown b/website/source/docs/providers/aws/r/waf_ipset.html.markdown
index 1118dad65c..9fd590b8d1 100644
--- a/website/source/docs/providers/aws/r/waf_ipset.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_ipset.html.markdown
@@ -6,6 +6,10 @@ description: |-
   Provides a AWS WAF IPSet resource.
 ---
 
+# aws\_waf\_ipset
+
+Provides a WAF IPSet Resource
+
 ## Example Usage
 
 ```
diff --git a/website/source/docs/providers/aws/r/waf_rule.html.markdown b/website/source/docs/providers/aws/r/waf_rule.html.markdown
index 47f504aa88..017940f493 100644
--- a/website/source/docs/providers/aws/r/waf_rule.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_rule.html.markdown
@@ -6,6 +6,10 @@ description: |-
   Provides a AWS WAF rule resource.
 ---
 
+# aws\_waf\_rule
+
+Provides a WAF Rule Resource
+
 ## Example Usage
 
 ```
diff --git a/website/source/docs/providers/aws/r/waf_size_constraint_set.html.markdown b/website/source/docs/providers/aws/r/waf_size_constraint_set.html.markdown
index 8c4f914daf..6d8c32af80 100644
--- a/website/source/docs/providers/aws/r/waf_size_constraint_set.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_size_constraint_set.html.markdown
@@ -6,6 +6,10 @@ description: |-
   Provides a AWS WAF SizeConstraintSet resource.
 ---
 
+# aws\_waf\_size\_constraint\_set
+
+Provides a WAF Size Constraint Set Resource
+
 ## Example Usage
 
 ```
diff --git a/website/source/docs/providers/aws/r/waf_sql_injection_match_set.html.markdown b/website/source/docs/providers/aws/r/waf_sql_injection_match_set.html.markdown
index ef6ca3ce59..b7638fc572 100644
--- a/website/source/docs/providers/aws/r/waf_sql_injection_match_set.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_sql_injection_match_set.html.markdown
@@ -6,6 +6,10 @@ description: |-
   Provides a AWS WAF SqlInjectionMatchSet resource.
 ---
 
+# aws\_waf\_sql\_injection\_match\_set
+
+Provides a WAF SQL Injection Match Set Resource
+
 ## Example Usage
 
 ```
diff --git a/website/source/docs/providers/aws/r/waf_web_acl.html.markdown b/website/source/docs/providers/aws/r/waf_web_acl.html.markdown
index 794a9d19a7..fb96a86870 100644
--- a/website/source/docs/providers/aws/r/waf_web_acl.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_web_acl.html.markdown
@@ -1,11 +1,15 @@
 ---
 layout: "aws"
 page_title: "AWS: aws_waf_web_acl"
-sidebar_current: "docs-aws-resource-waf"
+sidebar_current: "docs-aws-resource-waf-webacl"
 description: |-
   Provides a AWS WAF web access control group (ACL) resource.
 ---
 
+# aws\_waf\_web\_acl
+
+Provides a WAF Web ACL Resource
+
 ## Example Usage
 
 ```
@@ -54,8 +58,6 @@ The following arguments are supported:
 * `rules` - (Required) The rules to associate with the web ACL and the settings for each rule.
 
 
-## Remarks
-
 ## Attributes Reference
 
 The following attributes are exported:
diff --git a/website/source/docs/providers/aws/r/waf_xss_match_set.html.markdown b/website/source/docs/providers/aws/r/waf_xss_match_set.html.markdown
index 63dfe2a52b..e22c49cdc9 100644
--- a/website/source/docs/providers/aws/r/waf_xss_match_set.html.markdown
+++ b/website/source/docs/providers/aws/r/waf_xss_match_set.html.markdown
@@ -6,6 +6,10 @@ description: |-
   Provides a AWS WAF XssMatchSet resource.
 ---
 
+# aws\_waf\_xss\_match\_set
+
+Provides a WAF XSS Match Set Resource
+
 ## Example Usage
 
 ```
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index c917feedf1..c70c9c2a96 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -816,11 +816,11 @@
                   </li>
 
                   <li<%= sidebar_current("docs-aws-resource-waf-rule") %>>
-                    <a href="/docs/providers/aws/r/aws_waf_rule.html">aws_waf_rule</a>
+                    <a href="/docs/providers/aws/r/waf_rule.html">aws_waf_rule</a>
                   </li>
 
                   <li<%= sidebar_current("docs-aws-resource-waf-ipset") %>>
-                    <a href="/docs/providers/aws/r/aws_waf_ipset.html">aws_waf_ipset</a>
+                    <a href="/docs/providers/aws/r/waf_ipset.html">aws_waf_ipset</a>
                   </li>
                   
                   <li<%= sidebar_current("docs-aws-resource-waf-xss-match-set") %>>
@@ -828,7 +828,7 @@
                   </li>
 
                   <li<%= sidebar_current("docs-aws-resource-waf-sql-injection-match-set") %>>
-                    <a href="/docs/providers/aws/r/aws_waf_sql_injection_match_set.html">aws_waf_sql_injection_match_set</a>
+                    <a href="/docs/providers/aws/r/waf_sql_injection_match_set.html">aws_waf_sql_injection_match_set</a>
                   </li>
 
                 </ul>