diff --git a/org-fs-tree.el b/org-fs-tree.el
index e49582a..a373496 100644
--- a/org-fs-tree.el
+++ b/org-fs-tree.el
@@ -4,7 +4,7 @@
 
 ;; Author: Ashok Gautham Jadatharan <ScriptDevil@zoho.com>
 ;; Version: 0.2.0
-;; Package-Requires: ((f "0") (names "0"))
+;; Package-Requires: ((f "0"))
 ;; Keywords: org-mode
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -28,34 +28,31 @@
 
 ;;; Code:
 (require 'f)
-(require 'names)
 
-(define-namespace org-fs-tree-
-
-(defun -make-link (s link)
+(defun org-fs-tree--make-link (s link)
   (concat "[[" link "][" s "]]"))
 
-(defun -make-heading (s level)
+(defun org-fs-tree--make-heading (s level)
   (concat (make-string level ?*) " " s "\n"))
 
-(defun -create-tree (base-dir level limit-level)
+(defun org-fs-tree--create-tree (base-dir level limit-level)
   (let* ((full-path (f-full base-dir))
 	 (short-name  (if (f-dir? base-dir)
 			  (concat (f-filename base-dir) "/")
 			(f-filename base-dir)))
-	 (link (-make-link short-name full-path))
-	 (heading (-make-heading link level)))
+	 (link (org-fs-tree--make-link short-name full-path))
+	 (heading (org-fs-tree--make-heading link level)))
     (if (or (null limit-level) (< level limit-level))
 	(if (f-directory? base-dir)
 	    (concat heading
 		    (apply 'concat (mapcar
-				    (lambda (d)  (-create-tree d (+ 1 level) limit-level))
+				    (lambda (d)  (org-fs-tree--create-tree d (+ 1 level) limit-level))
 				    (f-entries base-dir))))
 	  heading)
       heading)))
 
 ;;;###autoload
-(defun dump (arg dirname)
+(defun org-fs-tree-dump (arg dirname)
   "Dump the file system tree rooted at DIRNAME as an org tree.
 Each heading in the org-tree will be a link to the corresponding
 file or directory that can be opened using org-open-at-point. 
@@ -65,7 +62,6 @@ levels.
 "
 
   (interactive "P\nDDirectory to dump: ")
-  (insert (-create-tree dirname 1 arg)))
-)
+  (insert (org-fs-tree--create-tree dirname 1 arg)))
 
 (provide 'org-fs-tree)