Dont' use _Disk anymore for CNAF and RAL