RailsOnLisp/rol-uri

diff --git a/lowh.triangle.uri.asd b/lowh.triangle.uri.asd
deleted file mode 100644
index a7d763d..0000000
--- a/lowh.triangle.uri.asd
+++ /dev/null
@@ -1,35 +0,0 @@
-;;
-;;  Triangle
-;;
-;;  Copyright 2012,2013 Thomas de Grivel <thomas@lowh.net>
-;;
-;;  Permission to use, copy, modify, and distribute this software for any
-;;  purpose with or without fee is hereby granted, provided that the above
-;;  copyright notice and this permission notice appear in all copies.
-;;
-;;  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-;;  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-;;  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-;;  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-;;  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-;;  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-;;
-
-(in-package #:cl-user)
-
-(defpackage #:lowh.triangle.uri.system
-  (:use #:cl #:asdf))
-
-(in-package #:lowh.triangle.uri.system)
-
-(defsystem lowh.triangle.uri
-  :name "lowh.triangle.uri"
-  :author "Thomas de Grivel <thomas@lowh.net>"
-  :version "0.1"
-  :description "String and URI library"
-  :depends-on ("alexandria" "cl-unicode" "str" "trivial-utf-8")
-  :components
-  ((:file "package")
-   (:file "uri" :depends-on ("package"))
-   (:file "uri-template" :depends-on ("uri"))))
diff --git a/package.lisp b/package.lisp
index 85e57c2..5c5e34e 100644
--- a/package.lisp
+++ b/package.lisp
@@ -18,8 +18,8 @@
 
 (in-package :cl-user)
 
-(defpackage :lowh.triangle.uri
-  (:nicknames :L>uri)
+(defpackage :RoL-uri
+  (:nicknames :L>uri :lowh.triangle.uri)
   (:use :cl :alexandria :str)
   (:export
    ;;  URI
diff --git a/rol-uri.asd b/rol-uri.asd
new file mode 100644
index 0000000..c1d89dc
--- /dev/null
+++ b/rol-uri.asd
@@ -0,0 +1,35 @@
+;;
+;;  RoL-uri  -  URL and URI utilities
+;;
+;;  Copyright 2012-2015 Thomas de Grivel <thomas@lowh.net>
+;;
+;;  Permission to use, copy, modify, and distribute this software for any
+;;  purpose with or without fee is hereby granted, provided that the above
+;;  copyright notice and this permission notice appear in all copies.
+;;
+;;  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+;;  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+;;  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+;;  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+;;  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+;;  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+;;
+
+(in-package #:cl-user)
+
+(defpackage #:RoL-uri.system
+  (:use #:cl #:asdf))
+
+(in-package #:RoL-uri.system)
+
+(asdf:defsystem :RoL-uri
+  :name "RoL-uri"
+  :author "Thomas de Grivel <thomas@lowh.net>"
+  :version "0.1"
+  :description "String and URI library"
+  :depends-on ("alexandria" "cl-unicode" "str" "trivial-utf-8")
+  :components
+  ((:file "package")
+   (:file "uri" :depends-on ("package"))
+   (:file "uri-template" :depends-on ("uri"))))
diff --git a/uri-template.lisp b/uri-template.lisp
index a1ffcfe..702fdc0 100644
--- a/uri-template.lisp
+++ b/uri-template.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :L>uri)
+(in-package :RoL-uri)
 
 ;;  RFC 6570 - URI Template
 
@@ -71,13 +71,13 @@ at least one URI Template operator. Otherwise NIL is returned.
 ;;  URI vars
 
 (defparameter *uri-vars-package*
-  (let ((pkg (find-package :L>uri.vars)))
+  (let ((pkg (find-package :RoL-uri.vars)))
     (when pkg
       (do-symbols (sym pkg)
 	(unexport sym pkg)
 	(unintern sym pkg)))
-    (defpackage lowh.triangle.uri.vars
-      (:nicknames :L>uri.vars)))
+    (defpackage :RoL-uri.vars
+      (:nicknames :L>uri.vars :lowh.triangle.uri.vars)))
   "All uri variable names are interned in this package.")
 
 (defun uri-var (name)
diff --git a/uri.lisp b/uri.lisp
index 8d039b9..f1daeae 100644
--- a/uri.lisp
+++ b/uri.lisp
@@ -16,7 +16,7 @@
 ;;  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(in-package :L>uri)
+(in-package :RoL-uri)
 
 ;;  Canonical URI