lib/java: further revamp of URIs