diff --git a/.gitignore b/.gitignore
index f973aa9..61d8f8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,10 @@
 *.tfstate.backup
 
 # Module directory
-.terraform/
+.terraform
 *.zip
-.idea/
+.idea
+*.iml
 
 .build-harness
-build-harness
\ No newline at end of file
+build-harness
diff --git a/README.md b/README.md
index 63c0ce7..4b1c08a 100644
--- a/README.md
+++ b/README.md
@@ -27,13 +27,14 @@ It's 100% Open Source and licensed under the [MIT](LICENSE).
 
 
 
+
 ## Usage
 
 Include this repository as a module in your existing terraform code:
 
-```
+```hcl
 module "lambda_ami_backup" {
-  source = "git::https://github.com/cloudposse/tf_ami_backup.git?ref=tags/0.1.0"
+  source = "git::https://github.com/cloudposse/terraform-aws-ec2-ami-backup.git?ref=tags/0.3.2"
 
   name           = "${var.name}"
   stage          = "${var.stage}"
@@ -51,9 +52,10 @@ module "lambda_ami_backup" {
 ## Examples
 
 Example on excluding some of attached EBS volumes:
-```
+
+```hcl
 module "lambda_ami_backup" {
-  source = "git::https://github.com/cloudposse/tf_ami_backup.git?ref=tags/0.1.0"
+  source = "git::https://github.com/cloudposse/terraform-aws-ec2-ami-backup.git?ref=tags/0.3.2"
 
   name           = "${var.name}"
   stage          = "${var.stage}"
@@ -124,11 +126,11 @@ For additional context, refer to some of these links.
 
 File a GitHub [issue](https://github.com/cloudposse/terraform-aws-ec2-ami-backup/issues), send us an [email][email] or join our [Slack Community][slack].
 
-## Commerical Support
+## Commercial Support
 
 Work directly with our team of DevOps experts via email, slack, and video conferencing. 
 
-We provide *commercial support* for all of our [Open Source][github] projects. As a *Dedicated Support* customer, you have access to our team of subject matter experts at a fraction of the cost of a fulltime engineer. 
+We provide [*commercial support*][commercial_support] for all of our [Open Source][github] projects. As a *Dedicated Support* customer, you have access to our team of subject matter experts at a fraction of the cost of a full-time engineer. 
 
 [![E-Mail](https://img.shields.io/badge/email-hello@cloudposse.com-blue.svg)](mailto:hello@cloudposse.com)
 
@@ -138,7 +140,7 @@ We provide *commercial support* for all of our [Open Source][github] projects. A
 - **Bug Fixes.** We'll rapidly work to fix any bugs in our projects.
 - **Build New Terraform Modules.** We'll develop original modules to provision infrastructure.
 - **Cloud Architecture.** We'll assist with your cloud strategy and design.
-- **Implementation.** We'll provide hands on support to implement our reference architectures. 
+- **Implementation.** We'll provide hands-on support to implement our reference architectures. 
 
 
 ## Community Forum
@@ -228,6 +230,7 @@ Check out [our other projects][github], [apply for a job][jobs], or [hire us][hi
   [docs]: https://docs.cloudposse.com/
   [website]: https://cloudposse.com/
   [github]: https://github.com/cloudposse/
+  [commercial_support]: https://github.com/orgs/cloudposse/projects
   [jobs]: https://cloudposse.com/jobs/
   [hire]: https://cloudposse.com/contact/
   [slack]: https://slack.cloudposse.com/
diff --git a/README.yaml b/README.yaml
index f6f9d3f..fadaa41 100644
--- a/README.yaml
+++ b/README.yaml
@@ -54,9 +54,9 @@ description: |-
 usage: |-
   Include this repository as a module in your existing terraform code:
 
-  ```
+  ```hcl
   module "lambda_ami_backup" {
-    source = "git::https://github.com/cloudposse/tf_ami_backup.git?ref=tags/0.1.0"
+    source = "git::https://github.com/cloudposse/terraform-aws-ec2-ami-backup.git?ref=tags/0.3.2"
 
     name           = "${var.name}"
     stage          = "${var.stage}"
@@ -70,9 +70,10 @@ usage: |-
 
 examples: |-
   Example on excluding some of attached EBS volumes:
-  ```
+
+  ```hcl
   module "lambda_ami_backup" {
-    source = "git::https://github.com/cloudposse/tf_ami_backup.git?ref=tags/0.1.0"
+    source = "git::https://github.com/cloudposse/terraform-aws-ec2-ami-backup.git?ref=tags/0.3.2"
 
     name           = "${var.name}"
     stage          = "${var.stage}"
@@ -115,4 +116,4 @@ contributors:
   - name: "Konstantin B"
     github: "comeanother"
   - name: "Seth Chisamore"
-    github: "schisamo"  
\ No newline at end of file
+    github: "schisamo"  
diff --git a/main.tf b/main.tf
index 1cdd425..99a50a0 100644
--- a/main.tf
+++ b/main.tf
@@ -57,28 +57,28 @@ data "archive_file" "ami_cleanup" {
 }
 
 module "label" {
-  source    = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.1.0"
+  source    = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.7"
   namespace = "${var.namespace}"
   stage     = "${var.stage}"
   name      = "${var.name}"
 }
 
 module "label_backup" {
-  source    = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.1.0"
+  source    = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.7"
   namespace = "${var.namespace}"
   stage     = "${var.stage}"
   name      = "${var.name}-backup-${var.instance_id}"
 }
 
 module "label_cleanup" {
-  source    = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.1.0"
+  source    = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.7"
   namespace = "${var.namespace}"
   stage     = "${var.stage}"
   name      = "${var.name}-cleanup-${var.instance_id}"
 }
 
 module "label_role" {
-  source    = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.1.0"
+  source    = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.7"
   namespace = "${var.namespace}"
   stage     = "${var.stage}"
   name      = "${var.name}-${var.instance_id}"