diff --git a/src/p7/dump.c b/src/p7/dump.c
index 4c448ba..adf16d5 100644
--- a/src/p7/dump.c
+++ b/src/p7/dump.c
@@ -36,57 +36,58 @@ int dump(p7_handle_t *handle)
 	const p7_server_t *info = p7_get_info(handle);
 
 	/* Wiped out things */
-	if (info->preprog_rom_wiped)
+	if (info->p7_server_preprog_rom_wiped)
 		log("Warning: Preprogrammed ROM information looks wiped out!\n");
-	if (info->bootcode_wiped)
+	if (info->p7_server_bootcode_wiped)
 		log("Warning: Bootcode information looks wiped out!\n");
-	if (info->os_wiped)
+	if (info->p7_server_os_wiped)
 		log("Warning: OS information looks wiped out!\n");
-	if (!info->username[0])
+	if (!info->p7_server_username[0])
 		log("Warning: Username is not set.\n");
 
 	/* main information */
-	printf("CPU ID (probably out of date): %s\n", info->cpuid);
-	printf("Environnement ID: %s\n", info->hwid);
-	printf("Product ID: %s\n", info->product_id);
+	printf("CPU ID (probably out of date): %s\n", info->p7_server_cpuid);
+	printf("Environnement ID: %s\n", info->p7_server_hwid);
+	printf("Product ID: %s\n", info->p7_server_product_id);
 
 	/* Preprogrammed ROM */
-	if (!info->preprog_rom_wiped) {
+	if (!info->p7_server_preprog_rom_wiped) {
 		printf("Preprogrammed ROM version: %02u.%02u",
-			info->preprog_rom_version.major, info->preprog_rom_version.minor);
-		if (info->preprog_rom_version.rev)
-			printf(" (%u)", info->preprog_rom_version.rev);
+			info->p7_server_preprog_rom_version.major,
+			info->p7_server_preprog_rom_version.minor);
 		printf("\nPreprogrammed ROM capacity: " numformat "o\n",
-			info->preprog_rom_capacity);
+			info->p7_server_preprog_rom_capacity);
 	}
 
 	/* ROM and RAM */
-	printf("ROM capacity: " numformat "KiB\n", info->flash_rom_capacity / 1024);
-	printf("RAM capacity: " numformat "KiB\n", info->ram_capacity / 1024);
+	printf("ROM capacity: " numformat "KiB\n",
+		info->p7_server_flash_rom_capacity / 1024);
+	printf("RAM capacity: " numformat "KiB\n",
+		info->p7_server_ram_capacity / 1024);
 
 	/* Bootcode */
-	if (!info->bootcode_wiped) {
+	if (!info->p7_server_bootcode_wiped) {
 		printf("Bootcode version: %02u.%02u",
-			info->bootcode_version.major, info->bootcode_version.minor);
-		if (info->bootcode_version.rev)
-			printf(" (%u)", info->bootcode_version.rev);
-		printf("\nBootcode offset: " addrformat "\n", info->bootcode_offset);
-		printf("Bootcode size: " numformat "KiB\n", info->bootcode_size / 1024);
+			info->p7_server_bootcode_version.major,
+			info->p7_server_bootcode_version.minor);
+		printf("\nBootcode offset: " addrformat "\n",
+			info->p7_server_bootcode_offset);
+		printf("Bootcode size: " numformat "KiB\n",
+			info->p7_server_bootcode_size / 1024);
 	}
 
 	/* OS */
-	if (!info->os_wiped) {
+	if (!info->p7_server_os_wiped) {
 		printf("OS version: %02u.%02u",
-			info->os_version.major, info->os_version.minor);
-		if (info->os_version.rev)
-			printf(" (%u)", info->os_version.rev);
-		printf("\nOS offset: " addrformat "\n", info->os_offset);
-		printf("OS size: " numformat "KiB\n", info->os_size / 1024);
+			info->p7_server_os_version.major,
+			info->p7_server_os_version.minor);
+		printf("\nOS offset: " addrformat "\n", info->p7_server_os_offset);
+		printf("OS size: " numformat "KiB\n", info->p7_server_os_size / 1024);
 	}
 
 	/* Miscallenous information */
-	if (info->username[0])
-		printf("Username: %s\n", info->username);
+	if (info->p7_server_username[0])
+		printf("Username: %s\n", info->p7_server_username);
 
 	return (0);
 }