Merge "mw.Uri: Use more intuitive variable names"