Added logic to handle name_type of "-" (dash)