#53 rename Uri to Path