diff --git a/ffi-tools/ffi-tools.scm b/ffi-tools/ffi-tools.scm
index 8350a8e..ecd9925 100644
--- a/ffi-tools/ffi-tools.scm
+++ b/ffi-tools/ffi-tools.scm
@@ -98,13 +98,13 @@
 ;;; generating scheme code
 
 (define (generate-binding constant)
-  (format "(define ~a (lookup-shared-binding \"~a\"))~%"
+  (format "(define ~a (lookup-shared-value \"~a\"))~%"
 	  (constant-scheme-name constant)
 	  (constant-c-value-name constant)))
 
 (define (generate-finite-type-definition ft-name name-converter constants)
   (let ((predicate-name (string-append ft-name "-object?")) 
-	(elements-name (string-append ft-name "-elments"))
+	(elements-name (string-append ft-name "-elements"))
 	(name-name (string-append ft-name "-name"))
 	(index-name (string-append ft-name "-index"))
 	(id-name (string-append ft-name "-id")))
@@ -114,7 +114,7 @@
       "  (id)~%"
       "  ~a~%  ~a~%  ~a~%  ~a~%"
       "  (~a)~%"
-      "  ~a)~%~%")
+      "  (~a))~%~%")
      ft-name ft-name
      predicate-name elements-name name-name index-name
      (string-append "id " id-name)
@@ -126,7 +126,7 @@
 	constants)))
 
 (define (generate-finite-type-item name-converter constant)
-  (format "   (~a\t(lookup-shared-binding \"~a\"))~%" 
+  (format "   (~a\t(lookup-shared-value \"~a\"))~%" 
 	  (name-converter constant)
 	  (constant-c-value-name constant)))