diff --git a/internal/core/machine.go b/internal/core/machine.go
index 53e6062a2..6c8713432 100644
--- a/internal/core/machine.go
+++ b/internal/core/machine.go
@@ -244,7 +244,7 @@ func (m *Machine) SyncedFolders() (folders []*core.MachineSyncedFolder, err erro
 func (m *Machine) SaveMachine() (err error) {
 	m.logger.Debug("saving machine to db", "machine", m.machine.Id)
 	m.target.Record, err = ptypes.MarshalAny(m.machine)
-	m.target.ResourceId = m.machine.Id
+	m.target.Uuid = m.machine.Id
 	if err != nil {
 		return nil
 	}
diff --git a/internal/core/machine_test.go b/internal/core/machine_test.go
index 957b46fdd..0684abe48 100644
--- a/internal/core/machine_test.go
+++ b/internal/core/machine_test.go
@@ -28,7 +28,7 @@ func TestMachineSetValidId(t *testing.T) {
 	if err != nil {
 		t.Errorf("Failed to get target")
 	}
-	require.Equal(t, dbTarget.Target.ResourceId, "something")
+	require.Equal(t, dbTarget.Target.Uuid, "something")
 }
 
 func TestMachineSetEmptyId(t *testing.T) {