Replaced untity entity lookup code with new EntityNameMatcher code