Removed empty_name in favor of empty_label
Patch for #222