add York -> North Yorkshire
fix jakarta alias