fix CHEF-4685

plus sync up other descriptions for swap_names