Fix handling obj-name at data-diagnosis