Use resolved filename everywhere