local: Cleanup uri conversion helper naming and implementation.
local: Review changes