Improved fix for duplicate ADL item names