diff --git a/website/source/docs/builders/digitalocean.html.markdown b/website/source/docs/builders/digitalocean.html.markdown
index ba4cba4e5..1c11d2d3b 100644
--- a/website/source/docs/builders/digitalocean.html.markdown
+++ b/website/source/docs/builders/digitalocean.html.markdown
@@ -52,9 +52,9 @@ Optional:
   which is the 512MB droplet.
 
 * `snapshot_name` (string) - The name of the resulting snapshot that will
-  appear in your account. This must be unique. To help make this unique,
-  certain template parameters are available for this value, and are documented
-  below.
+  appear in your account. This must be unique.
+  To help make this unique, use a function like `timestamp` (see
+  [configuration templates](/docs/templates/configuration-templates.html) for more info)
 
 * `ssh_port` (int) - The port that SSH will be available on. Defaults to port
   22.
@@ -83,17 +83,6 @@ own access tokens:
 }
 </pre>
 
-## Snapshot Name Variables
-
-The `snapshot_name` for a DigitalOcean image must be unique. The configuration
-variable is actually treated as a [configuration template](/docs/templates/configuration-templates.html) and has various variables available to help keep this unique. Read
-the prior linked page for information on syntax if you're unfamiliar with it.
-
-The available variables are shown below:
-
-* `CreateTime` - This will be replaced with the Unix timestamp of when the
-  image is created.
-
 ## Finding Image, Region, and Size IDs
 
 Unfortunately, finding a list of available values for `image_id`, `region_id`,
diff --git a/website/source/docs/templates/introduction.html.markdown b/website/source/docs/templates/introduction.html.markdown
index a1674dcff..8010ec922 100644
--- a/website/source/docs/templates/introduction.html.markdown
+++ b/website/source/docs/templates/introduction.html.markdown
@@ -33,7 +33,7 @@ Along with each key, it is noted whether it is required or not.
   information on how to define and configure a provisioner, read the
   sub-section on [configuring provisioners in templates](/docs/templates/provisioners.html).
 
-* `post-processors` (optional) is an array of one or more objects that defines the 
+* `post-processors` (optional) is an array of one or more objects that defines the
   various post-processing steps to take with the built images. This is an optional
   field. If not specified, then no post-processing will be done. For more
   information on what post-processors do and how they're defined, read the
@@ -56,7 +56,7 @@ missing valid AWS access keys. Otherwise, it would work properly with
       "source_ami": "ami-de0d9eb7",
       "instance_type": "t1.micro",
       "ssh_username": "ubuntu",
-      "ami_name": "packer {{.CreateTime}}"
+      "ami_name": "packer {{timestamp}}"
     }
   ],
 
diff --git a/website/source/intro/getting-started/build-image.html.markdown b/website/source/intro/getting-started/build-image.html.markdown
index 7f15f2977..7e91de208 100644
--- a/website/source/intro/getting-started/build-image.html.markdown
+++ b/website/source/intro/getting-started/build-image.html.markdown
@@ -54,7 +54,7 @@ briefly. Create a file `example.json` and fill it with the following contents:
     "source_ami": "ami-de0d9eb7",
     "instance_type": "t1.micro",
     "ssh_username": "ubuntu",
-    "ami_name": "packer-example {{.CreateTime}}"
+    "ami_name": "packer-example {{timestamp}}"
   }]
 }
 </pre>