diff --git a/lib/config.py b/lib/config.py
index 1435ffabacbf19cb54aaa385cf563794f48d9eb2..2284063f076b264825dffafeef1860740f06e5b5 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -924,10 +924,11 @@ class ConfigWriter:
       if disk.dev_type == constants.LD_FILE:
         # rename the file paths in logical and physical id
         file_storage_dir = os.path.dirname(os.path.dirname(disk.logical_id[1]))
+        disk_fname = "disk%s" % disk.iv_name.split("/")[1]
         disk.physical_id = disk.logical_id = (disk.logical_id[0],
                                               utils.PathJoin(file_storage_dir,
                                                              inst.name,
-                                                             disk.iv_name))
+                                                             disk_fname))
 
     self._config_data.instances[inst.name] = inst
     self._WriteConfig()