ACTION_RENAME_DISK fixes: