Use new Master Place Names Model

In addition compare with subs of - and case and ,