Make name cipher finding more sophisticated