Resolver: drop use of origin and destination (#78)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>