Refactored: removed deprecated 'name' field reference.