diff --git a/pkg/cmd/codespace/create.go b/pkg/cmd/codespace/create.go
index a558f4c67..70ad8928d 100644
--- a/pkg/cmd/codespace/create.go
+++ b/pkg/cmd/codespace/create.go
@@ -266,9 +266,7 @@ func getMachineName(ctx context.Context, apiClient apiClient, repoID int, machin
 	machineNames := make([]string, 0, len(machines))
 	machineByName := make(map[string]*api.Machine)
 	for _, m := range machines {
-		nameParts := camelcase.Split(m.Name)
-		machineName := strings.Title(strings.ToLower(nameParts[0]))
-		machineName = fmt.Sprintf("%s - %s", machineName, m.DisplayName)
+		machineName: = m.DisplayName
 		machineNames = append(machineNames, machineName)
 		machineByName[machineName] = m
 	}