diff --git a/demo/digitalocean/terraform/client/main.tf b/demo/digitalocean/terraform/client/main.tf
index 56d9fdd5e..19c5e67eb 100644
--- a/demo/digitalocean/terraform/client/main.tf
+++ b/demo/digitalocean/terraform/client/main.tf
@@ -15,7 +15,7 @@ resource "template_file" "client_config" {
 
 resource "digitalocean_droplet" "client" {
   image    = "${var.image}"
-  name     = "client-${var.region}-${count.index}"
+  name     = "nomad-client-${var.region}-${count.index}"
   count    = "${var.count}"
   size     = "${var.size}"
   region   = "${var.region}"
diff --git a/demo/digitalocean/terraform/server/main.tf b/demo/digitalocean/terraform/server/main.tf
index 278dc70c0..37a0e2aed 100644
--- a/demo/digitalocean/terraform/server/main.tf
+++ b/demo/digitalocean/terraform/server/main.tf
@@ -5,7 +5,7 @@ variable "ssh_keys" {}
 
 resource "digitalocean_droplet" "server" {
   image    = "${var.image}"
-  name     = "server-${var.region}-${count.index}"
+  name     = "nomad-server-${var.region}-${count.index}"
   count    = 3
   size     = "${var.size}"
   region   = "${var.region}"