Rename s:custom_name_locations and improve comments