Changes related to smart_list name change