diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index b7fd18b0c293df8155f1123ac3980d4ae7ad74cd..ebee96ffca252958fecc98b680322d5d20e3cd6e 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -234,14 +234,13 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
 	if len(cc.Nodes) == 1 || n.ControlPlane {
 		return cc.Name
 	}
-	return fmt.Sprintf("%s-%s", cc.Name, n.Name)
+	return fmt.Sprintf("%s---%s", cc.Name, n.Name)
 }
 
 // ClusterNameFromMachine retrieves the cluster name embedded in the machine name
 func ClusterNameFromMachine(name string) string {
-	if strings.Contains(name, "-") {
-		a := strings.Split(name, "-")
-		return strings.Join(a[0:len(a)-2], "-")
+	if strings.Contains(name, "---") {
+		return strings.Split(name, "---")[0]
 	}
 	return name
 }