Convert cfish URIs to new syntax