diff --git a/m6_solution/instances.tf b/m6_solution/instances.tf
index 83c42ee..2cf069e 100644
--- a/m6_solution/instances.tf
+++ b/m6_solution/instances.tf
@@ -14,8 +14,8 @@ data "aws_ssm_parameter" "ami" {
 resource "aws_instance" "nginx1" {
   ami                    = nonsensitive(data.aws_ssm_parameter.ami.value)
   instance_type          = var.instance_type
-  subnet_id              = aws_subnet.subnet1.id
-  vpc_security_group_ids = [aws_security_group.nginx-sg.id]
+  subnet_id              = aws_subnet.public_subnet1.id
+  vpc_security_group_ids = [aws_security_group.nginx_sg.id]
   iam_instance_profile   = aws_iam_instance_profile.nginx_profile.name
   depends_on             = [aws_iam_role_policy.allow_s3_all]
 
@@ -37,8 +37,8 @@ EOF
 resource "aws_instance" "nginx2" {
   ami                    = nonsensitive(data.aws_ssm_parameter.ami.value)
   instance_type          = var.instance_type
-  subnet_id              = aws_subnet.subnet2.id
-  vpc_security_group_ids = [aws_security_group.nginx-sg.id]
+  subnet_id              = aws_subnet.public_subnet2.id
+  vpc_security_group_ids = [aws_security_group.nginx_sg.id]
   iam_instance_profile   = aws_iam_instance_profile.nginx_profile.name
   depends_on             = [aws_iam_role_policy.allow_s3_all]
 
diff --git a/m6_solution/s3.tf b/m6_solution/s3.tf
index d47491a..41dc896 100644
--- a/m6_solution/s3.tf
+++ b/m6_solution/s3.tf
@@ -63,4 +63,7 @@ resource "aws_s3_object" "graphic" {
 
   tags = local.common_tags
 
-}
\ No newline at end of file
+}
+
+# doesn't match the videos - missing aws_iam_role & aws_iam_role_policy
+# (which apparently aren't needed but aren't consistent with video?)
\ No newline at end of file
diff --git a/m8_solution/modules/globo-web-app-s3/main.tf b/m8_solution/modules/globo-webapp-s3/main.tf
similarity index 100%
rename from m8_solution/modules/globo-web-app-s3/main.tf
rename to m8_solution/modules/globo-webapp-s3/main.tf
diff --git a/m8_solution/modules/globo-web-app-s3/outputs.tf b/m8_solution/modules/globo-webapp-s3/outputs.tf
similarity index 100%
rename from m8_solution/modules/globo-web-app-s3/outputs.tf
rename to m8_solution/modules/globo-webapp-s3/outputs.tf
diff --git a/m8_solution/modules/globo-web-app-s3/terraform.tf b/m8_solution/modules/globo-webapp-s3/terraform.tf
similarity index 100%
rename from m8_solution/modules/globo-web-app-s3/terraform.tf
rename to m8_solution/modules/globo-webapp-s3/terraform.tf
diff --git a/m8_solution/modules/globo-web-app-s3/variables.tf b/m8_solution/modules/globo-webapp-s3/variables.tf
similarity index 100%
rename from m8_solution/modules/globo-web-app-s3/variables.tf
rename to m8_solution/modules/globo-webapp-s3/variables.tf
diff --git a/m8_solution/network.tf b/m8_solution/network.tf
index 166ccd3..d9db3bb 100644
--- a/m8_solution/network.tf
+++ b/m8_solution/network.tf
@@ -21,10 +21,10 @@ module "app" {
   # Assumes 8 bits to be added to the CIDR range for the VPC
   public_subnets = [for subnet in range(var.vpc_public_subnet_count) : cidrsubnet(var.vpc_cidr_block, 8, subnet)]
 
-  enable_nat_gateway = false
-  enable_vpn_gateway = false
+  enable_nat_gateway      = false
+  enable_vpn_gateway      = false
   map_public_ip_on_launch = var.map_public_ip_on_launch
-  enable_dns_hostnames = var.enable_dns_hostnames
+  enable_dns_hostnames    = var.enable_dns_hostnames
 
   tags = merge(local.common_tags, {
     Name = "${local.naming_prefix}-vpc"