diff --git a/commands_test.go b/commands_test.go
index 1267533c31..dc166d34b3 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -52,7 +52,7 @@ func (d *FakeDriver) GetIP() (string, error) {
 	return "", nil
 }
 
-func (d *FakeDriver) GetSSHAddress() (string, error) {
+func (d *FakeDriver) GetSSHHostname() (string, error) {
 	return "", nil
 }
 
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
index 154dbd9125..8a69883cb7 100644
--- a/drivers/amazonec2/amazonec2.go
+++ b/drivers/amazonec2/amazonec2.go
@@ -419,7 +419,7 @@ func (d *Driver) GetState() (state.State, error) {
 	return state.None, nil
 }
 
-func (d *Driver) GetSSHAddress() (string, error) {
+func (d *Driver) GetSSHHostname() (string, error) {
 	// TODO: use @nathanleclaire retry func here (ehazlett)
 	return d.GetIP()
 }
diff --git a/drivers/drivers.go b/drivers/drivers.go
index cb9cdc28cd..623be64bab 100644
--- a/drivers/drivers.go
+++ b/drivers/drivers.go
@@ -39,7 +39,7 @@ type Driver interface {
 	GetMachineName() string
 
 	// GetSSHHostname returns hostname for use with ssh
-	GetSSHAddress() (string, error)
+	GetSSHHostname() (string, error)
 
 	// GetSSHKeyPath returns key path for use with ssh
 	GetSSHKeyPath() string
diff --git a/drivers/none/none.go b/drivers/none/none.go
index 41d379c8b0..4f32148756 100644
--- a/drivers/none/none.go
+++ b/drivers/none/none.go
@@ -62,7 +62,7 @@ func (d *Driver) GetMachineName() string {
 	return ""
 }
 
-func (d *Driver) GetSSHAddress() (string, error) {
+func (d *Driver) GetSSHHostname() (string, error) {
 	return "", nil
 }
 
diff --git a/host.go b/host.go
index 5f010d51c1..5156c442e5 100644
--- a/host.go
+++ b/host.go
@@ -525,7 +525,7 @@ func (h *Host) Provision() error {
 }
 
 func (h *Host) GetSSHCommand(args ...string) (*exec.Cmd, error) {
-	addr, err := h.Driver.GetSSHAddress()
+	addr, err := h.Driver.GetSSHHostname()
 	if err != nil {
 		return nil, err
 	}