diff --git a/README.md b/README.md
index c14a293e..6d5f5643 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# tf_cdn_s3
+# terraform-aws-cloudfront-s3-cdn
 
-Terraform module to easily provision CloudFront CDN with an S3 or custom origin.
+Terraform module to easily provision an AWS CloudFront CDN with an S3 or custom origin.
 
 ## Usage
 
-module "cdn_s3" {
-  source           = "git::https://github.com/cloudposse/tf_cdn_s3.git?ref=master"
+module "cdn" {
+  source           = "git::https://github.com/cloudposse/terraform-aws-cloudfront-s3-cdn.git?ref=master"
   namespace        = "${var.namespace}"
   stage            = "${var.stage}"
   name             = "${var.name}"
diff --git a/main.tf b/main.tf
index be1aadee..2f9c2d79 100644
--- a/main.tf
+++ b/main.tf
@@ -1,5 +1,5 @@
 module "origin_label" {
-  source     = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.2.0"
+  source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.1"
   namespace  = "${var.namespace}"
   stage      = "${var.stage}"
   name       = "${var.name}"
@@ -65,7 +65,7 @@ resource "aws_s3_bucket" "origin" {
 }
 
 module "logs" {
-  source                   = "git::https://github.com/cloudposse/tf_log_storage.git?ref=tags/0.1.0"
+  source                   = "git::https://github.com/cloudposse/terraform-aws-s3-log-storage.git?ref=tags/0.1.2"
   namespace                = "${var.namespace}"
   stage                    = "${var.stage}"
   name                     = "${var.name}"
@@ -79,7 +79,7 @@ module "logs" {
 }
 
 module "distribution_label" {
-  source    = "git::https://github.com/cloudposse/tf_label.git?ref=tags/0.2.0"
+  source    = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.1"
   namespace = "${var.namespace}"
   stage     = "${var.stage}"
   name      = "${var.name}"