HomeSoftware Heritage

Refactoring: rename resolver functions for consistency