Make StreetNameResolver use String isntances to KISS