diff --git a/Cargo.lock b/Cargo.lock
index 529259ec5..cb6fc34da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -400,7 +400,7 @@ dependencies = [
 [[package]]
 name = "linux-loader"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/linux-loader#6cf23a8bca79b5517fa11f90f7f9d828a8290e9d"
+source = "git+https://github.com/rust-vmm/linux-loader#e5c6d66d3121421672c9b25b02e8954f0ed5f58d"
 dependencies = [
  "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
 ]
@@ -1092,7 +1092,7 @@ dependencies = [
 [[package]]
 name = "vm-memory"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vm-memory#218afddd4f0e95d3d1da9bd1e0068fa5b929dbce"
+source = "git+https://github.com/rust-vmm/vm-memory#beaf2159056de76bfd5091ab49c24293e6e47a39"
 dependencies = [
  "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/arch/src/x86_64/mod.rs b/arch/src/x86_64/mod.rs
index de385f4ed..b2299be01 100644
--- a/arch/src/x86_64/mod.rs
+++ b/arch/src/x86_64/mod.rs
@@ -135,7 +135,7 @@ pub fn configure_system(
 
     add_e820_entry(&mut params.0, 0, layout::EBDA_START.raw_value(), E820_RAM)?;
 
-    let mem_end = guest_mem.end_addr();
+    let mem_end = guest_mem.last_addr();
     if mem_end < layout::MEM_32BIT_RESERVED_START {
         add_e820_entry(
             &mut params.0,
diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index 4645c1c16..a0106989f 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -752,7 +752,7 @@ impl DeviceManager {
         {
             // Add a CMOS emulated device
             use vm_memory::GuestMemory;
-            let mem_size = _vm_info.memory.load().end_addr().0 + 1;
+            let mem_size = _vm_info.memory.load().last_addr().0 + 1;
             let mem_below_4g = std::cmp::min(arch::layout::MEM_32BIT_RESERVED_START.0, mem_size);
             let mem_above_4g = mem_size.saturating_sub(arch::layout::RAM_64BIT_START.0);
 
diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs
index 48c924138..0b52ba1f3 100644
--- a/vmm/src/memory_manager.rs
+++ b/vmm/src/memory_manager.rs
@@ -219,7 +219,7 @@ impl MemoryManager {
             GuestMemoryMmap::from_arc_regions(mem_regions.clone()).map_err(Error::GuestMemory)?;
 
         let end_of_device_area = GuestAddress((1 << get_host_cpu_phys_bits()) - 1);
-        let mem_end = guest_memory.end_addr();
+        let mem_end = guest_memory.last_addr();
         let mut start_of_device_area = if mem_end < arch::layout::MEM_32BIT_RESERVED_START {
             arch::layout::RAM_64BIT_START
         } else {
@@ -328,7 +328,7 @@ impl MemoryManager {
 
         // Start address needs to be non-contiguous with last memory added (leaving a gap of 256MiB)
         // and also aligned to 128MiB boundary. It must also start at the 64bit start.
-        let mem_end = self.guest_memory.load().end_addr();
+        let mem_end = self.guest_memory.load().last_addr();
         let start_addr = if mem_end < arch::layout::MEM_32BIT_RESERVED_START {
             arch::layout::RAM_64BIT_START
         } else {