diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index 8b3b674de..9996c4478 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -34,7 +34,7 @@ type Config struct {
 	SourceAmi      string     `mapstructure:"source_ami"`
 	UnmountCommand string     `mapstructure:"unmount_command"`
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type Builder struct {
@@ -48,7 +48,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	b.config.tpl, err = common.NewTemplate()
+	b.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go
index 48d7a090f..10ce2eba2 100644
--- a/builder/amazon/common/access_config.go
+++ b/builder/amazon/common/access_config.go
@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 	"github.com/mitchellh/goamz/aws"
-	"github.com/mitchellh/packer/common"
+	"github.com/mitchellh/packer/packer"
 	"strings"
 	"unicode"
 )
@@ -37,10 +37,10 @@ func (c *AccessConfig) Region() (aws.Region, error) {
 	return aws.Regions[region], nil
 }
 
-func (c *AccessConfig) Prepare(t *common.Template) []error {
+func (c *AccessConfig) Prepare(t *packer.ConfigTemplate) []error {
 	if t == nil {
 		var err error
-		t, err = common.NewTemplate()
+		t, err = packer.NewConfigTemplate()
 		if err != nil {
 			return []error{err}
 		}
diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go
index ac992c19e..c261cca77 100644
--- a/builder/amazon/common/ami_config.go
+++ b/builder/amazon/common/ami_config.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/common"
+	"github.com/mitchellh/packer/packer"
 )
 
 // AMIConfig is for common configuration related to creating AMIs.
@@ -14,10 +14,10 @@ type AMIConfig struct {
 	AMIProductCodes []string `mapstructure:"ami_product_codes"`
 }
 
-func (c *AMIConfig) Prepare(t *common.Template) []error {
+func (c *AMIConfig) Prepare(t *packer.ConfigTemplate) []error {
 	if t == nil {
 		var err error
-		t, err = common.NewTemplate()
+		t, err = packer.NewConfigTemplate()
 		if err != nil {
 			return []error{err}
 		}
diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index d68026189..7ed6f85a6 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -3,7 +3,7 @@ package common
 import (
 	"errors"
 	"fmt"
-	"github.com/mitchellh/packer/common"
+	"github.com/mitchellh/packer/packer"
 	"os"
 	"time"
 )
@@ -27,10 +27,10 @@ type RunConfig struct {
 	sshTimeout time.Duration
 }
 
-func (c *RunConfig) Prepare(t *common.Template) []error {
+func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error {
 	if t == nil {
 		var err error
-		t, err = common.NewTemplate()
+		t, err = packer.NewConfigTemplate()
 		if err != nil {
 			return []error{err}
 		}
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index 087afe52a..d358005b2 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -28,7 +28,7 @@ type config struct {
 	// Tags for the AMI
 	Tags map[string]string
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type Builder struct {
@@ -42,7 +42,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	b.config.tpl, err = common.NewTemplate()
+	b.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index bd85be909..ad88e6d97 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -38,7 +38,7 @@ type Config struct {
 	X509KeyPath         string `mapstructure:"x509_key_path"`
 	X509UploadPath      string `mapstructure:"x509_upload_path"`
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type Builder struct {
@@ -52,7 +52,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	b.config.tpl, err = common.NewTemplate()
+	b.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go
index ac383be0c..6ba6a5b87 100644
--- a/builder/digitalocean/builder.go
+++ b/builder/digitalocean/builder.go
@@ -43,7 +43,7 @@ type config struct {
 	eventDelay   time.Duration
 	stateTimeout time.Duration
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type Builder struct {
@@ -57,7 +57,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	b.config.tpl, err = common.NewTemplate()
+	b.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/builder/virtualbox/builder.go b/builder/virtualbox/builder.go
index 970acb94e..dcb4867b8 100644
--- a/builder/virtualbox/builder.go
+++ b/builder/virtualbox/builder.go
@@ -57,7 +57,7 @@ type config struct {
 	bootWait        time.Duration ``
 	shutdownTimeout time.Duration ``
 	sshWaitTimeout  time.Duration ``
-	tpl             *common.Template
+	tpl             *packer.ConfigTemplate
 }
 
 func (b *Builder) Prepare(raws ...interface{}) error {
@@ -66,7 +66,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	b.config.tpl, err = common.NewTemplate()
+	b.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/builder/vmware/builder.go b/builder/vmware/builder.go
index 236992e28..9db092c0d 100644
--- a/builder/vmware/builder.go
+++ b/builder/vmware/builder.go
@@ -58,7 +58,7 @@ type config struct {
 	bootWait        time.Duration ``
 	shutdownTimeout time.Duration ``
 	sshWaitTimeout  time.Duration ``
-	tpl             *common.Template
+	tpl             *packer.ConfigTemplate
 }
 
 func (b *Builder) Prepare(raws ...interface{}) error {
@@ -67,7 +67,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	b.config.tpl, err = common.NewTemplate()
+	b.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/post-processor/vagrant/aws.go b/post-processor/vagrant/aws.go
index d7a18e87d..9454bc93c 100644
--- a/post-processor/vagrant/aws.go
+++ b/post-processor/vagrant/aws.go
@@ -17,7 +17,7 @@ type AWSBoxConfig struct {
 	OutputPath          string `mapstructure:"output"`
 	VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type AWSVagrantfileTemplate struct {
@@ -34,7 +34,7 @@ func (p *AWSBoxPostProcessor) Configure(raws ...interface{}) error {
 		return err
 	}
 
-	p.config.tpl, err = common.NewTemplate()
+	p.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/post-processor/vagrant/virtualbox.go b/post-processor/vagrant/virtualbox.go
index 793dba890..858449468 100644
--- a/post-processor/vagrant/virtualbox.go
+++ b/post-processor/vagrant/virtualbox.go
@@ -19,7 +19,7 @@ type VBoxBoxConfig struct {
 	OutputPath          string `mapstructure:"output"`
 	VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type VBoxVagrantfileTemplate struct {
@@ -36,7 +36,7 @@ func (p *VBoxBoxPostProcessor) Configure(raws ...interface{}) error {
 		return err
 	}
 
-	p.config.tpl, err = common.NewTemplate()
+	p.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/post-processor/vagrant/vmware.go b/post-processor/vagrant/vmware.go
index 3064fc6fd..a57f2ebc9 100644
--- a/post-processor/vagrant/vmware.go
+++ b/post-processor/vagrant/vmware.go
@@ -15,7 +15,7 @@ type VMwareBoxConfig struct {
 	OutputPath          string `mapstructure:"output"`
 	VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type VMwareBoxPostProcessor struct {
@@ -28,7 +28,7 @@ func (p *VMwareBoxPostProcessor) Configure(raws ...interface{}) error {
 		return err
 	}
 
-	p.config.tpl, err = common.NewTemplate()
+	p.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go
index 27e217983..c49047f65 100644
--- a/provisioner/file/provisioner.go
+++ b/provisioner/file/provisioner.go
@@ -17,7 +17,7 @@ type config struct {
 	// The remote path where the local file will be uploaded to.
 	Destination string
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type Provisioner struct {
@@ -30,7 +30,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	p.config.tpl, err = common.NewTemplate()
+	p.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go
index 67cd2a8dd..982eabebf 100644
--- a/provisioner/salt-masterless/provisioner.go
+++ b/provisioner/salt-masterless/provisioner.go
@@ -27,7 +27,7 @@ type Config struct {
 	// Where files will be copied before moving to the /srv/salt directory
 	TempConfigDir string `mapstructure:"temp_config_dir"`
 
-	tpl *common.Template
+	tpl *packer.ConfigTemplate
 }
 
 type Provisioner struct {
@@ -40,7 +40,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	p.config.tpl, err = common.NewTemplate()
+	p.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}
diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go
index d337cd360..b84461dfc 100644
--- a/provisioner/shell/provisioner.go
+++ b/provisioner/shell/provisioner.go
@@ -52,7 +52,7 @@ type config struct {
 	RawStartRetryTimeout string `mapstructure:"start_retry_timeout"`
 
 	startRetryTimeout time.Duration
-	tpl               *common.Template
+	tpl               *packer.ConfigTemplate
 }
 
 type Provisioner struct {
@@ -70,7 +70,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return err
 	}
 
-	p.config.tpl, err = common.NewTemplate()
+	p.config.tpl, err = packer.NewConfigTemplate()
 	if err != nil {
 		return err
 	}