diff --git a/Cargo.lock b/Cargo.lock
index d5a5655294..268e855769 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3086,7 +3086,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 [[package]]
 name = "openapi-lint"
 version = "0.2.0"
-source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#9b20f893f3ed53049bf2d0feddb6ff269401aa5f"
+source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#2609285115892882aa9a178c92a5d54377f1c51b"
 dependencies = [
  "heck 0.4.0",
  "indexmap",
@@ -5861,7 +5861,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
  "rand 0.8.5",
  "static_assertions",
 ]
diff --git a/common/src/api/internal/nexus.rs b/common/src/api/internal/nexus.rs
index 4572e1f876..8ae0199705 100644
--- a/common/src/api/internal/nexus.rs
+++ b/common/src/api/internal/nexus.rs
@@ -36,15 +36,15 @@ pub struct InstanceRuntimeState {
     /// runtime state of the Instance
     pub run_state: InstanceState,
     /// which sled is running this Instance
-    pub sled_uuid: Uuid,
+    pub sled_id: Uuid,
     /// which propolis-server is running this Instance
-    pub propolis_uuid: Uuid,
+    pub propolis_id: Uuid,
     /// the target propolis-server during a migration of this Instance
-    pub dst_propolis_uuid: Option<Uuid>,
+    pub dst_propolis_id: Option<Uuid>,
     /// address of propolis-server running this Instance
     pub propolis_addr: Option<SocketAddr>,
     /// migration id (if one in process)
-    pub migration_uuid: Option<Uuid>,
+    pub migration_id: Option<Uuid>,
     /// number of CPUs allocated for this Instance
     pub ncpus: InstanceCpuCount,
     /// memory allocated for this Instance
diff --git a/nexus-client/src/lib.rs b/nexus-client/src/lib.rs
index b4e25c5adc..49c2604cd7 100644
--- a/nexus-client/src/lib.rs
+++ b/nexus-client/src/lib.rs
@@ -62,11 +62,11 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
     ) -> Self {
         Self {
             run_state: s.run_state.into(),
-            sled_uuid: s.sled_uuid,
-            propolis_uuid: s.propolis_uuid,
-            dst_propolis_uuid: s.dst_propolis_uuid,
+            sled_id: s.sled_id,
+            propolis_id: s.propolis_id,
+            dst_propolis_id: s.dst_propolis_id,
             propolis_addr: s.propolis_addr.map(|addr| addr.to_string()),
-            migration_uuid: s.migration_uuid,
+            migration_id: s.migration_id,
             ncpus: s.ncpus.into(),
             memory: s.memory.into(),
             hostname: s.hostname,
diff --git a/nexus/src/app/instance.rs b/nexus/src/app/instance.rs
index 6e3228049c..e3bad6ab39 100644
--- a/nexus/src/app/instance.rs
+++ b/nexus/src/app/instance.rs
@@ -343,7 +343,7 @@ impl super::Nexus {
         &self,
         instance: &db::model::Instance,
     ) -> Result<Arc<SledAgentClient>, Error> {
-        let sa_id = &instance.runtime().sled_uuid;
+        let sa_id = &instance.runtime().sled_id;
         self.sled_client(&sa_id).await
     }
 
@@ -787,7 +787,7 @@ impl super::Nexus {
             Ok(true) => {
                 info!(log, "instance updated by sled agent";
                     "instance_id" => %id,
-                    "propolis_id" => %new_runtime_state.propolis_uuid,
+                    "propolis_id" => %new_runtime_state.propolis_id,
                     "new_state" => %new_runtime_state.run_state);
                 Ok(())
             }
@@ -795,7 +795,7 @@ impl super::Nexus {
             Ok(false) => {
                 info!(log, "instance update from sled agent ignored (old)";
                     "instance_id" => %id,
-                    "propolis_id" => %new_runtime_state.propolis_uuid,
+                    "propolis_id" => %new_runtime_state.propolis_id,
                     "requested_state" => %new_runtime_state.run_state);
                 Ok(())
             }
diff --git a/nexus/src/app/sagas/instance_create.rs b/nexus/src/app/sagas/instance_create.rs
index 3b543edeea..93ca8a2517 100644
--- a/nexus/src/app/sagas/instance_create.rs
+++ b/nexus/src/app/sagas/instance_create.rs
@@ -628,14 +628,14 @@ async fn sic_create_instance_record(
 
     let runtime = InstanceRuntimeState {
         run_state: InstanceState::Creating,
-        sled_uuid,
-        propolis_uuid,
-        dst_propolis_uuid: None,
+        sled_id: sled_uuid,
+        propolis_id: propolis_uuid,
+        dst_propolis_id: None,
         propolis_addr: Some(std::net::SocketAddr::new(
             propolis_addr.into(),
             12400,
         )),
-        migration_uuid: None,
+        migration_id: None,
         hostname: params.create_params.hostname.clone(),
         memory: params.create_params.memory,
         ncpus: params.create_params.ncpus,
diff --git a/nexus/src/app/sagas/instance_migrate.rs b/nexus/src/app/sagas/instance_migrate.rs
index bf37a6310a..8f944e8411 100644
--- a/nexus/src/app/sagas/instance_migrate.rs
+++ b/nexus/src/app/sagas/instance_migrate.rs
@@ -141,21 +141,21 @@ async fn sim_instance_migrate(
     let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
 
     let migration_id = sagactx.lookup::<Uuid>("migrate_id")?;
-    let dst_sled_uuid = params.migrate_params.dst_sled_uuid;
-    let dst_propolis_uuid = sagactx.lookup::<Uuid>("dst_propolis_id")?;
+    let dst_sled_id = params.migrate_params.dst_sled_id;
+    let dst_propolis_id = sagactx.lookup::<Uuid>("dst_propolis_id")?;
     let (instance_id, old_runtime) =
         sagactx.lookup::<(Uuid, InstanceRuntimeState)>("migrate_instance")?;
 
     // Allocate an IP address the destination sled for the new Propolis server.
     let propolis_addr = osagactx
         .datastore()
-        .next_ipv6_address(&opctx, dst_sled_uuid)
+        .next_ipv6_address(&opctx, dst_sled_id)
         .await
         .map_err(ActionError::action_failed)?;
 
     let runtime = InstanceRuntimeState {
-        sled_uuid: dst_sled_uuid,
-        propolis_uuid: dst_propolis_uuid,
+        sled_id: dst_sled_id,
+        propolis_id: dst_propolis_id,
         propolis_addr: Some(std::net::SocketAddr::new(
             propolis_addr.into(),
             12400,
@@ -175,11 +175,11 @@ async fn sim_instance_migrate(
         run_state: InstanceStateRequested::Migrating,
         migration_params: Some(InstanceRuntimeStateMigrateParams {
             migration_id,
-            dst_propolis_id: dst_propolis_uuid,
+            dst_propolis_id,
         }),
     };
 
-    let src_propolis_uuid = old_runtime.propolis_uuid;
+    let src_propolis_id = old_runtime.propolis_id;
     let src_propolis_addr = old_runtime.propolis_addr.ok_or_else(|| {
         ActionError::action_failed(Error::invalid_request(
             "expected source propolis-addr",
@@ -187,7 +187,7 @@ async fn sim_instance_migrate(
     })?;
 
     let dst_sa = osagactx
-        .sled_client(&dst_sled_uuid)
+        .sled_client(&dst_sled_id)
         .await
         .map_err(ActionError::action_failed)?;
 
@@ -199,7 +199,7 @@ async fn sim_instance_migrate(
                 target,
                 migrate: Some(InstanceMigrateParams {
                     src_propolis_addr: src_propolis_addr.to_string(),
-                    src_propolis_uuid,
+                    src_propolis_id,
                 }),
             },
         )
diff --git a/nexus/src/db/datastore.rs b/nexus/src/db/datastore.rs
index 2898d0cbb7..dc30987277 100644
--- a/nexus/src/db/datastore.rs
+++ b/nexus/src/db/datastore.rs
@@ -970,7 +970,7 @@ impl DataStore {
             .filter(
                 dsl::migration_id
                     .is_null()
-                    .or(dsl::target_propolis_id.eq(new_runtime.propolis_uuid)),
+                    .or(dsl::target_propolis_id.eq(new_runtime.propolis_id)),
             )
             .set(new_runtime.clone())
             .check_if_exists::<Instance>(*instance_id)
diff --git a/nexus/src/db/model/instance.rs b/nexus/src/db/model/instance.rs
index 80b6e124fc..48c047180d 100644
--- a/nexus/src/db/model/instance.rs
+++ b/nexus/src/db/model/instance.rs
@@ -100,15 +100,15 @@ pub struct InstanceRuntimeState {
     /// which sled is running this Instance
     // TODO: should this be optional?
     #[diesel(column_name = active_server_id)]
-    pub sled_uuid: Uuid,
+    pub sled_id: Uuid,
     #[diesel(column_name = active_propolis_id)]
-    pub propolis_uuid: Uuid,
+    pub propolis_id: Uuid,
     #[diesel(column_name = active_propolis_ip)]
     pub propolis_ip: Option<ipnetwork::IpNetwork>,
     #[diesel(column_name = target_propolis_id)]
-    pub dst_propolis_uuid: Option<Uuid>,
+    pub dst_propolis_id: Option<Uuid>,
     #[diesel(column_name = migration_id)]
-    pub migration_uuid: Option<Uuid>,
+    pub migration_id: Option<Uuid>,
     #[diesel(column_name = ncpus)]
     pub ncpus: InstanceCpuCount,
     #[diesel(column_name = memory)]
@@ -124,13 +124,13 @@ impl From<InstanceRuntimeState>
     fn from(s: InstanceRuntimeState) -> Self {
         Self {
             run_state: s.state.into(),
-            sled_uuid: s.sled_uuid,
-            propolis_uuid: s.propolis_uuid,
-            dst_propolis_uuid: s.dst_propolis_uuid,
+            sled_id: s.sled_id,
+            propolis_id: s.propolis_id,
+            dst_propolis_id: s.dst_propolis_id,
             propolis_addr: s
                 .propolis_ip
                 .map(|ip| SocketAddr::new(ip.ip(), PROPOLIS_PORT).to_string()),
-            migration_uuid: s.migration_uuid,
+            migration_id: s.migration_id,
             ncpus: s.ncpus.into(),
             memory: s.memory.into(),
             hostname: s.hostname,
@@ -155,11 +155,11 @@ impl From<internal::nexus::InstanceRuntimeState> for InstanceRuntimeState {
     fn from(state: internal::nexus::InstanceRuntimeState) -> Self {
         Self {
             state: InstanceState::new(state.run_state),
-            sled_uuid: state.sled_uuid,
-            propolis_uuid: state.propolis_uuid,
-            dst_propolis_uuid: state.dst_propolis_uuid,
+            sled_id: state.sled_id,
+            propolis_id: state.propolis_id,
+            dst_propolis_id: state.dst_propolis_id,
             propolis_ip: state.propolis_addr.map(|addr| addr.ip().into()),
-            migration_uuid: state.migration_uuid,
+            migration_id: state.migration_id,
             ncpus: state.ncpus.into(),
             memory: state.memory.into(),
             hostname: state.hostname,
@@ -174,13 +174,13 @@ impl Into<internal::nexus::InstanceRuntimeState> for InstanceRuntimeState {
     fn into(self) -> internal::nexus::InstanceRuntimeState {
         internal::nexus::InstanceRuntimeState {
             run_state: *self.state.state(),
-            sled_uuid: self.sled_uuid,
-            propolis_uuid: self.propolis_uuid,
-            dst_propolis_uuid: self.dst_propolis_uuid,
+            sled_id: self.sled_id,
+            propolis_id: self.propolis_id,
+            dst_propolis_id: self.dst_propolis_id,
             propolis_addr: self
                 .propolis_ip
                 .map(|ip| SocketAddr::new(ip.ip(), PROPOLIS_PORT)),
-            migration_uuid: self.migration_uuid,
+            migration_id: self.migration_id,
             ncpus: self.ncpus.into(),
             memory: self.memory.into(),
             hostname: self.hostname,
diff --git a/nexus/src/external_api/params.rs b/nexus/src/external_api/params.rs
index 7f6f3ddb2b..d6e1aa114e 100644
--- a/nexus/src/external_api/params.rs
+++ b/nexus/src/external_api/params.rs
@@ -199,7 +199,7 @@ mod serde_user_data {
 /// Migration parameters for an [`Instance`](omicron_common::api::external::Instance)
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct InstanceMigrate {
-    pub dst_sled_uuid: Uuid,
+    pub dst_sled_id: Uuid,
 }
 
 // VPCS
diff --git a/nexus/tests/integration_tests/endpoints.rs b/nexus/tests/integration_tests/endpoints.rs
index 362e781e84..209efa8cd2 100644
--- a/nexus/tests/integration_tests/endpoints.rs
+++ b/nexus/tests/integration_tests/endpoints.rs
@@ -825,7 +825,7 @@ lazy_static! {
             allowed_methods: vec![
                 AllowedMethod::Post(serde_json::to_value(
                     params::InstanceMigrate {
-                        dst_sled_uuid: uuid::Uuid::new_v4(),
+                        dst_sled_id: uuid::Uuid::new_v4(),
                     }
                 ).unwrap()),
             ],
diff --git a/openapi/nexus-internal.json b/openapi/nexus-internal.json
index 587f9deff2..4fc85bf1bb 100644
--- a/openapi/nexus-internal.json
+++ b/openapi/nexus-internal.json
@@ -1368,7 +1368,7 @@
         "description": "Runtime state of the Instance, including the actual running state and minimal metadata\n\nThis state is owned by the sled agent running that Instance.",
         "type": "object",
         "properties": {
-          "dst_propolis_uuid": {
+          "dst_propolis_id": {
             "nullable": true,
             "description": "the target propolis-server during a migration of this Instance",
             "type": "string",
@@ -1394,7 +1394,7 @@
               }
             ]
           },
-          "migration_uuid": {
+          "migration_id": {
             "nullable": true,
             "description": "migration id (if one in process)",
             "type": "string",
@@ -1413,7 +1413,7 @@
             "description": "address of propolis-server running this Instance",
             "type": "string"
           },
-          "propolis_uuid": {
+          "propolis_id": {
             "description": "which propolis-server is running this Instance",
             "type": "string",
             "format": "uuid"
@@ -1426,7 +1426,7 @@
               }
             ]
           },
-          "sled_uuid": {
+          "sled_id": {
             "description": "which sled is running this Instance",
             "type": "string",
             "format": "uuid"
@@ -1442,9 +1442,9 @@
           "hostname",
           "memory",
           "ncpus",
-          "propolis_uuid",
+          "propolis_id",
           "run_state",
-          "sled_uuid",
+          "sled_id",
           "time_updated"
         ]
       },
diff --git a/openapi/nexus.json b/openapi/nexus.json
index 2c2f74f0ae..8959a31f47 100644
--- a/openapi/nexus.json
+++ b/openapi/nexus.json
@@ -6329,13 +6329,13 @@
         "description": "Migration parameters for an [`Instance`](omicron_common::api::external::Instance)",
         "type": "object",
         "properties": {
-          "dst_sled_uuid": {
+          "dst_sled_id": {
             "type": "string",
             "format": "uuid"
           }
         },
         "required": [
-          "dst_sled_uuid"
+          "dst_sled_id"
         ]
       },
       "InstanceNetworkInterfaceAttachment": {
diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json
index 7cb0eb5dd3..273082a750 100644
--- a/openapi/sled-agent.json
+++ b/openapi/sled-agent.json
@@ -247,7 +247,7 @@
           "dataset_kind": {
             "$ref": "#/components/schemas/DatasetKind"
           },
-          "zpool_uuid": {
+          "zpool_id": {
             "type": "string",
             "format": "uuid"
           }
@@ -255,7 +255,7 @@
         "required": [
           "address",
           "dataset_kind",
-          "zpool_uuid"
+          "zpool_id"
         ]
       },
       "DatasetKind": {
@@ -697,21 +697,21 @@
           "src_propolis_addr": {
             "type": "string"
           },
-          "src_propolis_uuid": {
+          "src_propolis_id": {
             "type": "string",
             "format": "uuid"
           }
         },
         "required": [
           "src_propolis_addr",
-          "src_propolis_uuid"
+          "src_propolis_id"
         ]
       },
       "InstanceRuntimeState": {
         "description": "Runtime state of the Instance, including the actual running state and minimal metadata\n\nThis state is owned by the sled agent running that Instance.",
         "type": "object",
         "properties": {
-          "dst_propolis_uuid": {
+          "dst_propolis_id": {
             "nullable": true,
             "description": "the target propolis-server during a migration of this Instance",
             "type": "string",
@@ -737,7 +737,7 @@
               }
             ]
           },
-          "migration_uuid": {
+          "migration_id": {
             "nullable": true,
             "description": "migration id (if one in process)",
             "type": "string",
@@ -756,7 +756,7 @@
             "description": "address of propolis-server running this Instance",
             "type": "string"
           },
-          "propolis_uuid": {
+          "propolis_id": {
             "description": "which propolis-server is running this Instance",
             "type": "string",
             "format": "uuid"
@@ -769,7 +769,7 @@
               }
             ]
           },
-          "sled_uuid": {
+          "sled_id": {
             "description": "which sled is running this Instance",
             "type": "string",
             "format": "uuid"
@@ -785,9 +785,9 @@
           "hostname",
           "memory",
           "ncpus",
-          "propolis_uuid",
+          "propolis_id",
           "run_state",
-          "sled_uuid",
+          "sled_id",
           "time_updated"
         ]
       },
diff --git a/sled-agent-client/src/lib.rs b/sled-agent-client/src/lib.rs
index 61b19959f9..b94c9dedc8 100644
--- a/sled-agent-client/src/lib.rs
+++ b/sled-agent-client/src/lib.rs
@@ -25,11 +25,11 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
     ) -> Self {
         Self {
             run_state: s.run_state.into(),
-            sled_uuid: s.sled_uuid,
-            propolis_uuid: s.propolis_uuid,
-            dst_propolis_uuid: s.dst_propolis_uuid,
+            sled_id: s.sled_id,
+            propolis_id: s.propolis_id,
+            dst_propolis_id: s.dst_propolis_id,
             propolis_addr: s.propolis_addr.map(|addr| addr.to_string()),
-            migration_uuid: s.migration_uuid,
+            migration_id: s.migration_id,
             ncpus: s.ncpus.into(),
             memory: s.memory.into(),
             hostname: s.hostname,
@@ -85,11 +85,11 @@ impl From<types::InstanceRuntimeState>
     fn from(s: types::InstanceRuntimeState) -> Self {
         Self {
             run_state: s.run_state.into(),
-            sled_uuid: s.sled_uuid,
-            propolis_uuid: s.propolis_uuid,
-            dst_propolis_uuid: s.dst_propolis_uuid,
+            sled_id: s.sled_id,
+            propolis_id: s.propolis_id,
+            dst_propolis_id: s.dst_propolis_id,
             propolis_addr: s.propolis_addr.map(|addr| addr.parse().unwrap()),
-            migration_uuid: s.migration_uuid,
+            migration_id: s.migration_id,
             ncpus: s.ncpus.into(),
             memory: s.memory.into(),
             hostname: s.hostname,
diff --git a/sled-agent/src/common/instance.rs b/sled-agent/src/common/instance.rs
index 5a8e39237a..0444ebd84c 100644
--- a/sled-agent/src/common/instance.rs
+++ b/sled-agent/src/common/instance.rs
@@ -272,8 +272,8 @@ impl InstanceStates {
         match self.current.run_state {
             // Valid states for a migration request
             InstanceState::Running => {
-                self.current.dst_propolis_uuid = Some(dst_propolis_id);
-                self.current.migration_uuid = Some(migration_id);
+                self.current.dst_propolis_id = Some(dst_propolis_id);
+                self.current.migration_id = Some(migration_id);
                 self.transition(
                     InstanceState::Migrating,
                     Some(InstanceStateRequested::Running),
@@ -283,9 +283,9 @@ impl InstanceStates {
                 // via a followup request to sled agent.
                 Ok(None)
             }
-            InstanceState::Migrating => match self.current.migration_uuid {
+            InstanceState::Migrating => match self.current.migration_id {
                 Some(id) if id == migration_id => {
-                    match self.current.dst_propolis_uuid {
+                    match self.current.dst_propolis_id {
                         // We're already performing the given migration to the
                         // given propolis instance: no-op
                         Some(id) if id == dst_propolis_id => Ok(None),
@@ -367,11 +367,11 @@ mod test {
     fn make_instance() -> InstanceStates {
         InstanceStates::new(InstanceRuntimeState {
             run_state: State::Creating,
-            sled_uuid: Uuid::new_v4(),
-            propolis_uuid: Uuid::new_v4(),
-            dst_propolis_uuid: None,
+            sled_id: Uuid::new_v4(),
+            propolis_id: Uuid::new_v4(),
+            dst_propolis_id: None,
             propolis_addr: None,
-            migration_uuid: None,
+            migration_id: None,
             ncpus: InstanceCpuCount(2),
             memory: ByteCount::from_mebibytes_u32(512),
             hostname: "myvm".to_string(),
@@ -613,11 +613,11 @@ mod test {
         verify_state(&instance, State::Migrating, Some(Requested::Running));
         assert_eq!(
             migrating_req.migration_params.map(|m| m.migration_id),
-            instance.current().migration_uuid,
+            instance.current().migration_id,
         );
         assert_eq!(
             migrating_req.migration_params.map(|m| m.dst_propolis_id),
-            instance.current().dst_propolis_uuid,
+            instance.current().dst_propolis_id,
         );
     }
 
@@ -755,7 +755,7 @@ mod test {
 
         // Instance is currently marked as 'Migrating' but we'll
         // remove the destination propolis ID
-        instance.current_mut().dst_propolis_uuid = None;
+        instance.current_mut().dst_propolis_id = None;
 
         // A subsequent migrate request that would've been a no-op
         // otherwise should fail in this case
@@ -767,7 +767,7 @@ mod test {
 
         // Instance is still marked as 'Migrating' but we'll
         // remove the Migration ID as well
-        instance.current_mut().migration_uuid = None;
+        instance.current_mut().migration_id = None;
 
         // A subsequent migrate request that would've been a no-op
         // otherwise should fail in this case
diff --git a/sled-agent/src/http_entrypoints.rs b/sled-agent/src/http_entrypoints.rs
index c097a85fce..9f1d167f85 100644
--- a/sled-agent/src/http_entrypoints.rs
+++ b/sled-agent/src/http_entrypoints.rs
@@ -67,7 +67,7 @@ async fn filesystem_put(
     let sa = rqctx.context();
     let body_args = body.into_inner();
     sa.filesystem_ensure(
-        body_args.zpool_uuid,
+        body_args.zpool_id,
         body_args.dataset_kind,
         body_args.address,
     )
diff --git a/sled-agent/src/instance.rs b/sled-agent/src/instance.rs
index 9a738df36e..0324801786 100644
--- a/sled-agent/src/instance.rs
+++ b/sled-agent/src/instance.rs
@@ -298,12 +298,12 @@ impl InstanceInner {
         let migrate = match migrate {
             Some(params) => {
                 let migration_id =
-                    self.state.current().migration_uuid.ok_or_else(|| {
+                    self.state.current().migration_id.ok_or_else(|| {
                         Error::Migration(anyhow!("Missing Migration UUID"))
                     })?;
                 Some(propolis_client::api::InstanceMigrateInitiateRequest {
                     src_addr: params.src_propolis_addr,
-                    src_uuid: params.src_propolis_uuid,
+                    src_uuid: params.src_propolis_id,
                     migration_id,
                 })
             }
@@ -447,7 +447,7 @@ impl Instance {
                 // InstanceCpuCount here, to avoid any casting...
                 vcpus: initial.runtime.ncpus.0 as u8,
             },
-            propolis_id: initial.runtime.propolis_uuid,
+            propolis_id: initial.runtime.propolis_id,
             propolis_ip: initial.runtime.propolis_addr.unwrap().ip(),
             vnic_allocator,
             underlay_addr,
@@ -747,11 +747,11 @@ mod test {
         InstanceHardware {
             runtime: InstanceRuntimeState {
                 run_state: InstanceState::Creating,
-                sled_uuid: Uuid::new_v4(),
-                propolis_uuid: test_propolis_uuid(),
-                dst_propolis_uuid: None,
+                sled_id: Uuid::new_v4(),
+                propolis_id: test_propolis_uuid(),
+                dst_propolis_id: None,
                 propolis_addr: Some("[fd00:1de::74]:12400".parse().unwrap()),
-                migration_uuid: None,
+                migration_id: None,
                 ncpus: InstanceCpuCount(2),
                 memory: ByteCount::from_mebibytes_u32(512),
                 hostname: "myvm".to_string(),
diff --git a/sled-agent/src/instance_manager.rs b/sled-agent/src/instance_manager.rs
index 69a0c79c35..c3a941ad8a 100644
--- a/sled-agent/src/instance_manager.rs
+++ b/sled-agent/src/instance_manager.rs
@@ -84,7 +84,7 @@ impl InstanceManager {
             "instance_ensure {} -> {:?}", instance_id, target
         );
 
-        let target_propolis_id = initial_hardware.runtime.propolis_uuid;
+        let target_propolis_id = initial_hardware.runtime.propolis_id;
 
         let (instance, maybe_instance_ticket) = {
             let mut instances = self.inner.instances.lock().unwrap();
@@ -225,11 +225,11 @@ mod test {
         InstanceHardware {
             runtime: InstanceRuntimeState {
                 run_state: InstanceState::Creating,
-                sled_uuid: Uuid::new_v4(),
-                propolis_uuid: Uuid::new_v4(),
-                dst_propolis_uuid: None,
+                sled_id: Uuid::new_v4(),
+                propolis_id: Uuid::new_v4(),
+                dst_propolis_id: None,
                 propolis_addr: None,
-                migration_uuid: None,
+                migration_id: None,
                 ncpus: InstanceCpuCount(2),
                 memory: ByteCount::from_mebibytes_u32(512),
                 hostname: "myvm".to_string(),
diff --git a/sled-agent/src/params.rs b/sled-agent/src/params.rs
index 34ebda537f..1c713a6906 100644
--- a/sled-agent/src/params.rs
+++ b/sled-agent/src/params.rs
@@ -81,7 +81,7 @@ pub struct InstanceEnsureBody {
 
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct InstanceMigrateParams {
-    pub src_propolis_uuid: Uuid,
+    pub src_propolis_id: Uuid,
     pub src_propolis_addr: SocketAddr,
 }
 
@@ -214,7 +214,7 @@ impl std::fmt::Display for DatasetKind {
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct DatasetEnsureBody {
     // The name (and UUID) of the Zpool which we are inserting into.
-    pub zpool_uuid: Uuid,
+    pub zpool_id: Uuid,
     // The type of the filesystem.
     pub dataset_kind: DatasetKind,
     // The address on which the zone will listen for requests.
@@ -232,7 +232,7 @@ pub struct DatasetEnsureBody {
 impl From<DatasetEnsureBody> for sled_agent_client::types::DatasetEnsureBody {
     fn from(p: DatasetEnsureBody) -> Self {
         Self {
-            zpool_uuid: p.zpool_uuid,
+            zpool_id: p.zpool_id,
             dataset_kind: p.dataset_kind.into(),
             address: p.address.to_string(),
         }
diff --git a/sled-agent/src/sim/collection.rs b/sled-agent/src/sim/collection.rs
index f2f4fd8aca..09374f8827 100644
--- a/sled-agent/src/sim/collection.rs
+++ b/sled-agent/src/sim/collection.rs
@@ -332,11 +332,11 @@ mod test {
         let initial_runtime = {
             InstanceRuntimeState {
                 run_state: InstanceState::Creating,
-                sled_uuid: uuid::Uuid::new_v4(),
-                propolis_uuid: uuid::Uuid::new_v4(),
-                dst_propolis_uuid: None,
+                sled_id: uuid::Uuid::new_v4(),
+                propolis_id: uuid::Uuid::new_v4(),
+                dst_propolis_id: None,
                 propolis_addr: None,
-                migration_uuid: None,
+                migration_id: None,
                 ncpus: InstanceCpuCount(2),
                 memory: ByteCount::from_mebibytes_u32(512),
                 hostname: "myvm".to_string(),