diff --git a/lib/chibi/term/edit-line.scm b/lib/chibi/term/edit-line.scm
index c3f781f3..baa54051 100644
--- a/lib/chibi/term/edit-line.scm
+++ b/lib/chibi/term/edit-line.scm
@@ -24,7 +24,7 @@
 
 (define maximum-history-size 128)
 
-(define-record-type history
+(define-record-type History
   (%make-history remaining past future)
   history?
   (remaining history-remaining history-remaining-set!)
@@ -117,7 +117,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; buffers
 
-(define-record-type buffer
+(define-record-type Buffer
   (%make-buffer refresh? min pos row max-row col gap width string history)
   buffer?
   (refresh? buffer-refresh? buffer-refresh?-set!)
diff --git a/lib/chibi/uri.scm b/lib/chibi/uri.scm
index 5a048588..2e115c1e 100644
--- a/lib/chibi/uri.scm
+++ b/lib/chibi/uri.scm
@@ -6,7 +6,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; URI representation
 
-(define-record-type uri
+(define-record-type Uri
   (%make-uri scheme user host port path query fragment)
   uri?
   (scheme uri-scheme)
diff --git a/lib/srfi/18/threads.c b/lib/srfi/18/threads.c
index b488531b..3e36a345 100644
--- a/lib/srfi/18/threads.c
+++ b/lib/srfi/18/threads.c
@@ -557,8 +557,8 @@ sexp sexp_init_library (sexp ctx sexp_api_params(self, n), sexp env) {
   sexp_gc_var1(name);
   sexp_gc_preserve1(ctx, name);
 
-  sexp_mutex_id   = sexp_lookup_named_type(ctx, env, "mutex");
-  sexp_condvar_id = sexp_lookup_named_type(ctx, env, "condition-variable");
+  sexp_mutex_id   = sexp_lookup_named_type(ctx, env, "Mutex");
+  sexp_condvar_id = sexp_lookup_named_type(ctx, env, "Condition-Variable");
   name = sexp_c_string(ctx, "pollfds", -1);
   t = sexp_register_type(ctx, name, SEXP_FALSE, SEXP_FALSE,
                          SEXP_ZERO, SEXP_ZERO, SEXP_ZERO, SEXP_ZERO,
diff --git a/lib/srfi/18/types.scm b/lib/srfi/18/types.scm
index 093c97a7..e4f42fe2 100644
--- a/lib/srfi/18/types.scm
+++ b/lib/srfi/18/types.scm
@@ -1,8 +1,8 @@
 ;; types.scm -- thread types
-;; Copyright (c) 2010 Alex Shinn.  All rights reserved.
+;; Copyright (c) 2010-2011 Alex Shinn.  All rights reserved.
 ;; BSD-style license: http://synthcode.com/license.txt
 
-(define-record-type mutex
+(define-record-type Mutex
   (%make-mutex name specific thread lock)
   mutex?
   (name mutex-name)
@@ -13,7 +13,7 @@
 (define (make-mutex . o)
   (%make-mutex (and (pair? o) (car o)) #f #f #f))
 
-(define-record-type condition-variable
+(define-record-type Condition-Variable
   (%make-condition-variable name specific threads)
   condition-variable?
   (name condition-variable-name)
diff --git a/lib/srfi/69/hash.c b/lib/srfi/69/hash.c
index 7f39eb14..a1fbbbd6 100644
--- a/lib/srfi/69/hash.c
+++ b/lib/srfi/69/hash.c
@@ -186,8 +186,9 @@ static sexp sexp_hash_table_cell (sexp ctx sexp_api_params(self, n), sexp ht, se
   sexp buckets, eq_fn, hash_fn, i;
   sexp_uint_t size;
   sexp_gc_var1(res);
-  if (! sexp_pointerp(ht))      /* XXXX check the real type id */
-    return sexp_xtype_exception(ctx, self, "not a hash-table", ht);
+  /* extra check - exact type should be checked by the calling procedure */
+  if (! sexp_pointerp(ht))
+    return sexp_xtype_exception(ctx, self, "not a Hash-Table", ht);
   buckets = sexp_hash_table_buckets(ht);
   eq_fn = sexp_hash_table_eq_fn(ht);
   hash_fn = sexp_hash_table_hash_fn(ht);
@@ -241,4 +242,3 @@ sexp sexp_init_library (sexp ctx sexp_api_params(self, n), sexp env) {
 
   return SEXP_VOID;
 }
-
diff --git a/lib/srfi/69/interface.scm b/lib/srfi/69/interface.scm
index bc7501c0..701d28fa 100644
--- a/lib/srfi/69/interface.scm
+++ b/lib/srfi/69/interface.scm
@@ -31,7 +31,7 @@
   (syntax-rules ()
     ((assert-hash-table from obj)
      (if (not (hash-table? obj))
-         (error (string-append from ": not a hash-table") obj)))))
+         (error (string-append from ": not a Hash-Table") obj)))))
 
 (define (hash-table-ref table key . o)
   (assert-hash-table "hash-table-ref" table)
diff --git a/lib/srfi/69/type.scm b/lib/srfi/69/type.scm
index 1fca9953..8233857c 100644
--- a/lib/srfi/69/type.scm
+++ b/lib/srfi/69/type.scm
@@ -1,8 +1,8 @@
 ;; types.scm -- the hash-table record type
-;; Copyright (c) 2009 Alex Shinn.  All rights reserved.
+;; Copyright (c) 2009-2011 Alex Shinn.  All rights reserved.
 ;; BSD-style license: http://synthcode.com/license.txt
 
-(define-record-type hash-table
+(define-record-type Hash-Table
   (%make-hash-table buckets size hash-fn eq-fn)
   hash-table?
   (buckets hash-table-buckets hash-table-buckets-set!)