diff --git a/doc/architecture.txt b/doc/architecture.txt
--- a/doc/architecture.txt
+++ b/doc/architecture.txt
@@ -17,7 +17,7 @@ Concepts:
       make sure that it never issues the same numeric job identifier to multiple jobs. To allow
       multiple servers to share jobs with eachother (which is the the whole point of distren),
       a job shall be refered to by prefixing the job a server identification. For example,
-      distren://<servername>/<jobid>
+      distren://<servername>/job/<jobid>
   - job packaging: Currently, the most creative way of dealing with jobs I have at the moment is
       storing all of the data necessary to render the job in a tarball. This tarball can be
       treated as a directory of a normal filesystem. A job's directory would contain at least one
@@ -36,7 +36,7 @@ Concepts:
       numeric value of a frame identification value must be unique to that job. There are no
       restrictions of ordering of frame numbers except that they are not to be negative. There
       need be no sequencing of frame numbers either. Thus, a frame identification URL would look
-      like distren://<servername>/<jobid>/frame/<frameid>
+      like distren://<servername>/job/<jobid>/frame/<frameid>
   - size: A frame hopefully represents a smaller unit of work in terms of the rendering
       back-end's capabilities. For example, POV-Ray's CLI can initiate and carry out the rendering
       of an entire animation. But distren would hopefully be able to provide a clean method for
@@ -59,12 +59,11 @@ Concepts:
 
 - user: A user is an entity which is given access to a distren server.
   - user identifiction: As users are per-server, a user shall be identified by the name of the
-      server he has an account on combined with his handle. A tilde prefixes the username to
-      differentiate this URL from a job's URL.
-      distren://<servername>/~<username> , like distren://ohnopub.net/~ohnobinki
+      server he has an account on combined with his handle.
+      distren://<servername>/user/<username> , like distren://ohnopub.net/user/ohnobinki
 
 - file: There are different uses of files above and distributed rendering requires file distribution.
   - file identification: Every file mentioned above was at least in the context of a job. Thus,
       file identification numbers shall be assigned in the context of a job identification number.
       They shall, however, be numeric.
-      distren://<servername>/<jobid>/file/<fileid>
+      distren://<servername>/job/<jobid>/file/<fileid>