diff --git a/dtca.tf b/dtca.tf
index dae3756..4eb7d1b 100644
--- a/dtca.tf
+++ b/dtca.tf
@@ -1,5 +1,5 @@
 resource "openstack_networking_port_v2" "dtcaport" {
-  name                = "${dtcaname}-sunet-se-port"
+  name                = "${var.caname}-sunet-se-port"
   network_id          = data.openstack_networking_network_v2.public.id
   # A list of security group ID
   security_group_ids  = [ 
@@ -14,7 +14,7 @@ resource "openstack_networking_port_v2" "dtcaport" {
 
 
 resource "openstack_networking_port_v2" "dtcadbport" {
-  name                = "${dtcadbname}-sunet-se-port"
+  name                = "${var.cadbname}-sunet-se-port"
   network_id          = data.openstack_networking_network_v2.public.id
   # A list of security group ID
   security_group_ids  = [
diff --git a/securitygroups.tf b/securitygroups.tf
index 27f8629..744c0b1 100644
--- a/securitygroups.tf
+++ b/securitygroups.tf
@@ -1,6 +1,6 @@
 # Datasource of sunet ssh-from-jumphost security group.
 data "openstack_networking_secgroup_v2" "sshfromjumphosts" {
-  name = "ssh-from-jumphost"
+  name = "Allow SSH from SUNET jumphosts"
 }
 
 data "openstack_networking_secgroup_v2" "allegress" {
diff --git a/.tfvars b/terraform.tfvars
similarity index 100%
rename from .tfvars
rename to terraform.tfvars