made name regex more powerful