diff --git a/builder.scm b/builder.scm
index 62942df..16079b8 100644
--- a/builder.scm
+++ b/builder.scm
@@ -1,4 +1,4 @@
-;;; (json builder) --- Guile JSON implementation.
+;;; (chez-json builder) --- Guile JSON implementation.
 
 ;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;; Copyright (C) 2015,2016 Jan Nieuwenhuizen <janneke@gnu.org>
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(library (json builder)
+(library (chez-json builder)
   (export scm->json
           scm->json-string)
   (import (chezscheme))
diff --git a/json.scm b/json.scm
index 5406279..c57b631 100644
--- a/json.scm
+++ b/json.scm
@@ -1,4 +1,4 @@
-;;; (json) --- Guile JSON implementation.
+;;; (chez-json json) --- Guile JSON implementation.
 
 ;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(library (json json)
+(library (chez-json json)
   (export json
           scm->json
           scm->json-string
@@ -33,9 +33,9 @@
           json-string->scm
           json-parser?
           json-parser-port)
-  (import (json builder)
-          (json parser)
-          (json syntax)))
+  (import (chez-json builder)
+          (chez-json parser)
+          (chez-json syntax)))
 
   ;(define-syntax re-export-modules
   ;  (syntax-rules ()
diff --git a/package.sc b/package.sc
index 38b6156..ba331a6 100644
--- a/package.sc
+++ b/package.sc
@@ -1,5 +1,5 @@
 (("name" . "chez-json")
-("version" . "0.5.1")
+("version" . "0.5.2")
 ("description" . "a JSON module for Chez")
 ("keywords"
     ("json"))
diff --git a/parser.scm b/parser.scm
index 46956ac..4dc42f7 100644
--- a/parser.scm
+++ b/parser.scm
@@ -1,4 +1,4 @@
-;;; (json parser) --- Guile JSON implementation.
+;;; (chez-json parser) --- Guile JSON implementation.
 
 ;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
@@ -26,7 +26,7 @@
 ;;; Code:
 
 #!chezscheme
-(library (json parser)
+(library (chez-json parser)
   (export json->scm
           json-string->scm
           json-parser?
diff --git a/syntax.scm b/syntax.scm
index de31dae..347cb51 100644
--- a/syntax.scm
+++ b/syntax.scm
@@ -1,4 +1,4 @@
-;;; (json syntax) --- Guile JSON implementation.
+;;; (chez-json syntax) --- Guile JSON implementation.
 
 ;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(library (json syntax)
+(library (chez-json syntax)
   (export json)
   (import (chezscheme))