Refactored item_name_2 and make_name routines.