Cleaning up some naming standards (#99)

# Just gravitating to better naming standards for resources and variables. 

Just do the best we can with the flat model.  Lot's of past sins still left with poorly named resources.

app-infrastructure/dictionary-instance.tf

@@ -1,10 +1,10 @@
-data "template_file" "dictionary-user_data" {
+data "template_file" "dictionary-user-data-template" {
   template = file("scripts/dictionary-user_data.sh")
   vars = {
     stack_githash   = var.stack_githash_long
     stack_s3_bucket = var.stack_s3_bucket
     target_stack    = var.target_stack
-    dataset_s3_object_key = var.dataset-s3-object-key
+    dataset_s3_object_key = var.dataset_s3_object_key
     gss_prefix      = "bdc_${var.env_is_open_access ? "open" : "auth"}_${var.environment_name}"
   }
 }
@@ -16,7 +16,7 @@ data "template_cloudinit_config" "dictionary-user-data" {
   # user_data
   part {
     content_type = "text/x-shellscript"
-    content      = data.template_file.dictionary-user_data.rendered
+    content      = data.template_file.dictionary-user-data-template.rendered
   }
 
 }