Improvement: Changed data-id to data-name for consistency.