diff --git a/zdump/dfi.c b/zdump/dfi.c
index bd3e60db..d234b13b 100644
--- a/zdump/dfi.c
+++ b/zdump/dfi.c
@@ -122,7 +122,7 @@ void dfi_info_print(void)
 		STDERR("  Volume number......: %u\n", *l.attr.vol_nr);
 	if (l.attr.build_arch)
 		STDERR("  Build arch.........: %s\n",
-		      dfi_arch_str(*l.attr.build_arch));
+		       dfi_arch_str(*l.attr.build_arch));
 	STDERR("  System arch........: %s\n", dfi_arch_str(l.arch));
 	if (l.cpus.cnt)
 		STDERR("  CPU count (online).: %u\n", l.cpus.cnt);
@@ -133,10 +133,10 @@ void dfi_info_print(void)
 		       TO_MIB(dfi_mem_range()));
 	if (l.attr.mem_size_real)
 		STDERR("  Real memory range..: %lld MB\n",
-		      TO_MIB(*l.attr.mem_size_real));
+		       TO_MIB(*l.attr.mem_size_real));
 	if (l.attr.file_size)
 		STDERR("  Dump file size.....: %lld MB\n",
-		      TO_MIB(*l.attr.file_size));
+		       TO_MIB(*l.attr.file_size));
 	if (dfi_mem_range())
 		dfi_mem_map_print(g.opts.verbose);
 	if (l.dfi->info_dump) {
@@ -503,7 +503,7 @@ static void lc2cpu_64(struct dfi_cpu *cpu, struct dfi_lowcore_64 *lc)
 	/* Add VX registers if available */
 	if (!dfi_cpu_lc_has_vx_sa(lc))
 		return;
-	if (dfi_mem_read_rc(lc->vector_save_area_addr, &vx_sa, sizeof(vx_sa))) {
+	if (dfi_mem_virt_read(lc->vector_save_area_addr, &vx_sa, sizeof(vx_sa))) {
 		STDERR("zgetdump: Vector registers save area is beyond dump memory limit for CPU %d\n", cpu->cpu_id);
 		return;
 	}
@@ -547,13 +547,13 @@ int dfi_cpu_add_from_lc(u32 lc_addr)
 		if (l.arch == DFI_ARCH_32) {
 			struct dfi_cpu_32 cpu_32;
 			struct dfi_lowcore_32 lc;
-			if (dfi_mem_read_rc(lc_addr, &lc, sizeof(lc)))
+			if (dfi_mem_virt_read(lc_addr, &lc, sizeof(lc)))
 				return -EINVAL;
 			lc2cpu_32(&cpu_32, &lc);
 			cpu_32_to_64(cpu, &cpu_32);
 		} else {
 			struct dfi_lowcore_64 lc;
-			if (dfi_mem_read_rc(lc_addr, &lc, sizeof(lc)))
+			if (dfi_mem_virt_read(lc_addr, &lc, sizeof(lc)))
 				return -EINVAL;
 			lc2cpu_64(cpu, &lc);
 		}
@@ -672,8 +672,8 @@ static void kdump_select_prod_init(void)
 	}
 	dfi_cpu_info_init(DFI_CPU_CONTENT_ALL);
 	for (i = 0; i < count; i++) {
-		if (dfi_mem_read_rc(ptr + i * sizeof(long), &prefix,
-				   sizeof(prefix)))
+		if (dfi_mem_virt_read(ptr + i * sizeof(long), &prefix,
+				      sizeof(prefix)))
 			continue;
 		if (prefix == 0)
 			continue;
@@ -696,7 +696,7 @@ static void utsname_init(void)
 
 	if (dfi_vmcoreinfo_symbol(&ptr, "init_uts_ns"))
 		return;
-	if (dfi_mem_read_rc(ptr, buf, sizeof(buf)))
+	if (dfi_mem_virt_read(ptr, buf, sizeof(buf)))
 		return;
 	utsname = memchr(buf, 'L', sizeof(buf) - sizeof(*utsname));
 	if (!utsname)
@@ -717,7 +717,7 @@ static void livedump_init(void)
 
 	util_log_print(UTIL_LOG_TRACE, "DFI livedump initialization\n");
 
-	if (dfi_mem_read_rc(0, &magic, sizeof(magic)))
+	if (dfi_mem_virt_read(0, &magic, sizeof(magic)))
 		return;
 	if (magic == dfi_live_dump_magic)
 		dfi_attr_dump_method_set(DFI_DUMP_METHOD_LIVE);
diff --git a/zdump/dfi_mem_chunk.c b/zdump/dfi_mem_chunk.c
index a0a892cd..be4053dd 100644
--- a/zdump/dfi_mem_chunk.c
+++ b/zdump/dfi_mem_chunk.c
@@ -406,9 +406,9 @@ void dfi_mem_phys_read(u64 addr, void *buf, size_t cnt)
 }
 
 /*
- * Read memory at given address with return code
+ * Read virtual memory at given address
  */
-int dfi_mem_read_rc(u64 addr, void *buf, size_t cnt)
+int dfi_mem_virt_read(u64 addr, void *buf, size_t cnt)
 {
 	util_log_print(UTIL_LOG_TRACE,
 		       "DFI virt mem read addr 0x%016lx size 0x%016lx\n",
diff --git a/zdump/dfi_mem_chunk.h b/zdump/dfi_mem_chunk.h
index 166e7ea8..9696c8ae 100644
--- a/zdump/dfi_mem_chunk.h
+++ b/zdump/dfi_mem_chunk.h
@@ -55,7 +55,7 @@ struct util_list *dfi_mem_chunk_list(void);
 #define dfi_mem_chunk_iterate(mem_chunk) \
 	util_list_iterate(dfi_mem_chunk_list(), mem_chunk)
 
-int dfi_mem_read_rc(u64 addr, void *buf, size_t cnt);
+int dfi_mem_virt_read(u64 addr, void *buf, size_t cnt);
 void dfi_mem_phys_read(u64 addr, void *buf, size_t cnt);
 
 void dfi_mem_map_print(bool verbose);
diff --git a/zdump/dfi_vmcoreinfo.c b/zdump/dfi_vmcoreinfo.c
index 6c53df63..1a5a08af 100644
--- a/zdump/dfi_vmcoreinfo.c
+++ b/zdump/dfi_vmcoreinfo.c
@@ -65,11 +65,11 @@ static struct os_info *os_info_get(void)
 
 	util_log_print(UTIL_LOG_TRACE, "DFI get osinfo\n");
 
-	if (dfi_mem_read_rc(LC_OS_INFO, &addr, sizeof(addr)))
+	if (dfi_mem_virt_read(LC_OS_INFO, &addr, sizeof(addr)))
 		return NULL;
 	if (addr % 0x1000)
 		return NULL;
-	if (dfi_mem_read_rc(addr, &os_info, sizeof(os_info)))
+	if (dfi_mem_virt_read(addr, &os_info, sizeof(os_info)))
 		return NULL;
 	if (os_info.magic != OS_INFO_MAGIC)
 		return NULL;
@@ -96,16 +96,16 @@ void dfi_vmcoreinfo_init(void)
 		addr = l.os_info->vmcoreinfo_addr;
 		size = l.os_info->vmcoreinfo_size;
 	} else {
-		if (dfi_mem_read_rc(LC_VMCORE_INFO, &addr, sizeof(addr)))
+		if (dfi_mem_virt_read(LC_VMCORE_INFO, &addr, sizeof(addr)))
 			return;
 		if (addr == 0)
 			return;
-		if (dfi_mem_read_rc(addr, &note, sizeof(note)))
+		if (dfi_mem_virt_read(addr, &note, sizeof(note)))
 			return;
 		if (note.n_namesz == 0 || note.n_namesz > sizeof(str))
 			return;
 		memset(str, 0, sizeof(str));
-		if (dfi_mem_read_rc(addr + sizeof(note), str, note.n_namesz))
+		if (dfi_mem_virt_read(addr + sizeof(note), str, note.n_namesz))
 			return;
 		if (memcmp(str, "VMCOREINFO", sizeof("VMCOREINFO")) != 0)
 			return;
@@ -116,7 +116,7 @@ void dfi_vmcoreinfo_init(void)
 		       "DFI vmcoreinfo addr 0x%016lx size 0x%016lx\n",
 		       addr, size);
 	l.vmcoreinfo = zg_alloc(size + 1);
-	if (dfi_mem_read_rc(addr, l.vmcoreinfo, size)) {
+	if (dfi_mem_virt_read(addr, l.vmcoreinfo, size)) {
 		zg_free(l.vmcoreinfo);
 		l.vmcoreinfo = NULL;
 		return;
diff --git a/zdump/dfo_s390.c b/zdump/dfo_s390.c
index 7dd4a093..3bb5d62f 100644
--- a/zdump/dfo_s390.c
+++ b/zdump/dfo_s390.c
@@ -98,7 +98,7 @@ static void dfo_s390_dump_chunk_lc_fn(struct dfo_chunk *dump_chunk,
 	struct dfi_cpu *cpu = dump_chunk->data;
 	char lc[0x2000];
 
-	if (dfi_mem_read_rc(cpu->prefix + off, &lc[off], cnt))
+	if (dfi_mem_virt_read(cpu->prefix + off, &lc[off], cnt))
 		return;
 	if (dfi_arch() == DFI_ARCH_64)
 		cpu2lc_64(lc, cpu);
@@ -143,7 +143,7 @@ static void add_cpu_to_dfo(struct dfi_cpu *cpu)
 		return;
 	if (!dfi_cpu_content_fac_check(DFI_CPU_CONTENT_FAC_VX))
 		return;
-	if (dfi_mem_read_rc(cpu->prefix, &lc, sizeof(lc)))
+	if (dfi_mem_virt_read(cpu->prefix, &lc, sizeof(lc)))
 		return;
 	if (!dfi_cpu_lc_has_vx_sa(&lc))
 		return;
@@ -183,8 +183,8 @@ static void dump_chunks_init(void)
 	dfi_cpu_iterate(cpu)
 		add_cpu_to_dfo(cpu);
 	dfo_chunk_add(dfi_mem_range() + DF_S390_HDR_SIZE,
-			   DF_S390_EM_SIZE,
-			   &l.em, dfo_chunk_buf_fn);
+		      DF_S390_EM_SIZE,
+		      &l.em, dfo_chunk_buf_fn);
 }
 
 /*