Change 'name' to 'label' to fix issue for 7.2 onwards